Changeset 931 for trunk/source/visualization/modeling

Timestamp:

Feb 25, 2009, 4:19:05 PM (15 years ago)

Author:

garnier

Message:

test pour GL_POINTS au lieu de glBitmap

Location:

trunk/source/visualization/modeling

Files:

• History (modified) (2 diffs)
• include/G4AttFilterUtils.hh (modified) (1 diff)
• include/G4AttValueFilterT.hh (modified) (1 diff)
• include/G4AttributeFilterT.hh (modified) (1 diff)
• include/G4AxesModel.hh (modified) (1 diff)
• include/G4BoundingSphereScene.hh (modified) (1 diff)
• include/G4CallbackModel.hh (modified) (1 diff)
• include/G4FlavoredParallelWorldModel.hh (modified) (1 diff)
• include/G4HitFilterFactories.hh (modified) (1 diff)
• include/G4HitsModel.hh (modified) (1 diff)
• include/G4LogicalVolumeModel.hh (modified) (1 diff)
• include/G4ModelApplyCommandsT.hh (modified) (10 diffs)
• include/G4ModelColourMap.hh (modified) (1 diff)
• include/G4ModelCommandUtils.hh (modified) (3 diffs)
• include/G4ModelCommandsT.hh (modified) (5 diffs)
• include/G4ModelCompoundCommandsT.hh (modified) (1 diff)
• include/G4ModelingParameters.hh (modified) (1 diff)
• include/G4ModelingParameters.icc (modified) (1 diff)
• include/G4NullModel.hh (modified) (1 diff)
• include/G4PhysicalVolumeMassScene.hh (modified) (1 diff)
• include/G4PhysicalVolumeModel.hh (modified) (1 diff)
• include/G4PhysicalVolumeSearchScene.hh (modified) (1 diff)
• include/G4PhysicalVolumeSearchScene.icc (modified) (1 diff)
• include/G4ScaleModel.hh (modified) (1 diff)
• include/G4TextModel.hh (modified) (1 diff)
• include/G4TrajectoriesModel.hh (modified) (1 diff)
• include/G4TrajectoryChargeFilter.hh (modified) (1 diff)
• include/G4TrajectoryDrawByAttribute.hh (modified) (1 diff)
• include/G4TrajectoryDrawByCharge.hh (modified) (1 diff)
• include/G4TrajectoryDrawByOriginVolume.hh (modified) (1 diff)
• include/G4TrajectoryDrawByParticleID.hh (modified) (1 diff)
• include/G4TrajectoryDrawerUtils.hh (modified) (1 diff)
• include/G4TrajectoryFilterFactories.hh (modified) (1 diff)
• include/G4TrajectoryGenericDrawer.hh (modified) (1 diff)
• include/G4TrajectoryModelFactories.hh (modified) (1 diff)
• include/G4TrajectoryOriginVolumeFilter.hh (modified) (1 diff)
• include/G4TrajectoryParticleFilter.hh (modified) (1 diff)
• include/G4VAttValueFilter.hh (modified) (1 diff)
• include/G4VModel.hh (modified) (1 diff)
• include/G4VModel.icc (modified) (1 diff)
• include/G4VModelCommand.hh (modified) (1 diff)
• include/G4VModelFactory.hh (modified) (1 diff)
• include/G4VTrajectoryModel.hh (modified) (1 diff)
• include/G4VisTrajContext.hh (modified) (5 diffs)
• include/G4VisTrajContext.icc (modified) (3 diffs)
• src/G4AttFilterUtils.cc (modified) (1 diff)
• src/G4AxesModel.cc (modified) (1 diff)
• src/G4BoundingSphereScene.cc (modified) (1 diff)
• src/G4FlavoredParallelWorldModel.cc (modified) (1 diff)
• src/G4HitFilterFactories.cc (modified) (1 diff)
• src/G4HitsModel.cc (modified) (1 diff)
• src/G4LogicalVolumeModel.cc (modified) (1 diff)
• src/G4ModelingParameters.cc (modified) (1 diff)
• src/G4NullModel.cc (modified) (1 diff)
• src/G4PhysicalVolumeMassScene.cc (modified) (1 diff)
• src/G4PhysicalVolumeModel.cc (modified) (1 diff)
• src/G4PhysicalVolumeSearchScene.cc (modified) (1 diff)
• src/G4ScaleModel.cc (modified) (1 diff)
• src/G4TextModel.cc (modified) (1 diff)
• src/G4TrajectoriesModel.cc (modified) (1 diff)
• src/G4TrajectoryChargeFilter.cc (modified) (1 diff)
• src/G4TrajectoryDrawByAttribute.cc (modified) (1 diff)
• src/G4TrajectoryDrawByCharge.cc (modified) (1 diff)
• src/G4TrajectoryDrawByOriginVolume.cc (modified) (1 diff)
• src/G4TrajectoryDrawByParticleID.cc (modified) (1 diff)
• src/G4TrajectoryDrawerUtils.cc (modified) (5 diffs)
• src/G4TrajectoryFilterFactories.cc (modified) (1 diff)
• src/G4TrajectoryGenericDrawer.cc (modified) (1 diff)
• src/G4TrajectoryModelFactories.cc (modified) (1 diff)
• src/G4TrajectoryOriginVolumeFilter.cc (modified) (1 diff)
• src/G4TrajectoryParticleFilter.cc (modified) (1 diff)
• src/G4VModel.cc (modified) (1 diff)
• src/G4VTrajectoryModel.cc (modified) (1 diff)
• src/G4VisTrajContext.cc (modified) (2 diffs)

trunk/source/visualization/modeling/History

@@ -1 @@
-$Id: History,v 1.106 2008/11/21 21:50:02 perl Exp $
+$Id: History,v 1.109 2009/02/25 14:21:45 allison Exp $
 -------------------------------------------------------------------
 
@@ -21 +21 @@
 ---------------------------------------
 
-27th July 2008  John Allison (modeling-V09-01-01)
+25th February 2009  John Allison  (modeling-V09-02-01 - needs greps-V09-02-01)
+- G4ModelApplyCommandsT: Added visManager->NotifyHandlers() after
+  application (Apply) of all commands.  Forces update of all viewers
+  after a change of model, e.g., trajectory colour, point size, etc.
+
+24th February 2009  John Allison  (modeling-V09-02-00 - needs greps-V09-02-00)
+- Added setAux/StepPtsSizeType commands (candidates: "none world screen").
+- Added unit to setAux/StepPtsSize for SizeType == world.
+
+27th July 2008  John Allison  (modeling-V09-01-01)
 - G4PhysicalVolumeSearchScene.cc: Cosmetic improvement to a message.
 

trunk/source/visualization/modeling/include/G4AttFilterUtils.hh

@@ -25 +25 @@
 //
 // $Id: G4AttFilterUtils.hh,v 1.2 2006/12/13 15:49:58 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Visualisation attribute filter utility functions.

trunk/source/visualization/modeling/include/G4AttValueFilterT.hh

@@ -25 +25 @@
 //
 // $Id: G4AttValueFilterT.hh,v 1.3 2006/12/13 15:50:00 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Templated class for G4AttValue filters.

trunk/source/visualization/modeling/include/G4AttributeFilterT.hh

@@ -25 +25 @@
 //
 // $Id: G4AttributeFilterT.hh,v 1.6 2006/12/13 15:50:02 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Generic attribute filter.

trunk/source/visualization/modeling/include/G4AxesModel.hh

@@ -26 +26 @@
 //
 // $Id: G4AxesModel.hh,v 1.6 2006/11/01 10:28:42 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4BoundingSphereScene.hh

@@ -26 +26 @@
 //
 // $Id: G4BoundingSphereScene.hh,v 1.18 2008/01/04 21:59:15 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4CallbackModel.hh

@@ -26 +26 @@
 //
 // $Id: G4CallbackModel.hh,v 1.5 2006/06/29 21:30:10 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh

@@ -26 +26 @@
 //
 // $Id: G4FlavoredParallelWorldModel.hh,v 1.8 2006/06/29 21:30:12 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // P. Mora de Freitas et M.Verderi - 19 June 1998.

trunk/source/visualization/modeling/include/G4HitFilterFactories.hh

@@ -25 +25 @@
 //
 /// $Id: G4HitFilterFactories.hh,v 1.1 2006/09/12 18:53:03 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 //

trunk/source/visualization/modeling/include/G4HitsModel.hh

@@ -26 +26 @@
 //
 // $Id: G4HitsModel.hh,v 1.10 2006/11/02 11:57:31 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4LogicalVolumeModel.hh

@@ -26 +26 @@
 //
 // $Id: G4LogicalVolumeModel.hh,v 1.9 2006/11/01 10:28:42 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4ModelApplyCommandsT.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ModelApplyCommandsT.hh,v 1.5 2006/09/11 21:22:02 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ModelApplyCommandsT.hh,v 1.6 2009/02/25 14:17:11 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // Abstract model messenges. Derived classes should implement
@@ -44 +44 @@
 #include "G4UIcommand.hh"
 #include "G4VModelCommand.hh"
-#include "globals.hh"
+#include "G4VVisManager.hh"
 #include <sstream>
 
@@ -152 +152 @@
 
   Apply(parameter, myColour);
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 
@@ -254 +256 @@
 
   Apply(myColour);
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 
@@ -301 +305 @@
 {
   Apply(fpCmd->GetNewBoolValue(newValue));
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 
@@ -347 +353 @@
 {
   Apply();
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 
@@ -395 +403 @@
 {
   Apply(fpCmd->GetNewDoubleValue(newValue));
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 
@@ -443 +453 @@
 {
   Apply(fpCmd->GetNewDoubleValue(newValue));
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 
@@ -490 +502 @@
 {
   Apply(fpCmd->GetNewIntValue(newValue));
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 
@@ -537 +551 @@
 {
   Apply(newValue);
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }
 

trunk/source/visualization/modeling/include/G4ModelColourMap.hh

@@ -25 +25 @@
 //
 // $Id: G4ModelColourMap.hh,v 1.2 2006/06/29 21:30:22 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Generic variable->G4Colour map, where "variable" is the template

trunk/source/visualization/modeling/include/G4ModelCommandUtils.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ModelCommandUtils.hh,v 1.2 2006/09/13 12:54:31 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ModelCommandUtils.hh,v 1.3 2009/02/24 12:00:56 allison Exp $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay September 2006
@@ -53 +53 @@
     messengers.push_back(new G4ModelCmdSetStepPtsColour<G4VisTrajContext>(context, placement));
     messengers.push_back(new G4ModelCmdSetStepPtsSize<G4VisTrajContext>(context, placement));
+    messengers.push_back(new G4ModelCmdSetStepPtsSizeType<G4VisTrajContext>(context, placement));
     messengers.push_back(new G4ModelCmdSetStepPtsType<G4VisTrajContext>(context, placement));
     messengers.push_back(new G4ModelCmdSetStepPtsFillStyle<G4VisTrajContext>(context, placement));
@@ -60 +61 @@
     messengers.push_back(new G4ModelCmdSetAuxPtsColour<G4VisTrajContext>(context, placement));
     messengers.push_back(new G4ModelCmdSetAuxPtsSize<G4VisTrajContext>(context, placement));
+    messengers.push_back(new G4ModelCmdSetAuxPtsSizeType<G4VisTrajContext>(context, placement));
     messengers.push_back(new G4ModelCmdSetAuxPtsType<G4VisTrajContext>(context, placement));
     messengers.push_back(new G4ModelCmdSetAuxPtsFillStyle<G4VisTrajContext>(context, placement));

trunk/source/visualization/modeling/include/G4ModelCommandsT.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ModelCommandsT.hh,v 1.12 2006/11/01 10:34:03 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ModelCommandsT.hh,v 1.13 2009/02/24 12:00:56 allison Exp $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Generic model messenges. 
@@ -398 +398 @@
 // Set auxiliary points size command
 template <typename M>
-class G4ModelCmdSetAuxPtsSize : public G4ModelCmdApplyDouble<M> {
+class G4ModelCmdSetAuxPtsSize : public G4ModelCmdApplyString<M> {
   
 public:
 
   G4ModelCmdSetAuxPtsSize(M* model, const G4String& placement,
-                          const G4String& cmdName="setAuxPtsSize")
-    :G4ModelCmdApplyDouble<M>(model, placement, cmdName)
-  {
-    G4ModelCmdApplyDouble<M>::Command()->SetGuidance("Set auxiliary points size command");
-  }
-  
-protected:
-
-   void Apply(const G4double& myDouble) {
-     G4VModelCommand<M>::Model()->SetAuxPtsSize(myDouble);
-  }
+                           const G4String& cmdName="setAuxPtsSize")
+    :G4ModelCmdApplyString<M>(model, placement, cmdName)
+  {
+    G4ModelCmdApplyString<M>::Command()->SetGuidance("Set auxiliary points size command");
+  }
+  
+protected:
+
+   void Apply(const G4String& sizeString) {
+     std::istringstream iss(sizeString);
+     G4double size;
+     G4String unit;
+     iss >> size >> unit;
+     if (G4VModelCommand<M>::Model()->GetAuxPtsSizeType() == G4VMarker::world)
+       {
+         G4double myDouble = G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(sizeString);
+         G4VModelCommand<M>::Model()->SetAuxPtsSize(myDouble);
+       }
+     else  // none or screen
+       {
+         G4VModelCommand<M>::Model()->SetAuxPtsSize(size);
+       }
+   }
   
 };
@@ -420 +432 @@
 // Set step points size command
 template <typename M>
-class G4ModelCmdSetStepPtsSize : public G4ModelCmdApplyDouble<M> {
+class G4ModelCmdSetStepPtsSize : public G4ModelCmdApplyString<M> {
   
 public:
@@ -426 +438 @@
   G4ModelCmdSetStepPtsSize(M* model, const G4String& placement,
                            const G4String& cmdName="setStepPtsSize")
-    :G4ModelCmdApplyDouble<M>(model, placement, cmdName)
-  {
-    G4ModelCmdApplyDouble<M>::Command()->SetGuidance("Set step points size command");
-  }
-  
-protected:
-
-   void Apply(const G4double& myDouble) {
-     G4VModelCommand<M>::Model()->SetStepPtsSize(myDouble);
-  }
+    :G4ModelCmdApplyString<M>(model, placement, cmdName)
+  {
+    G4ModelCmdApplyString<M>::Command()->SetGuidance("Set step points size command");
+  }
+  
+protected:
+
+   void Apply(const G4String& sizeString) {
+     std::istringstream iss(sizeString);
+     G4double size;
+     G4String unit;
+     iss >> size >> unit;
+     if (G4VModelCommand<M>::Model()->GetStepPtsSizeType() == G4VMarker::world)
+       {
+         G4double myDouble = G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(sizeString);
+         G4VModelCommand<M>::Model()->SetStepPtsSize(myDouble);
+       }
+     else  // none or screen
+       {
+         G4VModelCommand<M>::Model()->SetStepPtsSize(size);
+       }
+   }
   
 };
@@ -516 +540 @@
 
 ////////////////////////////////////////////////////////////////////////
+// Set step points size type command
+template <typename M>
+class G4ModelCmdSetStepPtsSizeType : public G4ModelCmdApplyString<M> {
+  
+public:
+
+  G4ModelCmdSetStepPtsSizeType(M* model, const G4String& placement,
+                                const G4String& cmdName="setStepPtsSizeType")
+    :G4ModelCmdApplyString<M>(model, placement, cmdName)
+  {
+    G4UIcmdWithAString* cmd = G4ModelCmdApplyString<M>::Command();
+    cmd->SetGuidance("Set step size type.");
+    cmd->SetCandidates("none world screen");
+  }
+  
+protected:
+
+  void Apply(const G4String& type) {
+    G4VMarker::SizeType mySizeType;
+    
+    if (type == "none") {mySizeType = G4VMarker::none;}
+    else if (type == "world") {mySizeType = G4VMarker::world;}
+    else if (type == "screen") {mySizeType = G4VMarker::screen;}
+    else {
+      std::ostringstream o;
+      o << "Invalid argument. See command guidance for options.";
+      G4Exception
+        ("G4ModelCmdSetStepPtsSizeType::Apply",
+         "InvalidArgument", JustWarning, o.str().c_str());
+      return;
+    }
+    G4VModelCommand<M>::Model()->SetStepPtsSizeType(mySizeType);
+  }
+  
+};
+
+////////////////////////////////////////////////////////////////////////
+// Set auxiliary points size type command
+template <typename M>
+class G4ModelCmdSetAuxPtsSizeType : public G4ModelCmdApplyString<M> {
+  
+public:
+
+  G4ModelCmdSetAuxPtsSizeType(M* model, const G4String& placement,
+                               const G4String& cmdName="setAuxPtsSizeType")
+    :G4ModelCmdApplyString<M>(model, placement, cmdName)
+  {
+    G4UIcmdWithAString* cmd = G4ModelCmdApplyString<M>::Command();
+    cmd->SetGuidance("Set auxiliary size type.");
+    cmd->SetCandidates("none world screen");
+  }
+  
+protected:
+
+  void Apply(const G4String& type) {
+    G4VMarker::SizeType mySizeType;
+    
+    if (type == "none") {mySizeType = G4VMarker::none;}
+    else if (type == "world") {mySizeType = G4VMarker::world;}
+    else if (type == "screen") {mySizeType = G4VMarker::screen;}
+    else {
+      std::ostringstream o;
+      o << "Invalid argument. See command guidance for options.";
+      G4Exception
+        ("G4ModelCmdSetAuxPtsSizeType::Apply",
+         "InvalidArgument", JustWarning, o.str().c_str());
+      return;
+    }
+    G4VModelCommand<M>::Model()->SetAuxPtsSizeType(mySizeType);
+  }
+  
+};
+
+////////////////////////////////////////////////////////////////////////
 // Set step points fill style command
 template <typename M>

trunk/source/visualization/modeling/include/G4ModelCompoundCommandsT.hh

@@ -25 +25 @@
 //
 // $Id: G4ModelCompoundCommandsT.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay September 2006

trunk/source/visualization/modeling/include/G4ModelingParameters.hh

@@ -26 +26 @@
 //
 // $Id: G4ModelingParameters.hh,v 1.17 2006/11/14 14:42:08 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4ModelingParameters.icc

@@ -26 +26 @@
 //
 // $Id: G4ModelingParameters.icc,v 1.11 2006/11/14 14:42:08 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4NullModel.hh

@@ -26 +26 @@
 //
 // $Id: G4NullModel.hh,v 1.7 2006/06/29 21:30:30 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeMassScene.hh,v 1.9 2008/01/04 21:59:15 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4PhysicalVolumeModel.hh

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeModel.hh,v 1.34 2007/04/03 13:46:49 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeSearchScene.hh,v 1.18 2008/01/04 21:59:15 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeSearchScene.icc,v 1.6 2006/06/29 21:30:38 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4ScaleModel.hh

@@ -26 +26 @@
 //
 // $Id: G4ScaleModel.hh,v 1.4 2006/11/01 10:28:42 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4TextModel.hh

@@ -26 +26 @@
 //
 // $Id: G4TextModel.hh,v 1.7 2006/11/01 10:28:42 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4TrajectoriesModel.hh

@@ -26 +26 @@
 //
 // $Id: G4TrajectoriesModel.hh,v 1.10 2006/10/26 11:10:23 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4TrajectoryChargeFilter.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryChargeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Filter trajectories according to charge. Only registered 

trunk/source/visualization/modeling/include/G4TrajectoryDrawByAttribute.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByAttribute.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay September 2006

trunk/source/visualization/modeling/include/G4TrajectoryDrawByCharge.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByCharge.hh,v 1.7 2006/06/29 21:31:49 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl November 2005

trunk/source/visualization/modeling/include/G4TrajectoryDrawByOriginVolume.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByOriginVolume.hh,v 1.4 2006/06/29 21:31:51 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Class Description:

trunk/source/visualization/modeling/include/G4TrajectoryDrawByParticleID.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByParticleID.hh,v 1.7 2006/06/29 21:31:53 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl November 2005

trunk/source/visualization/modeling/include/G4TrajectoryDrawerUtils.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawerUtils.hh,v 1.7 2007/05/30 08:56:55 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 // 
 // Jane Tinslay, John Allison, Joseph Perl November 2005

trunk/source/visualization/modeling/include/G4TrajectoryFilterFactories.hh

@@ -25 +25 @@
 //
 /// $Id: G4TrajectoryFilterFactories.hh,v 1.4 2006/09/12 18:53:03 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 //

trunk/source/visualization/modeling/include/G4TrajectoryGenericDrawer.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryGenericDrawer.hh,v 1.2 2006/06/29 21:31:59 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl November 2005

trunk/source/visualization/modeling/include/G4TrajectoryModelFactories.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryModelFactories.hh,v 1.6 2006/09/12 18:53:03 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl October 2005

trunk/source/visualization/modeling/include/G4TrajectoryOriginVolumeFilter.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryOriginVolumeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Filter trajectories according to volume name. Only registered 

trunk/source/visualization/modeling/include/G4TrajectoryParticleFilter.hh

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryParticleFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Filter trajectories according to particle type. Only registered 

trunk/source/visualization/modeling/include/G4VAttValueFilter.hh

@@ -25 +25 @@
 //
 // $Id: G4VAttValueFilter.hh,v 1.2 2006/12/13 15:50:04 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Abstract base class for G4AttValue filters

trunk/source/visualization/modeling/include/G4VModel.hh

@@ -26 +26 @@
 //
 // $Id: G4VModel.hh,v 1.19 2006/07/10 16:09:30 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4VModel.icc

@@ -26 +26 @@
 //
 // $Id: G4VModel.icc,v 1.12 2006/07/10 16:09:30 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

trunk/source/visualization/modeling/include/G4VModelCommand.hh

@@ -25 +25 @@
 //
 // $Id: G4VModelCommand.hh,v 1.4 2006/09/11 21:22:02 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 // 
 // Jane Tinslay, John Allison, Joseph Perl November 2005

trunk/source/visualization/modeling/include/G4VModelFactory.hh

@@ -25 +25 @@
 //
 // $Id: G4VModelFactory.hh,v 1.6 2006/06/29 21:32:30 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl October 2005

trunk/source/visualization/modeling/include/G4VTrajectoryModel.hh

@@ -25 +25 @@
 //
 // $Id: G4VTrajectoryModel.hh,v 1.7 2006/08/14 11:43:34 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl October 2005

trunk/source/visualization/modeling/include/G4VisTrajContext.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisTrajContext.hh,v 1.3 2006/08/14 11:47:53 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VisTrajContext.hh,v 1.4 2009/02/24 12:00:56 allison Exp $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay May 2006
@@ -72 +72 @@
   G4double GetAuxPtsSize() const;
 
+  void SetAuxPtsSizeType(const G4VMarker::SizeType& sizeType);
+  G4VMarker::SizeType GetAuxPtsSizeType() const;
+
   void SetAuxPtsFillStyle(const G4VMarker::FillStyle& style);
   G4VMarker::FillStyle GetAuxPtsFillStyle() const;
@@ -90 +93 @@
   void SetStepPtsSize(const G4double& size);
   G4double GetStepPtsSize() const;
+
+  void SetStepPtsSizeType(const G4VMarker::SizeType& sizeType);
+  G4VMarker::SizeType GetStepPtsSizeType() const;
 
   void SetStepPtsFillStyle(const G4VMarker::FillStyle& style);
@@ -117 +123 @@
   G4Polymarker::MarkerType fAuxPtsType;
   G4double fAuxPtsSize;
+  G4VMarker::SizeType fAuxPtsSizeType;
   G4VMarker::FillStyle fAuxPtsFillStyle;
   G4Colour fAuxPtsColour;
@@ -125 +132 @@
   G4Polymarker::MarkerType fStepPtsType;
   G4double fStepPtsSize;
+  G4VMarker::SizeType fStepPtsSizeType;
   G4VMarker::FillStyle fStepPtsFillStyle;
   G4Colour fStepPtsColour;

trunk/source/visualization/modeling/include/G4VisTrajContext.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisTrajContext.icc,v 1.3 2006/08/14 11:47:53 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VisTrajContext.icc,v 1.4 2009/02/24 12:00:56 allison Exp $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay May 2006
@@ -61 +61 @@
 inline G4double G4VisTrajContext::GetAuxPtsSize() const {return fAuxPtsSize;}
 
+inline void G4VisTrajContext::SetAuxPtsSizeType(const G4VMarker::SizeType& sizeType) {fAuxPtsSizeType = sizeType;}
+inline G4VMarker::SizeType G4VisTrajContext::GetAuxPtsSizeType() const {return fAuxPtsSizeType;}
+
 inline void G4VisTrajContext::SetAuxPtsFillStyle(const G4VMarker::FillStyle& style) {fAuxPtsFillStyle = style;}
 inline G4VMarker::FillStyle G4VisTrajContext::GetAuxPtsFillStyle() const {return fAuxPtsFillStyle;}
@@ -79 +82 @@
 inline void G4VisTrajContext::SetStepPtsSize(const G4double& size) {fStepPtsSize = size;}
 inline G4double G4VisTrajContext::GetStepPtsSize() const {return fStepPtsSize;}
+
+inline void G4VisTrajContext::SetStepPtsSizeType(const G4VMarker::SizeType& sizeType) {fStepPtsSizeType = sizeType;}
+inline G4VMarker::SizeType G4VisTrajContext::GetStepPtsSizeType() const {return fStepPtsSizeType;}
 
 inline void G4VisTrajContext::SetStepPtsFillStyle(const G4VMarker::FillStyle& style) {fStepPtsFillStyle = style;}

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

@@ -25 +25 @@
 //
 // $Id: G4AttFilterUtils.cc,v 1.4 2006/12/13 15:50:06 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Visualisation attribute filter utility functions.

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

@@ -26 +26 @@
 //
 // $Id: G4AxesModel.cc,v 1.6 2006/06/29 21:32:38 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4BoundingSphereScene.cc,v 1.11 2006/06/29 21:32:40 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4FlavoredParallelWorldModel.cc,v 1.7 2006/06/29 21:32:42 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // P. Mora de Freitas et M.Verderi - 19 June 1998.

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

@@ -25 +25 @@
 //
 /// $Id: G4HitFilterFactories.cc,v 1.1 2006/09/12 18:53:03 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4HitsModel.cc,v 1.18 2006/11/14 14:42:08 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4LogicalVolumeModel.cc,v 1.14 2006/11/01 10:28:42 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ModelingParameters.cc,v 1.15 2006/11/14 14:42:08 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4NullModel.cc,v 1.9 2006/06/29 21:32:50 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeMassScene.cc,v 1.7 2006/11/06 09:24:13 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeModel.cc,v 1.63 2007/11/10 14:56:36 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeSearchScene.cc,v 1.14 2008/07/27 10:49:24 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ScaleModel.cc,v 1.4 2006/06/29 21:32:58 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4TextModel.cc,v 1.7 2006/06/29 21:33:00 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4TrajectoriesModel.cc,v 1.24 2006/11/14 14:42:08 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryChargeFilter.cc,v 1.4 2006/08/25 19:44:14 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Filter trajectories according to charge. Only registered 

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByAttribute.cc,v 1.3 2006/09/14 15:41:42 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay August 2006

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByCharge.cc,v 1.8 2006/06/29 21:33:06 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl November 2005

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByOriginVolume.cc,v 1.4 2006/06/29 21:33:08 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay March 2006

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryDrawByParticleID.cc,v 1.8 2006/06/29 21:33:10 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl November 2005

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4TrajectoryDrawerUtils.cc,v 1.11 2007/05/30 08:56:55 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4TrajectoryDrawerUtils.cc,v 1.12 2009/02/24 12:00:56 allison Exp $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl November 2005
@@ -254 +254 @@
     if (myContext.GetDrawAuxPts() && (auxiliaryPoints.size() > 0)) {
       auxiliaryPoints.SetMarkerType(myContext.GetAuxPtsType());
-      auxiliaryPoints.SetScreenSize(myContext.GetAuxPtsSize());
+      auxiliaryPoints.SetSize(myContext.GetAuxPtsSizeType(), myContext.GetAuxPtsSize());
       auxiliaryPoints.SetFillStyle(myContext.GetAuxPtsFillStyle());
 
@@ -266 +266 @@
     if (myContext.GetDrawStepPts() && (stepPoints.size() > 0)) {
       stepPoints.SetMarkerType(myContext.GetStepPtsType());
-      stepPoints.SetScreenSize(myContext.GetStepPtsSize());
+      stepPoints.SetSize(myContext.GetStepPtsSizeType(), myContext.GetStepPtsSize());
       stepPoints.SetFillStyle(myContext.GetStepPtsFillStyle());
 
@@ -313 +313 @@
         point.push_back(auxiliaryPoints[i]);
         point.SetMarkerType(myContext.GetAuxPtsType());
-        point.SetScreenSize(myContext.GetAuxPtsSize());
+        point.SetSize(myContext.GetAuxPtsSizeType(), myContext.GetAuxPtsSize());
         point.SetFillStyle(myContext.GetAuxPtsFillStyle());
         auxiliaryPointsAttribs.SetStartTime(auxiliaryPointTimes[i]);
@@ -330 +330 @@
         point.push_back(stepPoints[i]);
         point.SetMarkerType(myContext.GetStepPtsType());
-        point.SetScreenSize(myContext.GetStepPtsSize());
+        point.SetSize(myContext.GetStepPtsSizeType(), myContext.GetStepPtsSize());
         point.SetFillStyle(myContext.GetStepPtsFillStyle());
         stepPointsAttribs.SetStartTime(stepPointTimes[i]);

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

@@ -25 +25 @@
 //
 /// $Id: G4TrajectoryFilterFactories.cc,v 1.5 2006/09/12 18:53:03 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 //

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryGenericDrawer.cc,v 1.2 2006/06/29 21:33:16 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay May 2006

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryModelFactories.cc,v 1.7 2006/09/12 18:53:03 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay, John Allison, Joseph Perl October 2005

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryOriginVolumeFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Filter trajectories according to volume name. Only registered 

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

@@ -25 +25 @@
 //
 // $Id: G4TrajectoryParticleFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Filter trajectories according to particle type. Only registered 

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

@@ -26 +26 @@
 //
 // $Id: G4VModel.cc,v 1.14 2006/11/01 10:33:00 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // 

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

@@ -25 +25 @@
 //
 // $Id: G4VTrajectoryModel.cc,v 1.3 2006/06/29 21:33:26 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: modeling-V09-02-00 $
 //
 // Jane Tinslay May 2006

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

@@ -35 +35 @@
   ,fAuxPtsType(G4Polymarker::squares)
   ,fAuxPtsSize(2)
+  ,fAuxPtsSizeType(G4VMarker::screen)
   ,fAuxPtsFillStyle(G4VMarker::filled)
   ,fAuxPtsColour(G4Colour::Magenta())
@@ -41 +42 @@
   ,fStepPtsType(G4Polymarker::circles)
   ,fStepPtsSize(2)
+  ,fStepPtsSizeType(G4VMarker::screen)
   ,fStepPtsFillStyle(G4VMarker::filled)
   ,fStepPtsColour(G4Colour::Yellow())