Changeset 1042 for trunk

Timestamp:

May 14, 2009, 6:24:00 PM (15 years ago)

Author:

garnier

Message:

avant cvs

Location:

trunk/source/visualization

Files:

• History (modified) (2 diffs)
• OpenGL/include/G4OpenGLViewer.hh (modified) (1 diff)
• OpenGL/src/G4OpenGLViewer.cc (modified) (4 diffs)
• management/History (modified) (2 diffs)
• management/include/G4VisCommandsViewerSet.hh (modified) (3 diffs)

trunk/source/visualization/History

@@ -1 @@
-$Id: History,v 1.439 2009/05/13 10:47:29 lgarnier Exp $
+$Id: History,v 1.440 2009/05/13 18:21:03 allison Exp $
 -------------------------------------------------------------------
 
@@ -24 +24 @@
 History file for visualization category
 ---------------------------------------
+
+13th May 2009  John Allison
+- visman-V09-02-02: Added /vis/viewer/set/targetPoint and minor
+  wording improvements.
 
 6 May 2009, Laurent Garnier

trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -114 +114 @@
   G4int                             fPrintSizeY;
   G4String                          fPrintFilename;
-  G4int                             fPrintFilenameIndex;
+  int                               fPrintFilenameIndex;
   unsigned int fWinSize_x, fWinSize_y;
   G4float                           fPointSize;

trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

@@ -84 +84 @@
 fPrintSizeX(-1),
 fPrintSizeY(-1),
-fPrintFilename ("G4OpenGL.eps"),
+fPrintFilename ("G4OpenGL"),
 fPrintFilenameIndex(0),
 fPointSize (0),
@@ -503 +503 @@
     G4cerr << "Error while saving file... "<<getRealPrintFilename().c_str()<< G4endl;
   } else {
-    G4cout << "File "<<fPrintFilename.c_str()<<" has been saved " << G4endl;
+    G4cout << "File "<<getRealPrintFilename().c_str()<<" has been saved " << G4endl;
   }
 
@@ -691 +691 @@
 
 void G4OpenGLViewer::setPrintFilename(G4String name,G4bool inc) {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::setPrintFilename :%s Inc:%d\n",name.c_str(),inc);
+#endif
+
   if (name != "") {
     fPrintFilename = name;
@@ -704 +708 @@
 
 std::string G4OpenGLViewer::getRealPrintFilename() {
-  std:: string temp = fPrintFilename;
+  std::string temp = fPrintFilename;
   if (fPrintFilenameIndex != -1) {
-    temp +="_"+fPrintFilenameIndex;
+    temp += std::string("_");
+    std::ostringstream os;
+    os << fPrintFilenameIndex;
+    std::string nb_str = os.str();
+    temp += nb_str;
   }
   temp += ".eps";
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::getRealPrintFilename :%s --%d\n",temp.c_str(),fPrintFilenameIndex);
+#endif
   return temp;
 }

trunk/source/visualization/management/History

@@ -1 @@
-$Id: History,v 1.120 2009/03/14 11:44:46 allison Exp $
+$Id: History,v 1.121 2009/05/13 18:18:03 allison Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+
+13th May 2009  John Allison  (visman-V09-02-02)
+- G4VisCommandsViewerSet.hh/cc: Added /vis/viewer/set/targetPoint.
+- G4VisManager.cc: End of run event keeping information improved.
 
 14th March 2009  John Allison  (visman-V09-02-01)

trunk/source/visualization/management/include/G4VisCommandsViewerSet.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsViewerSet.hh,v 1.22 2007/04/03 13:33:16 allison Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VisCommandsViewerSet.hh,v 1.23 2009/05/13 18:17:25 allison Exp $
+// GEANT4 tag $Name: HEAD $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
@@ -42 +42 @@
 class G4UIcmdWithAnInteger;
 class G4UIcmdWithADouble;
+class G4UIcmdWith3VectorAndUnit;
 
 class G4VisCommandsViewerSet: public G4VVisCommandViewer {
@@ -73 +74 @@
   G4UIcommand*          fpCommandSectionPlane;
   G4UIcmdWithAString*   fpCommandStyle;
+  G4UIcmdWith3VectorAndUnit* fpCommandTargetPoint;
   G4UIcommand*          fpCommandUpThetaPhi;
   G4UIcommand*          fpCommandUpVector;