Changeset 688 for trunk/geant4/visualization/OpenGL/src

Timestamp:

Jan 15, 2008, 2:19:33 PM (17 years ago)

Author:

garnier

Message:

mise a jour par rapport au commit sur cvs de geant4

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (1 diff)
• G4OpenGLImmediateSceneHandler.cc (modified) (4 diffs)
• G4OpenGLQtExportDialog.cc (modified) (1 diff)
• G4OpenGLQtViewer.cc (modified) (8 diffs)
• G4OpenGLSceneHandler.cc (modified) (6 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• G4OpenGLStoredSceneHandler.cc (modified) (4 diffs)
• G4OpenGLStoredViewer.cc (modified) (1 diff)
• G4OpenGLViewer.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.3 2007/11/15 18:24:28 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.4 2008/01/15 11:05:08 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.27 2007/04/04 16:50:26 allison Exp $
+// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.28 2008/01/04 22:07:01 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -130 +130 @@
 
 void G4OpenGLImmediateSceneHandler::BeginPrimitives
-(const G4Transform3D& objectTransformation) {
+(const G4Transform3D& objectTransformation)
+{
   G4OpenGLSceneHandler::BeginPrimitives (objectTransformation);
+
+  G4OpenGLTransform3D oglt (objectTransformation);
+
   glPushMatrix();
-  G4OpenGLTransform3D oglt (objectTransformation);
 
   /*************************** Check matrix.
@@ -158 +161 @@
 }
 
-void G4OpenGLImmediateSceneHandler::BeginPrimitives2D()
-{
-  G4OpenGLSceneHandler::BeginPrimitives2D();
+void G4OpenGLImmediateSceneHandler::BeginPrimitives2D
+(const G4Transform3D& objectTransformation)
+{
+  G4OpenGLSceneHandler::BeginPrimitives2D(objectTransformation);
 
   // Push current 3D world matrices and load identity to define screen
@@ -171 +175 @@
   glPushMatrix();
   glLoadIdentity();
+  G4OpenGLTransform3D oglt (objectTransformation);
+  glMultMatrixd (oglt.GetGLMatrix ());
 }
 

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtExportDialog.cc,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
+// $Id: G4OpenGLQtExportDialog.cc,v 1.5 2008/01/15 11:05:08 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
 // 
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.8 2007/11/30 14:47:30 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.9 2008/01/15 11:05:08 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLQtViewer.hh"
@@ -590 +590 @@
 
 #if QT_VERSION < 0x030200
-//   QAction *controlPanels = new QAction("&Control panels","&Control panels",CTRL+Key_C,mActions);
-//   QAction *exitG4 =  new QAction("&Exit to G4Vis >","&Exit to G4Vis >",CTRL+Key_E,mActions);
   QAction *createEPS =  new QAction("&Save as ...","&Save as ...",CTRL+Key_S,mActions);
 #else
-//   QAction *controlPanels = new QAction("&Control panels",CTRL+Key_C,mActions);
-//   QAction *exitG4 =  new QAction("&Exit to G4Vis >",CTRL+Key_E,mActions);
   QAction *createEPS =  new QAction("&Save as ...",CTRL+Key_S,mActions);
 #endif
-//   controlPanels->addTo(mActions);
-//   exitG4->addTo(mActions);
   createEPS->addTo(mActions);
-//   QObject ::connect(controlPanels, 
-//                     SIGNAL(activated()),
-//                     this, 
-//                     SLOT(actionControlPanels()));
-//   QObject ::connect(exitG4, 
-//                     SIGNAL(activated()),
-//                     this, 
-//                     SLOT(actionExitG4()));
   QObject ::connect(createEPS, 
                     SIGNAL(activated()),
@@ -617 +603 @@
   // === Action Menu ===
   QMenu *mActions = fContextMenu->addMenu("&Actions");
-//   QAction *controlPanels = mActions->addAction("Control panels");
-//   QAction *exitG4 = mActions->addAction("Exit to G4Vis >");
   QAction *createEPS = mActions->addAction("Save as ...");
-//   QObject ::connect(controlPanels, 
-//                     SIGNAL(triggered()),
-//                     this, 
-//                     SLOT(actionControlPanels()));
-//   QObject ::connect(exitG4, 
-//                     SIGNAL(triggered()),
-//                     this, 
-//                     SLOT(actionExitG4()));
   QObject ::connect(createEPS, 
                     SIGNAL(triggered()),
@@ -1188 +1164 @@
 #endif
 }
-
-
-// void G4OpenGLQtViewer::actionControlPanels() {
-// #ifdef GEANT4_QT_DEBUG
-//   printf("G4OpenGLQtViewer::actionControlPanels \n");
-// #endif
-// }
-
-// void G4OpenGLQtViewer::actionExitG4() {
-// #ifdef GEANT4_QT_DEBUG
-//   printf("G4OpenGLQtViewer::actionExitG4() \n");
-// #endif
-// }
 
 void G4OpenGLQtViewer::actionCreateEPS() {
@@ -1356 +1319 @@
 }
 
-
 /**
    @param pos_x mouse x position
@@ -1366 +1328 @@
 void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::ButtonState mButtons)
 #else
-  void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::MouseButtons mButtons)
+void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::MouseButtons mButtons)
 #endif
 {
@@ -1611 +1573 @@
   int size = width*height;
   
-
   if (depth == 1)
     size = (width+7)/8*height;

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.51 2007/05/25 15:41:38 allison Exp $
+// $Id: G4OpenGLSceneHandler.cc,v 1.52 2008/01/04 22:07:01 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -72 +72 @@
   G4VSceneHandler (system, id, name),
   fPickName(0),
+  fProcessing2D (false),
   fProcessingPolymarker(false)
 {}
@@ -124 +125 @@
 }
 
-void G4OpenGLSceneHandler::BeginPrimitives2D ()
-{
-  G4VSceneHandler::BeginPrimitives2D ();
+void G4OpenGLSceneHandler::BeginPrimitives2D
+(const G4Transform3D& objectTransformation)
+{
+  G4VSceneHandler::BeginPrimitives2D (objectTransformation);
+  fProcessing2D = true;
 }
 
 void G4OpenGLSceneHandler::EndPrimitives2D ()
 {
+  fProcessing2D = false;
   G4VSceneHandler::EndPrimitives2D ();
 }
@@ -515 +519 @@
       glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, materialColour);
     }
-    glEnable (GL_LIGHTING);
+    if (!fProcessing2D) glEnable (GL_LIGHTING);
     break;
   case (G4ViewParameters::wireframe):
@@ -605 +609 @@
       glStencilOp (GL_KEEP, GL_KEEP, GL_KEEP);
       if (drawing_style == G4ViewParameters::hlhsr) {
-        glEnable (GL_LIGHTING);
+        if (!fProcessing2D) glEnable (GL_LIGHTING);
       }
       glEnable (GL_DEPTH_TEST);
@@ -759 +763 @@
   case (G4ViewParameters::hsr):
     {
-      glEnable (GL_LIGHTING);
+      if (!fProcessing2D) glEnable (GL_LIGHTING);
       glEnable (GL_DEPTH_TEST);
       glEnable (GL_AUTO_NORMAL);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.6 2007/11/15 18:24:28 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.8 2008/01/15 11:05:08 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.34 2007/04/04 16:50:27 allison Exp $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.35 2008/01/04 22:07:01 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -60 +60 @@
 fMemoryForDisplayLists (true),
 fAddPrimitivePreambleNestingDepth (0),
-fTopPODL (0),
-fProcessing2D (false)
+fTopPODL (0)
 {}
 
@@ -138 +137 @@
     glPushMatrix();
     glLoadIdentity();
+    G4OpenGLTransform3D oglt (*fpObjectTransformation);
+    glMultMatrixd (oglt.GetGLMatrix ());
+    glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
   }
 }
@@ -239 +241 @@
 }
 
-void G4OpenGLStoredSceneHandler::BeginPrimitives2D()
-{
-  G4OpenGLSceneHandler::BeginPrimitives2D();
-  fProcessing2D = true;
+void G4OpenGLStoredSceneHandler::BeginPrimitives2D
+(const G4Transform3D& objectTransformation)
+{
+  G4OpenGLSceneHandler::BeginPrimitives2D(objectTransformation);
 }
 
 void G4OpenGLStoredSceneHandler::EndPrimitives2D ()
 {
-  fProcessing2D = false;
   G4OpenGLSceneHandler::EndPrimitives2D ();
 }

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredViewer.cc

@@ -142 +142 @@
     }
 
-    if (fG4OpenGLStoredSceneHandler.fTopPODL) {
+    if (fG4OpenGLStoredSceneHandler.fTopPODL) 
       glCallList (fG4OpenGLStoredSceneHandler.fTopPODL);
-    }
+
     for (size_t i = 0; i < fG4OpenGLStoredSceneHandler.fTOList.size(); ++i) {
       G4OpenGLStoredSceneHandler::TO& to =

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

@@ -26 +26 @@
 //
 // $Id: G4OpenGLViewer.cc,v 1.34 2007/05/24 18:27:13 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -313 +313 @@
 void G4OpenGLViewer::Pick(GLdouble x, GLdouble y)
 {
-  printf("G4OpenGLViewer::Pick\n");
   //G4cout << "X: " << x << ", Y: " << y << G4endl;
   const G4int BUFSIZE = 512;