Changeset 936 for trunk/source/visualization

Timestamp:

Mar 3, 2009, 5:46:00 PM (15 years ago)

Author:

garnier

Message:

ajout de comments de debug

Location:

trunk/source/visualization

Files:

• OpenGL/include/G4OpenGLStoredSceneHandler.hh (modified) (1 diff)
• OpenGL/src/G4OpenGLStoredSceneHandler.cc (modified) (3 diffs)
• modeling/src/G4TrajectoryDrawerUtils.cc (modified) (1 diff)

trunk/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -108 +108 @@
 private:
   G4Polymarker fLastPolymarker ;
+  std::vector< G4Polymarker > fLastPolymarkers ;
 };
 

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

@@ -81 +81 @@
 fMemoryForDisplayLists (true),
 fAddPrimitivePreambleNestingDepth (0),
-fTopPODL (0)
+fTopPODL (0),
+fLastPolymarker(),
+fLastPolymarkers()
 {}
 
@@ -207 +209 @@
 void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
 {
+
+    // 40,83 N03 lancement
+    // 289,69 10Gev supp doublons   + bitmap 21 frame en 10 sec
+    // 343,45 10Gev full polymarker + bitmap 15 frame en 10 sec
+    // 351,67 10Gev full polymarker - bitmap 31 frame en 10 sec
+    // 294,90 10Gev supp doublons   - bitmap 42 frame en 10 sec
+  // Check
+  int reste = polymarker.size();
+  for (unsigned int a=0; a< fLastPolymarkers.size();a++) {
+    for (unsigned int b=0; b< polymarker.size();b++) {
+      if (( fLastPolymarkers[a].GetPosition().x() == polymarker[b].x()) &&
+          ( fLastPolymarkers[a].GetPosition().y() == polymarker[b].y()) &&
+          ( fLastPolymarkers[a].GetPosition().z() == polymarker[b].z())) {
+        reste --;
+        printf("G4OpenGLStoredSceneHandler::AddPrimitive  DOUBLON %d et pos %d reste %d ----------- point %f %f %f\n",a,b,reste,polymarker[b].x(),polymarker[b].y(),polymarker[b].z());
+      }
+    }
+  }
+  // Add
+  for (unsigned int a=0; a< polymarker.size();a++) {
+    G4Polymarker tmp;
+    tmp.SetPosition(polymarker[a]);
+    fLastPolymarkers.push_back(tmp);
+  }
+  
+#define TEST_MARKER 1
+#ifdef TEST_MARKER 
+  // if it is already done
+  if (polymarker.size() >0) {
+    if (( fLastPolymarker.GetPosition().x() == polymarker[0].x()) &&
+        ( fLastPolymarker.GetPosition().y() == polymarker[0].y()) &&
+        ( fLastPolymarker.GetPosition().z() == polymarker[0].z())) {
+      if (fpViewer->GetViewParameters().IsPicking()) {
+        glLoadName(++fPickName);
+        fPickMap[fPickName] = 0;
+      }
+      printf("G4OpenGLStoredSceneHandler::AddPrimitive  SUPPR ----------- point %f %f %f\n",polymarker[0].x(),polymarker[0].y(),polymarker[0].z());
+      const G4Colour& c = GetColour (polymarker);
+      glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
+      G4OpenGLSceneHandler::AddPrimitive(polymarker);
+      fLastPolymarker.SetPosition(polymarker[polymarker.size()-1]);
+      return;
+    }
+  }
+#endif  
+  printf("G4OpenGLStoredSceneHandler::AddPrimitive Cree une nouvelle liste de markers\n");
   AddPrimitivePreamble(polymarker);
   G4OpenGLSceneHandler::AddPrimitive(polymarker);
   AddPrimitivePostamble();
+  fLastPolymarker.SetPosition(polymarker[polymarker.size()-1]);
 }
 
@@ -297 +346 @@
 void G4OpenGLStoredSceneHandler::EndModeling () {
   // Make a List which calls the other lists.
+  printf("G4OpenGLStoredSceneHandler::EndModeling Cree une nouvelle liste+++++++++++++++++++++++++++\n");
   fTopPODL = glGenLists (1);
   if (glGetError() == GL_OUT_OF_MEMORY) {  // Could pre-allocate?

trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc

@@ -242 +242 @@
     //
     for (size_t iPoint = 0; iPoint < trajectoryLine.size (); iPoint++) {
-      //      printf("DrawLineAndPoints trajectory i:%d/%d center:%f,%f,%f\n",iPoint,trajectoryLine.size (),trajectoryLine[iPoint].x(),trajectoryLine[iPoint].y(),trajectoryLine[iPoint].z());
+      printf("DrawLineAndPoints trajectory i:%d/%d center:%f,%f,%f\n",iPoint,trajectoryLine.size (),trajectoryLine[iPoint].x(),trajectoryLine[iPoint].y(),trajectoryLine[iPoint].z());
     }
     for (size_t iPoint = 0; iPoint < auxiliaryPoints.size (); iPoint++) {