Changeset 1227 for trunk

Timestamp:

Jan 5, 2010, 3:52:09 PM (14 years ago)

Author:

garnier

Message:

avant maj de CVS

Location:

trunk/source/visualization/OpenGL

Files:

• GNUmakefile (modified) (2 diffs)
• src/G4OpenGLImmediateQtViewer.cc (modified) (2 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)

trunk/source/visualization/OpenGL/GNUmakefile

@@ -11 +11 @@
 
 # For debug mode
-CPPFLAGS += -DG4DEBUG_VIS_OGL
+# CPPFLAGS += -DG4DEBUG_VIS_OGL
 
-GLOBLIBS  = libG4vis_management.lib libG4modeling.lib
-GLOBLIBS += libG4interfaces.lib libG4run.lib libG4event.lib
+GLOBLIBS  = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib
+GLOBLIBS += libG4zlib.lib libG4interfaces.lib libG4run.lib libG4event.lib
 GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
 GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
@@ -39 +39 @@
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
 
-INTYLIBS += -L$(G4LIBDIR)
-
-SUBLIBS += G4gl2ps
+#INTYLIBS += -L$(G4LIBDIR)
 
 include $(G4INSTALL)/config/moc.gmk

trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

@@ -190 +190 @@
 #if QT_VERSION < 0x040000
     if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 
+      return;
+    }
 #else
     // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel)
@@ -203 +205 @@
     }
     if ((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) {
-#endif
       return;
+
+    } else if ((sw == 0) && (sh == 0)) { // NOT A TOP LEVEL WIDGET
+      if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 
+        //        return;
+      }
     }
+#endif
   }
 #ifdef G4DEBUG_VIS_OGL

trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

@@ -210 +210 @@
 
 
+// We have to get several case :
+// - Only activate the windows (mouse click for example) -> Do not redraw
+// - resize window -> redraw
+// - try to avoid recompute everything if we do not rescale picture (side is the same)
+ 
 void G4OpenGLStoredQtViewer::paintGL()
 {
@@ -250 +255 @@
   ClearView (); //ok, put the background correct
   ComputeView();
-     
+
   fHasToRepaint =false;