Changeset 849

Timestamp:

Aug 28, 2008, 4:17:35 PM (16 years ago)

Author:

garnier

Message:

maj de CVS

Location:

trunk/source/visualization

Files:

• OpenInventor/History (modified) (2 diffs)
• OpenInventor/include/G4OpenInventor.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorSceneHandler.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorTransform3D.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorWin.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorWin32.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorWinViewer.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorX.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorXt.hh (modified) (1 diff)
• OpenInventor/include/G4OpenInventorXtViewer.hh (modified) (1 diff)
• OpenInventor/include/HEPVis/SbMath.h (modified) (1 diff)
• OpenInventor/include/HEPVis/nodekits/SoDetectorTreeKit.h (modified) (1 diff)
• OpenInventor/include/HEPVis/nodes/SoBox.h (modified) (1 diff)
• OpenInventor/include/HEPVis/nodes/SoCons.h (modified) (1 diff)
• OpenInventor/include/HEPVis/nodes/SoTrap.h (modified) (1 diff)
• OpenInventor/include/HEPVis/nodes/SoTrd.h (modified) (1 diff)
• OpenInventor/include/HEPVis/nodes/SoTubs.h (modified) (1 diff)
• OpenInventor/include/SoG4LineSet.h (modified) (1 diff)
• OpenInventor/include/SoG4MarkerSet.h (modified) (1 diff)
• OpenInventor/include/SoG4Polyhedron.h (modified) (1 diff)
• OpenInventor/src/gl2ps.cc (modified) (2 diffs)
• RayTracer/History (modified) (2 diffs)
• RayTracer/src/G4RTOutBitStream.cc (modified) (2 diffs)
• management/History (modified) (2 diffs)
• management/src/G4VisCommands.cc (modified) (4 diffs)
• modeling/History (modified) (2 diffs)
• test/History (modified) (2 diffs)
• test/src/MyEventAction.cc (modified) (2 diffs)

trunk/source/visualization/OpenInventor/History

@@ -1 @@
-$Id: History,v 1.94 2007/10/23 14:56:35 gcosmo Exp $
+$Id: History,v 1.96 2008/04/30 10:05:31 allison Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenInventor
 -------------------------------------------
+
+30th April 2008  John Allison  (openinventor-V09-01-01)
+- Fixes more gcc-4.3.0 compiler warnings.
+
+4th April 2008  John Allison  (openinventor-V09-01-00)
+- Fixes most gcc-4.3.0 compiler warnings.
 
 23rd October 2007  Gabriele Cosmo

trunk/source/visualization/OpenInventor/include/G4OpenInventor.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventor.hh,v 1.9 2006/06/29 21:20:22 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // Guy Barrand 26 Mar 1998.

trunk/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorSceneHandler.hh,v 1.33 2007/03/27 15:24:15 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorTransform3D.hh,v 1.7 2006/06/29 21:20:26 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/visualization/OpenInventor/include/G4OpenInventorWin.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorWin.hh,v 1.3 2006/06/29 21:20:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // OpenInventor graphics system factory.

trunk/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorWin32.hh,v 1.7 2006/06/29 21:20:32 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // OpenInventor graphics system factory.

trunk/source/visualization/OpenInventor/include/G4OpenInventorWinViewer.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorWinViewer.hh,v 1.9 2006/06/29 21:20:34 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/visualization/OpenInventor/include/G4OpenInventorX.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorX.hh,v 1.7 2006/06/29 21:20:36 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/visualization/OpenInventor/include/G4OpenInventorXt.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorXt.hh,v 1.3 2006/06/29 21:20:38 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/visualization/OpenInventor/include/G4OpenInventorXtViewer.hh

@@ -26 +26 @@
 //
 // $Id: G4OpenInventorXtViewer.hh,v 1.14 2006/06/29 21:20:40 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/visualization/OpenInventor/include/HEPVis/SbMath.h

@@ -26 +26 @@
 //
 // $Id: SbMath.h,v 1.4 2006/06/29 21:20:46 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 #ifndef HEPVis_SbMath_h

trunk/source/visualization/OpenInventor/include/HEPVis/nodekits/SoDetectorTreeKit.h

@@ -26 +26 @@
 //
 // $Id: SoDetectorTreeKit.h,v 1.5 2006/06/29 21:21:16 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 /*-----------------------------HEPVis----------------------------------------*/

trunk/source/visualization/OpenInventor/include/HEPVis/nodes/SoBox.h

@@ -26 +26 @@
 //
 // $Id: SoBox.h,v 1.3 2006/06/29 21:21:18 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 /*-----------------------------Hepvis----------------------------------------*/

trunk/source/visualization/OpenInventor/include/HEPVis/nodes/SoCons.h

@@ -26 +26 @@
 //
 // $Id: SoCons.h,v 1.3 2006/06/29 21:21:20 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 /*-----------------------------Hepvis----------------------------------------*/

trunk/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrap.h

@@ -26 +26 @@
 //
 // $Id: SoTrap.h,v 1.4 2006/06/29 21:22:06 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 /*-----------------------------Hepvis----------------------------------------*/

trunk/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrd.h

@@ -26 +26 @@
 //
 // $Id: SoTrd.h,v 1.3 2006/06/29 21:22:08 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 /*-----------------------------Hepvis----------------------------------------*/

trunk/source/visualization/OpenInventor/include/HEPVis/nodes/SoTubs.h

@@ -26 +26 @@
 //
 // $Id: SoTubs.h,v 1.3 2006/06/29 21:22:10 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 /*-----------------------------Hepvis----------------------------------------*/

trunk/source/visualization/OpenInventor/include/SoG4LineSet.h

@@ -25 +25 @@
 //
 // $Id: SoG4LineSet.h,v 1.2 2006/12/13 15:49:51 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // John Allison  26th October 2006

trunk/source/visualization/OpenInventor/include/SoG4MarkerSet.h

@@ -25 +25 @@
 //
 // $Id: SoG4MarkerSet.h,v 1.2 2006/12/13 15:49:53 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // John Allison  26th October 2006

trunk/source/visualization/OpenInventor/include/SoG4Polyhedron.h

@@ -26 +26 @@
 //
 // $Id: SoG4Polyhedron.h,v 1.3 2007/09/17 16:08:00 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // John Allison  26th October 2006

trunk/source/visualization/OpenInventor/src/gl2ps.cc

@@ -30 +30 @@
  * Copyright (C) 1999-2003  Christophe Geuzaine 
  *
- * $Id: gl2ps.cc,v 1.11 2006/06/29 21:23:09 gunter Exp $
+ * $Id: gl2ps.cc,v 1.12 2008/04/30 10:05:31 allison Exp $
  *
  * E-mail: geuz@geuz.org
@@ -1345 +1345 @@
   int status = 1, nbhex, nbyte;
   int row, col, ibyte,icase;
-  float dr, dg, db, fgrey;
+  float dr = 0, dg = 0, db = 0, fgrey = 0;
   Uchar red, green, blue, b, grey;
   /* Options */

trunk/source/visualization/RayTracer/History

@@ -1 @@
-$Id: History,v 1.53 2007/06/14 15:25:20 allison Exp $
+$Id: History,v 1.54 2008/04/04 13:52:48 allison Exp $
 -------------------------------------------------------------------
 
@@ -24 +24 @@
 History file for Ray Tracer category
 ---------------------------------------
+
+4th April 2008  John Allison  (raytracer-V09-01-00)
+ - Fixed gcc-4.3.0 compiler warnings.
 
 14th June 2007  John Allison  (raytracer-V08-03-01)

trunk/source/visualization/RayTracer/src/G4RTOutBitStream.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RTOutBitStream.cc,v 1.5 2006/06/29 21:24:01 gunter Exp $
+// $Id: G4RTOutBitStream.cc,v 1.6 2008/04/04 13:52:48 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -104 +104 @@
   IncBuf();
 
-  *mBuf = v << 8 - nextBits;
+  *mBuf = v << (8 - nextBits);
   mBitPos = 7 - nextBits;
 }

trunk/source/visualization/management/History

@@ -1 @@
-$Id: History,v 1.110 2008/04/30 10:07:28 allison Exp $
+$Id: History,v 1.111 2008/07/27 10:46:23 allison Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+
+27th July 2008  John Allison
+- G4VisCommands.cc: Trap recursive use of /vis/reviewKeptEvents.
 
 30th April 2008  John Allison  (visman-V09-01-04)

trunk/source/visualization/management/src/G4VisCommands.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommands.cc,v 1.22 2007/03/27 15:47:32 allison Exp $
+// $Id: G4VisCommands.cc,v 1.23 2008/07/27 10:46:23 allison Exp $
 // GEANT4 tag $Name:  $
 
@@ -179 +179 @@
 void G4VisCommandReviewKeptEvents::SetNewValue (G4UIcommand*, G4String newValue)
 {
+  static bool reviewing = false;
+  if (reviewing) {
+    G4cout <<
+      "\"/vis/reviewKeptEvents\" not allowed within an already started review."
+      "\n  No action taken."
+           << G4endl;
+    return;
+  }
+
   G4String& macroFileName = newValue;
   G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
@@ -223 +232 @@
 
   // Event by event refreshing...
+  reviewing  = true;
   G4bool currentRefreshAtEndOfEvent = pScene->GetRefreshAtEndOfEvent();
   pScene->SetRefreshAtEndOfEvent(true);
@@ -286 +296 @@
   }
   pScene->SetRefreshAtEndOfEvent(currentRefreshAtEndOfEvent);
+  reviewing  = false;
 
   UImanager->SetVerboseLevel(keepVerbose);

trunk/source/visualization/modeling/History

@@ -1 @@
-$Id: History,v 1.104 2008/01/04 21:59:15 allison Exp $
+$Id: History,v 1.105 2008/07/27 10:49:24 allison Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/modeling
 ---------------------------------------
+
+27th July 2008  John Allison
+- G4PhysicalVolumeSearchScene.cc: Cosmetic improvement to a message.
 
 4th January 2008  John Allison  (modeling-V09-01-00)

trunk/source/visualization/test/History

@@ -1 @@
-$Id: History,v 1.114 2008/01/04 21:54:37 allison Exp $
+$Id: History,v 1.116 2008/04/04 14:02:04 allison Exp $
 
 History file for visualization/test subdirectory
@@ -5 +5 @@
 
 $Log: History,v $
+Revision 1.116  2008/04/04 14:02:04  allison
+vistest-V09-01-01
+
+Revision 1.115  2008/04/04 14:01:14  allison
+Changed to thickness of box for 2D drawing to zero.
+
 Revision 1.114  2008/01/04 21:54:37  allison
 vistest-V09-01-00

trunk/source/visualization/test/src/MyEventAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: MyEventAction.cc,v 1.17 2008/01/04 21:53:07 allison Exp $
+// $Id: MyEventAction.cc,v 1.18 2008/04/04 14:01:14 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -166 +166 @@
 
     // A blue rectangle in fixed position on the screen
-    G4PolyhedronBox rectangle(0.1, 0.2, 0.1);
+    G4PolyhedronBox rectangle(0.1, 0.2, 0.);
     G4VisAttributes rectangleAtts(G4Colour(0., 0., 1.));
     rectangleAtts.SetForceSolid(true);