Changeset 1258 for trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc

Timestamp:

May 20, 2010, 11:49:26 AM (14 years ago)

Author:

garnier

Message:

cvs update

File:

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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4TrajectoryDrawerUtils.cc,v 1.13 2010/04/27 15:46:18 lgarnier Exp $
+// $Id: G4TrajectoryDrawerUtils.cc,v 1.14 2010/05/11 11:58:18 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -40 +40 @@
 #include "G4UIcommand.hh"
 #include "G4AttValue.hh"
+#include <sstream>
 
 namespace G4TrajectoryDrawerUtils {
@@ -79 +80 @@
     }
   }
-  
+
+  /***
   void DrawLineAndPoints(const G4VTrajectory& traj, const G4int& i_mode, const G4Colour& colour, const G4bool& visible) {
     // If i_mode>=0, draws a trajectory as a polyline (default is blue for
@@ -87 +89 @@
     // given by std::abs(i_mode)/1000.  E.g: i_mode = 5000 gives easily 
     // visible markers.
+
+    static G4bool warnedAboutIMode = false;
+    std::ostringstream oss;
+    oss << "WARNING: DEPRECATED use of i_mode (i_mode: " << i_mode
+        << ").  Feature will be removed at a future major release.";
+    if (!warnedAboutIMode) {
+      G4Exception
+        ("G4TrajectoryDrawerUtils::DrawLineAndPoints(traj, i_mode, colour, visible)",
+         "",
+         JustWarning,
+         oss.str().c_str());
+      warnedAboutIMode = true;
+    }
     
     G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
@@ -130 +145 @@
     
   }
+  ***/
   
   static void GetTimes(const G4VTrajectory& traj,
@@ -146 +162 @@
 
       // Pre- and Post-Point times from the trajectory point...
-      G4double trajectoryPointPreTime = -DBL_MAX;
-      G4double trajectoryPointPostTime = DBL_MAX;
+      G4double trajectoryPointPreTime = -std::numeric_limits<double>::max();
+      G4double trajectoryPointPostTime = std::numeric_limits<double>::max();
       std::vector<G4AttValue>* trajectoryPointAttValues =
         aTrajectoryPoint->CreateAttValues();
@@ -356 +372 @@
   void DrawLineAndPoints(const G4VTrajectory& traj, const G4VisTrajContext& context, const G4int& i_mode) 
   {
+    static G4bool warnedAboutIMode = false;
+    std::ostringstream oss;
+    oss << "WARNING: DEPRECATED use of i_mode (i_mode: " << i_mode
+        << ").  Feature will be removed at a future major release.";
+    if (!warnedAboutIMode) {
+      G4Exception
+        ("G4TrajectoryDrawerUtils::DrawLineAndPoints(traj, context, i_mode)",
+         "",
+         JustWarning,
+         oss.str().c_str());
+      warnedAboutIMode = true;
+    }
+
     // Extra copy while i_mode is still around
     G4VisTrajContext myContext(context);
@@ -370 +399 @@
       myContext.SetAuxPtsSize(markerSize);
       myContext.SetStepPtsSize(markerSize);
-
-      static G4bool warnedAboutIMode = false;
-
-      if (!warnedAboutIMode) {
-        G4cout<<"Trajectory drawing configuration will be based on imode value of "<<i_mode<<G4endl;
-        warnedAboutIMode = true;
-      }
     }
 
@@ -421 +443 @@
     }
   }
+
+  void DrawLineAndPoints(const G4VTrajectory& traj, const G4VisTrajContext& context) 
+  {
+    // Return if don't need to do anything
+    if (!context.GetDrawLine() && !context.GetDrawAuxPts() && !context.GetDrawStepPts()) return;
+    
+    // Get points to draw
+    G4Polyline trajectoryLine;
+    G4Polymarker stepPoints;
+    G4Polymarker auxiliaryPoints;
+    
+    GetPoints(traj, trajectoryLine, auxiliaryPoints, stepPoints);
+    
+    if (context.GetTimeSliceInterval()) {
+
+      // Get corresponding track time information, if any
+      std::vector<G4double> trajectoryLineTimes;
+      std::vector<G4double> stepPointTimes;
+      std::vector<G4double> auxiliaryPointTimes;
+  
+      GetTimes(traj, trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes);
+
+      // Check validity
+      if (trajectoryLineTimes.size() != trajectoryLine.size() ||
+          stepPointTimes.size() != stepPoints.size() ||
+          auxiliaryPointTimes.size() != auxiliaryPoints.size()) {
+
+        // Revert to drawing without time information...
+        DrawWithoutTime(context, trajectoryLine, auxiliaryPoints, stepPoints);
+      } else {
+
+        SliceLine(context.GetTimeSliceInterval(),
+                  trajectoryLine, trajectoryLineTimes);
+
+        DrawWithTime(context,
+                     trajectoryLine, auxiliaryPoints, stepPoints,
+                     trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes);
+      }
+
+    } else {
+
+      DrawWithoutTime(context, trajectoryLine, auxiliaryPoints, stepPoints);
+
+    }
+  }
 }