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

Timestamp:

Dec 3, 2008, 5:31:19 PM (17 years ago)

Author:

garnier

Message:

Modif pour XGeometry complet. Avec debug

Location:

trunk/source/visualization/management/include

Files:

• G4ViewParameters.hh (modified) (3 diffs)
• G4ViewParameters.icc (modified) (1 diff)
• G4VisCommandsViewer.hh (modified) (1 diff)
• G4VisManager.hh (modified) (1 diff)
• G4VisManager.icc (modified) (2 diffs)

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

@@ -154 +154 @@
         G4double         GetGlobalLineWidthScale () const;
         G4bool           IsMarkerNotHidden       () const;
+        G4int            GetWindowAbsoluteLocationHintX (G4int) const;
+        G4int            GetWindowAbsoluteLocationHintY (G4int) const;
         G4int            GetWindowSizeHintX      () const;
         G4int            GetWindowSizeHintY      () const;
@@ -233 +235 @@
 
 private:
+  G4int ParseGeometry ( const char *string, G4int *x, G4int *y, unsigned int *width, unsigned int *height);
+  G4int ReadInteger(char *string, char **NextString);
+
+  G4int fNoValue;
+  G4int fXValue; // XValue set for XGeometry
+  G4int fYValue; // YValue set for XGeometry
+  G4int fWidthValue; // WidthValue set for XGeometry
+  G4int fHeightValue; // HeightValue set for XGeometry
+  G4int fAllValues; // AllValues are set for XGeometry
+  G4int fXNegative; // XValue is from left for XGeometry
+  G4int fYNegative; // YValue is from top for XGeometry
 
   DrawingStyle fDrawingStyle;    // Drawing style.
@@ -275 +288 @@
   G4int        fWindowLocationHintX; // Location hints for pixel-based window systems.
   G4int        fWindowLocationHintY;
+  G4bool       fWindowLocationHintXNegative; //  Reference of location hints for pixel-based window systems.
+  G4bool       fWindowLocationHintYNegative;
   G4String     fXGeometryString; // If non-null, geometry string for X Windows.
   G4bool       fAutoRefresh;     // ...after change of view parameters.

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

@@ -350 +350 @@
 }
 
-inline void G4ViewParameters::SetXGeometryString (const G4String& geomString) {
-  fXGeometryString = geomString;
-}
-
 inline void G4ViewParameters::SetAutoRefresh (G4bool state) {
   fAutoRefresh = state;

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

@@ -138 +138 @@
   G4VisCommandViewerCreate (const G4VisCommandViewerCreate&);
   G4VisCommandViewerCreate& operator = (const G4VisCommandViewerCreate&);
-  int ParseGeometry ( const char *string, int *x, int *y, unsigned int *width, unsigned int *height);
-  int ReadInteger(char *string, char **NextString);
   G4String NextName ();
   G4UIcommand* fpCommand;
   G4int fId;
-  int NoValue;
-  int XValue;
-  int YValue;
-  int WidthValue;
-  int HeightValue;
-  int AllValues;
-  int XNegative;
-  int YNegative;
 };
 

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

@@ -313 +313 @@
   // Creates scene handler for the current system.
 
-  void CreateViewer  (G4String name = "");
+  void CreateViewer  (G4String name = "",G4String XGeometry = "");
   // Creates viewer for the current scene handler.
 

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

@@ -73 +73 @@
 }
 
-inline void G4VisManager::GetWindowSizeHint
- (G4int& xHint, G4int& yHint) const {
-  xHint = fWindowSizeHintX; yHint = fWindowSizeHintY;
-}
-
-inline void G4VisManager::GetWindowLocationHint
- (G4int& xHint, G4int& yHint) const {
-  xHint = fpViewer->GetViewParameters().GetWindowLocationHintX();
-  yHint = fpViewer->GetViewParameters().GetWindowLocationHintY();
-}
-
-inline const G4String& G4VisManager::GetXGeometryString () const {
-  return fXGeometryString;
-}
 
 inline G4bool G4VisManager::GetTransientsDrawnThisEvent() const {
@@ -120 +106 @@
 }
 
-inline void G4VisManager::SetWindowSizeHint (G4int xHint, G4int yHint) {
-  fWindowSizeHintX = xHint; fWindowSizeHintY = yHint;
-}
-
-inline void G4VisManager::SetWindowLocationHint (G4int xHint, G4int yHint) {
-#ifdef G4DEBUG
-        printf("G4VisManager::SetWindowLocationHint () :: %d %d\n",xHint,yHint);
-#endif
-  G4ViewParameters vp = fpViewer->GetViewParameters();
-  vp.SetWindowLocationHint(xHint,yHint);
-#ifdef G4DEBUG
-        printf("G4VisManager::SetViewParameteres location ()\n");
-#endif
-  fpViewer->SetViewParameters(vp);
-}
-
-inline void G4VisManager::SetXGeometryString (const G4String& geomString) {
-  fXGeometryString = geomString;
-}
-
 inline void G4VisManager::SetEventRefreshing (G4bool eventRefreshing) {
   fEventRefreshing = eventRefreshing;