Changeset 897 for trunk/source/visualization/management

Timestamp:

Dec 3, 2008, 7:03:25 PM (16 years ago)

Author:

garnier

Message:

suppres des debug et modif des WinSize

Location:

trunk/source/visualization/management

Files:

• include/G4ViewParameters.hh (modified) (1 diff)
• include/G4ViewParameters.icc (modified) (2 diffs)
• include/G4VisManager.hh (modified) (3 diffs)
• src/G4ViewParameters.cc (modified) (1 diff)
• src/G4VisCommandsViewer.cc (modified) (3 diffs)
• src/G4VisManager.cc (modified) (6 diffs)

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

@@ -156 +156 @@
         G4int            GetWindowAbsoluteLocationHintX (G4int) const;
         G4int            GetWindowAbsoluteLocationHintY (G4int) const;
-        G4int            GetWindowSizeHintX      () const;
-        G4int            GetWindowSizeHintY      () const;
+        unsigned int     GetWindowSizeHintX      () const;
+        unsigned int     GetWindowSizeHintY      () const;
         G4int            GetWindowLocationHintX  () const;
         G4int            GetWindowLocationHintY  () const;
   const G4String&        GetXGeometryString      () const;
-  // If non-null, can be interpreted with XParseGeometry (see man
-  // pages).  Supercedes GetWindowSizeHintX/Y.
+  // GetXGeometryString is intended to be parsed by XParseGeometry.
+  // It contains the size information, as in GetWindowSizeHint, but
+  // may also contain the window position, e.g., "600x600-0+200.  The
+  // viewer should use this in preference to GetWindowSizeHint, since
+  // it contains more information.  (The size information in
+  // GetXGeometryString and GetWindowSizeHint is guaranteed to be
+  // identical.)
         G4bool           IsAutoRefresh           () const;
   const G4Colour&        GetBackgroundColour     () const;

trunk/source/visualization/management/include/G4ViewParameters.icc

@@ -162 +162 @@
 }
 
-inline G4int G4ViewParameters::GetWindowSizeHintX () const {
+inline unsigned int G4ViewParameters::GetWindowSizeHintX () const {
   return fWindowSizeHintX;
 }
 
-inline G4int G4ViewParameters::GetWindowSizeHintY () const {
+inline unsigned int G4ViewParameters::GetWindowSizeHintY () const {
   return fWindowSizeHintY;
 }
 
 inline G4int G4ViewParameters::GetWindowLocationHintX () const {
-#ifdef G4DEBUG
-        printf("G4ViewParameters::GetWindowLocationHintX () :: %d\n",fWindowLocationHintX);
-#endif
   return fWindowLocationHintX;
 }
 
 inline G4int G4ViewParameters::GetWindowLocationHintY () const {
-#ifdef G4DEBUG
-        printf("G4ViewParameters::GetWindowLocationHintY () :: %d\n",fWindowLocationHintY);
-#endif
   return fWindowLocationHintY;
 }
@@ -343 +337 @@
 
 inline void G4ViewParameters::SetWindowLocationHint (G4int xHint, G4int yHint) {
-#ifdef G4DEBUG
-        printf("G4ViewParameters::SetWindowLocationHint () :: %d %d\n",xHint,yHint);
-#endif
   fWindowLocationHintX = xHint;
   fWindowLocationHintY = yHint;

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

@@ -353 +353 @@
   const G4SceneList&           GetSceneList                () const;
   Verbosity                    GetVerbosity                () const;
-  void  GetWindowSizeHint (G4int& xHint, G4int& yHint) const;
-  // Note: GetWindowSizeHint information is returned via the G4int& arguments.
-  void  GetWindowLocationHint (G4int& xHint, G4int& yHint) const;
-  const G4String&              GetXGeometryString          () const;
-  // GetXGeometryString is intended to be parsed by XParseGeometry.
-  // It contains the size information, as in GetWindowSizeHint, but
-  // may also contain the window position, e.g., "600x600-0+200.  The
-  // viewer should use this in preference to GetWindowSizeHint, since
-  // it contains more information.  (The size information in
-  // GetXGeometryString and GetWindowSizeHint is guaranteed to be
-  // identical.)
   G4bool                       GetTransientsDrawnThisRun       () const;
   G4bool                       GetTransientsDrawnThisEvent     () const;
@@ -381 +370 @@
   void              SetVerboseLevel             (const G4String&);
   void              SetVerboseLevel             (Verbosity);
-  void              SetWindowSizeHint           (G4int xHint, G4int yHint);
-  void              SetWindowLocationHint           (G4int xHint, G4int yHint);
-  void              SetXGeometryString          (const G4String&);
   void              SetEventRefreshing          (G4bool);
   void              ResetTransientsDrawnFlags   ();
@@ -458 +444 @@
   std::vector<G4UIcommand*>   fDirectoryList;
   G4VisStateDependent*  fpStateDependent;   // Friend state dependent class.
-  G4int fWindowSizeHintX, fWindowSizeHintY; // For viewer...
-  G4int fWindowLocationHintX, fWindowLocationHintY; // For viewer...
-  G4String              fXGeometryString;   // ...construction.
   G4TrajectoriesModel   dummyTrajectoriesModel;  // For passing drawing mode.
   G4bool                fEventRefreshing;

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

@@ -87 +87 @@
   fPicking (false)
 {
-#ifdef G4DEBUG
-  printf("G4ViewParameters::Create \n");
-#endif
   fDefaultMarker.SetScreenSize (5.);
   // Markers are 5 pixels "overall" size, i.e., diameter.

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

@@ -488 +488 @@
 ////////////// /vis/viewer/create ///////////////////////////////////////
 
-G4VisCommandViewerCreate::G4VisCommandViewerCreate ():
-  fId (0)
- {
+G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) {
   G4bool omitable;
   fpCommand = new G4UIcommand ("/vis/viewer/create", this);
@@ -638 +636 @@
   }
 
-
-  // Parse windowSizeHintString to extract first field for backwards
-  // compatibility...
-  std::istringstream issw;
-  G4int windowSizeHint;
-  size_t i;
-#ifdef G4DEBUG
-    printf("G4VisCommandViewerCreate::SetNewValue string\n");
-#endif
-  for (i = 0; i < windowSizeHintString.size(); ++i) {
-    char c = windowSizeHintString[i];
-#ifdef G4DEBUG
-    printf("%c",c);
-#endif
-    if (c == 'x' || c == 'X' || c == '+' || c == '-') break;
-  }
-#ifdef G4DEBUG
-    printf("\n");
-#endif
-  if (i != windowSizeHintString.size()) {
-    // x or X or + or - found - must be a X-Window-type geometry string...
-    // Pick out the first field for backwards compatibility...
-    issw.str(windowSizeHintString.substr(0,i));
-    issw >> windowSizeHint;
-  } else { // ...old-style integer...
-    issw.str(windowSizeHintString);
-    if (!(issw >> windowSizeHint)) {
-      if (verbosity >= G4VisManager::errors) {
-        G4cout << "ERROR: Unrecognised geometry string \""
-               << windowSizeHintString
-               << "\".  Using 600."
-               << G4endl;
-      }
-      windowSizeHint = 600;
-    }
-    // Reconstitute windowSizeHintString...
-    std::ostringstream ossw;
-    ossw << windowSizeHint << 'x' << windowSizeHint;
-    windowSizeHintString = ossw.str();
-  }
   // WindowSizeHint and XGeometryString are picked up from the vis
-  // manager in the G4VViewer constructor.  They have to be held by
-  // the vis manager until the viewer is contructed - next line...
+  // manager in the G4VViewer constructor. In G4VisManager, after Viewer
+  // creation, we will store theses parameters in G4ViewParameters.
 
   fpVisManager -> CreateViewer (newName,windowSizeHintString);
@@ -1528 +1486 @@
   SetViewParameters(currentViewer, vp);
 }
-
-

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

@@ -199 +199 @@
 
 void G4VisManager::Initialise () {
-#ifdef G4DEBUG
-  printf("G4VisManager::Initialise\n");
-#endif
 
   if (fVerbosity >= startup) {
@@ -652 +649 @@
 
 void G4VisManager::CreateViewer (G4String name,G4String XGeometry) {
-#ifdef G4DEBUG
-  printf("G4VisManager::CreateViewer TOP\n");
-#endif
 
   if (!fInitialised) Initialise ();
-#ifdef G4DEBUG
-  printf("G4VisManager::CreateViewer 2\n");
-#endif
 
   if (fpSceneHandler) {
-#ifdef G4DEBUG
-    printf("G4VisManager::CreateViewer 3\n");
-#endif
     G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name);
-#ifdef G4DEBUG
 
     // Viewer is created, now we can set geometry parameters
     // Before 12/2008, it was done in G4VViewer.cc but it did not have to be there!
-
+    
     G4ViewParameters vp = p->GetViewParameters();
     vp.SetXGeometryString(XGeometry);
-    p->SetViewParameters(vp);
-
-    printf("G4VisManager::CreateViewer 4\n");
-#endif
+    p->SetViewParameters(vp); //parse string and store parameters
+    
     if (!p) {
-#ifdef G4DEBUG
-      printf("G4VisManager::CreateViewer !p\n");
-#endif
       if (fVerbosity >= errors) {
         G4cout << "ERROR in G4VisManager::CreateViewer during "
@@ -688 +670 @@
       }
     } else {
-#ifdef G4DEBUG
-    printf("G4VisManager::CreateViewer 5\n");
-#endif
       p -> Initialise ();
-#ifdef G4DEBUG
-    printf("G4VisManager::CreateViewer 6\n");
-#endif
       if (p -> GetViewId() < 0) {
-#ifdef G4DEBUG
-        printf("G4VisManager::CreateViewer Id <0\n");
-#endif
         if (fVerbosity >= errors) {
         G4cout << "ERROR in G4VisManager::CreateViewer during "
@@ -706 +679 @@
         }
       } else {
-#ifdef G4DEBUG
-    printf("G4VisManager::CreateViewer 7\n");
-#endif
         fpViewer = p;                             // Make current.
-#ifdef G4DEBUG
-    printf("G4VisManager::CreateViewer 8\n");
-#endif
         fpSceneHandler -> AddViewerToList (fpViewer);
-#ifdef G4DEBUG
-  printf("G4VisManager::CreateViewer 9\n");
-#endif
         fpSceneHandler -> SetCurrentViewer (fpViewer);
 
@@ -724 +688 @@
         }
 
-#ifdef G4DEBUG
-  printf("G4VisManager::CreateViewer 10 Read parameters\n");
-#endif
         const G4ViewParameters& vp = fpViewer->GetViewParameters();
-#ifdef G4DEBUG
-  printf("G4VisManager::CreateViewer 11 END of read Parameters\n");
-#endif
         if (fVerbosity >= parameters) {
           G4cout << " view parameters are:\n  " << vp << G4endl;
@@ -766 +724 @@
   }
   else PrintInvalidPointers ();
-#ifdef G4DEBUG
-  printf("G4VisManager::END OF CreateViewer\n");
-#endif
 }