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

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/src

Files:

• G4AttFilterUtils.cc (modified) (1 diff)
• G4AxesModel.cc (modified) (1 diff)
• G4BoundingSphereScene.cc (modified) (1 diff)
• G4FlavoredParallelWorldModel.cc (modified) (1 diff)
• G4HitFilterFactories.cc (modified) (1 diff)
• G4HitsModel.cc (modified) (1 diff)
• G4LogicalVolumeModel.cc (modified) (1 diff)
• G4ModelingParameters.cc (modified) (1 diff)
• G4NullModel.cc (modified) (1 diff)
• G4PhysicalVolumeMassScene.cc (modified) (1 diff)
• G4PhysicalVolumeModel.cc (modified) (1 diff)
• G4PhysicalVolumeSearchScene.cc (modified) (1 diff)
• G4ScaleModel.cc (modified) (1 diff)
• G4TextModel.cc (modified) (1 diff)
• G4TrajectoriesModel.cc (modified) (1 diff)
• G4TrajectoryChargeFilter.cc (modified) (1 diff)
• G4TrajectoryDrawByAttribute.cc (modified) (1 diff)
• G4TrajectoryDrawByCharge.cc (modified) (1 diff)
• G4TrajectoryDrawByOriginVolume.cc (modified) (1 diff)
• G4TrajectoryDrawByParticleID.cc (modified) (1 diff)
• G4TrajectoryDrawerUtils.cc (modified) (5 diffs)
• G4TrajectoryFilterFactories.cc (modified) (1 diff)
• G4TrajectoryGenericDrawer.cc (modified) (1 diff)
• G4TrajectoryModelFactories.cc (modified) (1 diff)
• G4TrajectoryOriginVolumeFilter.cc (modified) (1 diff)
• G4TrajectoryParticleFilter.cc (modified) (1 diff)
• G4VModel.cc (modified) (1 diff)
• G4VTrajectoryModel.cc (modified) (1 diff)
• G4VisTrajContext.cc (modified) (2 diffs)

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())