Changeset 1196 for trunk/source/visualization/OpenGL

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/visualization/OpenGL

Files:

• GNUmakefile (modified) (1 diff)
• History (modified) (2 diffs)
• src/G4OpenGLImmediateQtViewer.cc (modified) (1 diff)
• src/G4OpenGLSceneHandler.cc (modified) (7 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• src/G4OpenGLStoredXViewer.cc (modified) (1 diff)
• src/G4OpenGLStoredXmViewer.cc (modified) (1 diff)
• src/G4OpenGLViewer.cc (modified) (2 diffs)

trunk/source/visualization/OpenGL/GNUmakefile

@@ -41 +41 @@
 INTYLIBS += -L$(G4LIBDIR)
 
+SUBLIBS += G4gl2ps
+
 include $(G4INSTALL)/config/moc.gmk
 include $(G4INSTALL)/config/common.gmk

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.159 2009/11/03 11:18:03 allison Exp $
+$Id: History,v 1.160 2009/11/17 11:52:51 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+17th November 2009  Gabriele Cosmo
+- Fixed problem in the generation of dependencies on Windows for some
+  files, due to redefinition of min and max macros from windows.h in
+  G4OpenGL.hh.
+- Fixed GNUmakefile.
 
 3rd November 2009  John Allison  (opengl-V09-02-09 coworks greps-V09-02-03)

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

@@ -60 +60 @@
 G4OpenGLImmediateQtViewer::~G4OpenGLImmediateQtViewer() {
   makeCurrent();
-  GetSceneHandler()->RemoveViewerFromList(this);
 }
 

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

@@ -198 +198 @@
 void G4OpenGLSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
 {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLSceneHandler::AddPrimitive polymarker");
+#endif
   G4int nPoints = polymarker.size ();
   if (nPoints <= 0) return;
@@ -214 +217 @@
   case G4Polymarker::dots:
     {
+#ifdef G4DEBUG_VIS_OGL
+  printf(" dots ");
+#endif
       for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
         G4Circle dot (polymarker);
@@ -225 +231 @@
   case G4Polymarker::circles:
     {
+#ifdef G4DEBUG_VIS_OGL
+  printf(" circle ");
+#endif
       for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
         G4Circle circle (polymarker);
@@ -234 +243 @@
   case G4Polymarker::squares:
     {
+#ifdef G4DEBUG_VIS_OGL
+  printf(" square ");
+#endif
       for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
         G4Square square (polymarker);
@@ -243 +255 @@
   }
 
+#ifdef G4DEBUG_VIS_OGL
+  printf(" \n");
+#endif
   fProcessingPolymarker = false;
 }
@@ -319 +334 @@
   // Note: colour treated in sub-class.
 
-  if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ())
+  if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) {
+#ifdef G4DEBUG_VIS_OGL
+    printf("+");
+#endif
     glDisable (GL_DEPTH_TEST);
-  else {glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);}
+  } else {
+#ifdef G4DEBUG_VIS_OGL
+    printf("-");
+#endif
+    glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);}
   
   glDisable (GL_LIGHTING);
@@ -365 +387 @@
   MarkerSizeType sizeType;
   G4double size = GetMarkerSize(marker, sizeType);
+
 
   // Draw...

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

@@ -63 +63 @@
   // when close event.
   //   ((QDialog*)window())->reject();
-  GetSceneHandler()->RemoveViewerFromList(this);
 }
 

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

@@ -57 +57 @@
 }
 
-G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {}
+G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer DELETE\n");
+#endif
+  //  GetSceneHandler()->RemoveViewerFromList(this);
+}
 
 void G4OpenGLStoredXViewer::Initialise () {

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

@@ -58 +58 @@
 }
 
-G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () {}
+G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () {
+  GetSceneHandler()->RemoveViewerFromList(this);
+}
 
 void G4OpenGLStoredXmViewer::Initialise () {

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

@@ -103 +103 @@
 }
 
-G4OpenGLViewer::~G4OpenGLViewer () {}
+G4OpenGLViewer::~G4OpenGLViewer () {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::~G4OpenGLViewer DELETING \n");
+#endif
+}
 
 void G4OpenGLViewer::InitializeGLView () 
@@ -640 +644 @@
     fGL2PSAction->setLineWidth(1);
     // By default, we choose the point size (markers...)
-    fGL2PSAction->setPointSize(2);
-
+    
+#ifdef G4DEBUG_VIS_OGL
+    //  printf("G4OpenGLViewer::printGl2PS marker size:%f\n",    GetSceneHandler()->GetMarkerSize());
+#endif
+#ifdef G4DEBUG_VIS_OGL
+  //  printf("G4OpenGLViewer::printGl2PS marker2 size:%f\n",fpViewer -> GetViewParameters ()->GetDefaultMarker ().GetScreenSize());
+#endif
+    //    if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) {
+    //      fGL2PSAction->setPointSize(fpViewer -> GetViewParameters ()->GetDefaultMarker ().GetScreenSize());
+    //    } else {
+      fGL2PSAction->setPointSize(2);
+      //    }
     DrawView ();
     fGL2PSAction->disableFileWriting();