Changeset 1242 for trunk/source/visualization/modeling/src

Timestamp:

Apr 12, 2010, 5:20:43 PM (14 years ago)

Author:

garnier

Message:

bugged version

File:

• trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc (modified) (3 diffs)

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

@@ -33 +33 @@
 #include "G4Polyline.hh"
 #include "G4Polymarker.hh"
+#include "G4Text.hh"
 #include "G4VTrajectory.hh"
 #include "G4VTrajectoryPoint.hh"
@@ -56 +57 @@
         for (size_t iAux=0; iAux<auxiliaries->size(); ++iAux) {
           const G4ThreeVector pos((*auxiliaries)[iAux]);
-          trajectoryLine.push_back(pos);
-          auxiliaryPoints.push_back(pos);
-        }
+#ifdef G4VIS_BUILD_OPTIMISE_1
+          if (trajectoryLine.size() >0) {
+            if (pos != trajectoryLine[trajectoryLine.size()-1]) {
+              trajectoryLine.push_back(pos);
+              auxiliaryPoints.push_back(pos);
+            }
+         } else {
+#endif
+            trajectoryLine.push_back(pos);
+            auxiliaryPoints.push_back(pos);
+#ifdef G4VIS_BUILD_OPTIMISE_1
+          }
+#endif
+        }
       }
       const G4ThreeVector pos(aTrajectoryPoint->GetPosition());
-      trajectoryLine.push_back(pos);
-      stepPoints.push_back(pos);
-    }    
+#ifdef G4VIS_BUILD_OPTIMISE_1
+      if (trajectoryLine.size() >0) {
+        if (pos != trajectoryLine[trajectoryLine.size()-1]) {
+          trajectoryLine.push_back(pos);
+          stepPoints.push_back(pos);
+        }
+      } else {
+#endif
+        trajectoryLine.push_back(pos);
+        stepPoints.push_back(pos);
+#ifdef G4VIS_BUILD_OPTIMISE_1
+      }
+#endif
+    }
   }
 
@@ -274 +297 @@
 
       pVVisManager->Draw(stepPoints);
+#ifdef G4VIS_BUILD_OPTIMISE_2
+      G4Text text = G4Text("");
+      pVVisManager->Draw(text);
+#endif
     }
   }