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

Timestamp:

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

Author:

garnier

Message:

Modif pour XGeometry complet. Avec debug

Location:

trunk/source/visualization/management/src

Files:

• G4VViewer.cc (modified) (1 diff)
• G4ViewParameters.cc (modified) (3 diffs)
• G4VisCommandsViewer.cc (modified) (3 diffs)
• G4VisManager.cc (modified) (2 diffs)

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

@@ -61 +61 @@
   fShortName = fName (0, fName.find (' '));
   fShortName.strip ();
-
-  G4VisManager* pVisMan = G4VisManager::GetInstance();
-  G4int xHint, yHint;
-  pVisMan->GetWindowSizeHint(xHint, yHint);
-  const G4String& XGeometryString = pVisMan->GetXGeometryString();
-#ifdef G4DEBUG
-    printf("G4VViewer::G4VViewer set geometry of viewer\n");
-#endif
-  fVP.SetWindowSizeHint(xHint,yHint);
-  fVP.SetXGeometryString(XGeometryString);
-  fDefaultVP.SetWindowSizeHint(xHint,yHint);
-  fDefaultVP.SetXGeometryString(XGeometryString);
 }
 

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

@@ -39 +39 @@
 
 G4ViewParameters::G4ViewParameters ():
+  fNoValue(0x0000),
+  fXValue(0x0001),
+  fYValue(0x0002),
+  fWidthValue(0x0004),
+  fHeightValue(0x0008),
+  fAllValues(0x000F),
+  fXNegative(0x0010),
+  fYNegative(0x0020),
   fDrawingStyle (wireframe),
   fAuxEdgeVisible (false),
@@ -71 +79 @@
   fWindowSizeHintX (600),
   fWindowSizeHintY (600),
+  fWindowLocationHintX(0),
+  fWindowLocationHintY(0),
+  fWindowLocationHintXNegative(true),
+  fWindowLocationHintYNegative(false),
   fAutoRefresh (false),
   fBackgroundColour (G4Colour(0.,0.,0.)),         // Black
   fPicking (false)
 {
+#ifdef G4DEBUG
+  printf("G4ViewParameters::Create \n");
+#endif
   fDefaultMarker.SetScreenSize (5.);
   // Markers are 5 pixels "overall" size, i.e., diameter.
@@ -518 +533 @@
   return false;
 }
+
+
+void G4ViewParameters::SetXGeometryString (const G4String& geomString) {
+
+
+  G4int x,y = 0;
+  unsigned int w,h = 0;
+  G4int m = ParseGeometry( geomString, &x, &y, &w, &h );
+
+  // Check errors
+  if ( ((m & fYValue) == 0) ||
+       ((m & fXValue) == 0) ||
+       ((m & fHeightValue) == 0 ) ||
+       ((m & fWidthValue)  == 0 )) {
+    G4cout << "ERROR: Unrecognised geometry string \""
+           << geomString
+           << "\".  Using default"
+           << G4endl;
+  } else {
+    // Set the string
+    fXGeometryString = geomString;
+
+    // Set values
+    fWindowSizeHintX = w;
+    fWindowSizeHintY = h;
+    fWindowLocationHintX = x;
+    fWindowLocationHintY = y;
+    if ( (m & fXNegative) ) {
+      fWindowLocationHintXNegative = true;
+    } else {
+      fWindowLocationHintXNegative = false;
+    }
+    if ( (m & fYNegative) ) {
+      fWindowLocationHintYNegative = true;
+    } else {
+      fWindowLocationHintYNegative = false;
+    }
+
+  }
+
+}
+
+G4int G4ViewParameters::GetWindowAbsoluteLocationHintX (G4int sizeX ) const {
+#ifdef G4DEBUG
+  printf("G4ViewParameters::GetWindowLocationHintX () :: %d\n",fWindowLocationHintX);
+#endif
+  if ( fWindowLocationHintXNegative ) {
+    return  sizeX  + fWindowLocationHintX - fWindowSizeHintX;
+  }
+  return fWindowLocationHintX;
+}
+
+G4int G4ViewParameters::GetWindowAbsoluteLocationHintY (G4int sizeY ) const {
+#ifdef G4DEBUG
+  printf("G4ViewParameters::GetWindowLocationHintY () :: %d\n",fWindowLocationHintY);
+#endif
+  if (  fWindowLocationHintYNegative ) {
+    return  sizeY  + fWindowLocationHintY - fWindowSizeHintY;
+  }
+  return fWindowLocationHintY;
+}
+
+/* Keep from :
+ * ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.0.6.tar.gz/qt-embedded-free-3.0.6/src/kernel/qapplication_qws.cpp
+ *
+ *    ParseGeometry parses strings of the form
+ *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
+ *   width, height, xoffset, and yoffset are unsigned integers.
+ *   Example:  "=80x24+300-49"
+ *   The equal sign is optional.
+ *   It returns a bitmask that indicates which of the four values
+ *   were actually found in the string. For each value found,
+ *   the corresponding argument is updated;  for each value
+ *   not found, the corresponding argument is left unchanged.
+ */
+
+int G4ViewParameters::ParseGeometry (
+ const char *string,
+ G4int *x,
+ G4int *y,
+ unsigned int *width,
+ unsigned int *height)
+{
+
+  G4int mask = fNoValue;
+  register char *strind;
+  unsigned int tempWidth, tempHeight;
+  G4int tempX, tempY;
+  char *nextCharacter;
+  if ( (string == NULL) || (*string == '\0')) {
+    return(mask);
+  }
+  if (*string == '=')
+    string++;  /* ignore possible '=' at beg of geometry spec */
+  strind = (char *)string;
+  if (*strind != '+' && *strind != '-' && *strind != 'x') {
+    tempWidth = ReadInteger(strind, &nextCharacter);
+    if (strind == nextCharacter)
+      return (0);
+    strind = nextCharacter;
+    mask |= fWidthValue;
+  }
+  if (*strind == 'x' || *strind == 'X') {
+    strind++;
+    tempHeight = ReadInteger(strind, &nextCharacter);
+    if (strind == nextCharacter)
+      return (0);
+    strind = nextCharacter;
+    mask |= fHeightValue;
+  }
+
+  if ((*strind == '+') || (*strind == '-')) {
+    if (*strind == '-') {
+      strind++;
+      tempX = -ReadInteger(strind, &nextCharacter);
+      if (strind == nextCharacter)
+        return (0);
+      strind = nextCharacter;
+      mask |= fXNegative;
+
+    }
+    else
+      { strind++;
+        tempX = ReadInteger(strind, &nextCharacter);
+        if (strind == nextCharacter)
+          return(0);
+        strind = nextCharacter;
+      }
+    mask |= fXValue;
+    if ((*strind == '+') || (*strind == '-')) {
+      if (*strind == '-') {
+        strind++;
+        tempY = -ReadInteger(strind, &nextCharacter);
+        if (strind == nextCharacter)
+          return(0);
+        strind = nextCharacter;
+        mask |= fYNegative;
+      }
+      else
+        {
+          strind++;
+          tempY = ReadInteger(strind, &nextCharacter);
+          if (strind == nextCharacter)
+            return(0);
+          strind = nextCharacter;
+        }
+      mask |= fYValue;
+    }
+  }
+  /* If strind isn't at the end of the string the it's an invalid
+     geometry specification. */
+  if (*strind != '\0') return (0);
+  if (mask & fXValue)
+    *x = tempX;
+  if (mask & fYValue)
+    *y = tempY;
+  if (mask & fWidthValue)
+    *width = tempWidth;
+  if (mask & fHeightValue)
+    *height = tempHeight;
+  return (mask);
+}
+
+/* Keep from :
+ * ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.0.6.tar.gz/qt-embedded-free-3.0.6/src/kernel/qapplication_qws.cpp
+ *
+ */
+G4int G4ViewParameters::ReadInteger(char *string, char **NextString)
+{
+    register G4int Result = 0;
+    G4int Sign = 1;
+
+    if (*string == '+')
+        string++;
+    else if (*string == '-')
+    {
+        string++;
+        Sign = -1;
+    }
+    for (; (*string >= '0') && (*string <= '9'); string++)
+    {
+        Result = (Result * 10) + (*string - '0');
+    }
+    *NextString = string;
+    if (Sign >= 0)
+        return (Result);
+    else
+        return (-Result);
+}
+   

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

@@ -489 +489 @@
 
 G4VisCommandViewerCreate::G4VisCommandViewerCreate ():
-  fId (0),
-  NoValue(0x0000),
-  XValue(0x0001),
-  YValue(0x0002),
-  WidthValue(0x0004),
-  HeightValue(0x0008),
-  AllValues(0x000F),
-  XNegative(0x0010),
-  YNegative(0x0020) {
+  fId (0)
+ {
   G4bool omitable;
   fpCommand = new G4UIcommand ("/vis/viewer/create", this);
@@ -689 +682 @@
   // the vis manager until the viewer is contructed - next line...
 
-  ////////
-
-  int x,y = 0;
-  unsigned int w,h = 0;
-
-  int m = ParseGeometry( windowSizeHintString, &x, &y, &w, &h );
-  //  QSize minSize = main_widget->minimumSize();
-  //  QSize maxSize = main_widget->maximumSize();
-  if ( ((m & YValue) == 0) ||
-       ((m & XValue) == 0) ||
-       ((m & HeightValue) == 0 ) ||
-       ((m & WidthValue)  == 0 )) {
-    if (verbosity >= G4VisManager::errors) {
-      G4cout << "ERROR: Unrecognised geometry string \""
-             << windowSizeHintString
-             << "\".  Using 100 for X and Y location."
-             << "\".  Using 600 for Width and Height."
-             << G4endl;
-    }
-    x = 100;
-    y = 100;
-    w = 600;
-    h = 600;
-  }
-
-#ifdef G4DEBUG
-  printf  ("Lecture X:%d Y:%d W:%d H:%d\n",x,y,w,h);
-#endif
-
-
-
-  // Create viewer.
-  fpVisManager -> CreateViewer (newName);
-
-  // set parameters BEFORE
-  fpVisManager->SetWindowSizeHint (w,h);
-  fpVisManager->SetWindowLocationHint (x,y);
-  fpVisManager->SetXGeometryString(windowSizeHintString);
+  fpVisManager -> CreateViewer (newName,windowSizeHintString);
 
   G4VViewer* newViewer = fpVisManager -> GetCurrentViewer ();
@@ -1573 +1529 @@
 }
 
-/* Keep from :
- * ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.0.6.tar.gz/qt-embedded-free-3.0.6/src/kernel/qapplication_qws.cpp
- *
- *    ParseGeometry parses strings of the form
- *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
- *   width, height, xoffset, and yoffset are unsigned integers.
- *   Example:  "=80x24+300-49"
- *   The equal sign is optional.
- *   It returns a bitmask that indicates which of the four values
- *   were actually found in the string. For each value found,
- *   the corresponding argument is updated;  for each value
- *   not found, the corresponding argument is left unchanged.
- */
-
-
-int G4VisCommandViewerCreate::ParseGeometry (
- const char *string,
- int *x,
- int *y,
- unsigned int *width,
- unsigned int *height)
-{
-
-  int mask = NoValue;
-  register char *strind;
-  unsigned int tempWidth, tempHeight;
-  int tempX, tempY;
-  char *nextCharacter;
-  if ( (string == NULL) || (*string == '\0')) {
-    return(mask);
-  }
-  if (*string == '=')
-    string++;  /* ignore possible '=' at beg of geometry spec */
-  strind = (char *)string;
-  if (*strind != '+' && *strind != '-' && *strind != 'x') {
-    tempWidth = ReadInteger(strind, &nextCharacter);
-    if (strind == nextCharacter)
-      return (0);
-    strind = nextCharacter;
-    mask |= WidthValue;
-  }
-  if (*strind == 'x' || *strind == 'X') {
-    strind++;
-    tempHeight = ReadInteger(strind, &nextCharacter);
-    if (strind == nextCharacter)
-      return (0);
-    strind = nextCharacter;
-    mask |= HeightValue;
-  }
-
-  if ((*strind == '+') || (*strind == '-')) {
-    if (*strind == '-') {
-      strind++;
-      tempX = -ReadInteger(strind, &nextCharacter);
-      if (strind == nextCharacter)
-        return (0);
-      strind = nextCharacter;
-      mask |= XNegative;
-
-    }
-    else
-      { strind++;
-        tempX = ReadInteger(strind, &nextCharacter);
-        if (strind == nextCharacter)
-          return(0);
-        strind = nextCharacter;
-      }
-    mask |= XValue;
-    if ((*strind == '+') || (*strind == '-')) {
-      if (*strind == '-') {
-        strind++;
-        tempY = -ReadInteger(strind, &nextCharacter);
-        if (strind == nextCharacter)
-          return(0);
-        strind = nextCharacter;
-        mask |= YNegative;
-      }
-      else
-        {
-          strind++;
-          tempY = ReadInteger(strind, &nextCharacter);
-          if (strind == nextCharacter)
-            return(0);
-          strind = nextCharacter;
-        }
-      mask |= YValue;
-    }
-  }
-  /* If strind isn't at the end of the string the it's an invalid
-     geometry specification. */
-  if (*strind != '\0') return (0);
-  if (mask & XValue)
-    *x = tempX;
-  if (mask & YValue)
-    *y = tempY;
-  if (mask & WidthValue)
-    *width = tempWidth;
-  if (mask & HeightValue)
-    *height = tempHeight;
-  return (mask);
-}
-
-/* Keep from :
- * ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.0.6.tar.gz/qt-embedded-free-3.0.6/src/kernel/qapplication_qws.cpp
- *
- */
-int G4VisCommandViewerCreate::ReadInteger(char *string, char **NextString)
-{
-    register int Result = 0;
-    int Sign = 1;
-
-    if (*string == '+')
-        string++;
-    else if (*string == '-')
-    {
-        string++;
-        Sign = -1;
-    }
-    for (; (*string >= '0') && (*string <= '9'); string++)
-    {
-        Result = (Result * 10) + (*string - '0');
-    }
-    *NextString = string;
-    if (Sign >= 0)
-        return (Result);
-    else
-        return (-Result);
-}
+

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

@@ -651 +651 @@
 }
 
-void G4VisManager::CreateViewer (G4String name) {
+void G4VisManager::CreateViewer (G4String name,G4String XGeometry) {
 #ifdef G4DEBUG
   printf("G4VisManager::CreateViewer TOP\n");
@@ -667 +667 @@
     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