Changeset 897 for trunk/source/visualization/management/include

Timestamp:

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

Author:

garnier

Message:

suppres des debug et modif des WinSize

Location:

trunk/source/visualization/management/include

Files:

• G4ViewParameters.hh (modified) (1 diff)
• G4ViewParameters.icc (modified) (2 diffs)
• G4VisManager.hh (modified) (3 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;