Changeset 938 for trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

Timestamp:

Mar 4, 2009, 6:58:22 PM (15 years ago)

Author:

garnier

Message:

print PS marche, mais plein de msg de debug a supprimer

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc (modified) (3 diffs)

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

@@ -83 +83 @@
 fTopPODL (0),
 fLastPolymarker(),
-fLastPolymarkers()
+fLastPolymarkers(),
+nbDoublons(0)
 {}
 
@@ -210 +211 @@
 {
 
+  std::vector< G4Polymarker > poly;
     // 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
+    // 257,90 10Gev supp doublons MAX  - bitmap 42 frame en 10 sec 45757 markers et 16243 enleves
   // Check
   int reste = polymarker.size();
-  for (unsigned int a=0; a< fLastPolymarkers.size();a++) {
+  bool res = false;
+  if (fLastPolymarkers.size() > 0 ) {
     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());
+      res= false;
+      int size= fLastPolymarkers.size()-1;
+      for (unsigned int a=0; a< fLastPolymarkers.size() ;a++) {
+        if (( fLastPolymarkers[size-a].GetPosition().x() == polymarker[b].x()) &&
+            ( fLastPolymarkers[size-a].GetPosition().y() == polymarker[b].y()) &&
+            ( fLastPolymarkers[size-a].GetPosition().z() == polymarker[b].z())) {
+          reste --;
+          res= true;
+          nbDoublons++;
+          printf("G4OpenGLStoredSceneHandler::AddPrimitive  DOUBLON %d total:%d et pos %d reste %d ----------- point %f %f %f\n",size-a,nbDoublons,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);
-  }
-  
+      // Add
+      if (!res) {
+        G4Polymarker tmp;
+        tmp.SetPosition(polymarker[b]);
+        fLastPolymarkers.push_back(tmp);
+      poly.push_back(tmp);
+      }
+    }
+  } else {
+    for (unsigned int b=0; b< polymarker.size();b++) {
+      G4Polymarker tmp;
+      tmp.SetPosition(polymarker[b]);
+      fLastPolymarkers.push_back(tmp);
+      poly.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;
-    }
+  if (poly.size() == 1 ) {
+    //   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(poly[0]);
+    //    fLastPolymarker.SetPosition(polymarker[poly]);
+    return;
   }
 #endif  
@@ -258 +274 @@
   G4OpenGLSceneHandler::AddPrimitive(polymarker);
   AddPrimitivePostamble();
-  fLastPolymarker.SetPosition(polymarker[polymarker.size()-1]);
+//  fLastPolymarker.SetPosition(polymarker[polymarker.size()-1]);
 }