Changeset 910 for trunk/source/visualization

Timestamp:

Jan 19, 2009, 5:10:30 PM (15 years ago)

Author:

garnier

Message:

Update, nothing

Location:

trunk/source/visualization/management/src

Files:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ViewParameters.cc,v 1.32 2009/01/13 09:55:15 lgarnier Exp $
+// $Id: G4ViewParameters.cc,v 1.33 2009/01/19 15:47:49 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -532 +532 @@
 
 
-void G4ViewParameters::SetXGeometryString (const G4String& geomString) {
+void G4ViewParameters::SetXGeometryString (const G4String& geomStringArg) {
 
 
   G4int x,y = 0;
   unsigned int w,h = 0;
+  G4String geomString = geomStringArg;
+  // Parse windowSizeHintString for backwards compatibility...
+  const G4String delimiters("xX+-");
+  G4String::size_type i = geomString.find_first_of(delimiters);
+  if (i == G4String::npos) {  // Does not contain "xX+-".  Assume single number
+    std::istringstream iss(geomString);
+    G4int size;
+    iss >> size;
+    if (!iss) {
+      size = 600;
+      G4cout << "Unrecognised windowSizeHint string: \""
+             << geomString
+             << "\".  Asuuming " << size << G4endl;
+    }
+    std::ostringstream oss;
+    oss << size << 'x' << size;
+    geomString = oss.str();
+  }
+ 
   G4int m = ParseGeometry( geomString, &x, &y, &w, &h );
 
+  // Handle special case :
+  if ((m & fYValue) == 0)
+    {  // Using default
+      y =  fWindowLocationHintY;      
+    }
+  if ((m & fXValue) == 0)
+    {  // Using default
+      x =  fWindowLocationHintX;      
+    }
+
   // Check errors
-  if ( ((m & fYValue) == 0))
-#ifdef G4DEBUG
-    printf("G4ViewParameters::SetXGeometryString YValue\n");
-#endif
-
-  if ( ((m & fXValue) == 0))
-#ifdef G4DEBUG
-    printf("G4ViewParameters::SetXGeometryString XValue\n");
-#endif
-  if ( ((m & fHeightValue) == 0 ))
-#ifdef G4DEBUG
-    printf("G4ViewParameters::SetXGeometryString fHeightValue\n");
-#endif
-  if ( ((m & fWidthValue)  == 0 ))
-#ifdef G4DEBUG
-    printf("G4ViewParameters::SetXGeometryString fWidthValue\n");
-#endif
-
-  if ( ((m & fYValue) == 0) ||
-       ((m & fXValue) == 0) ||
-       ((m & fHeightValue) == 0 ) ||
+  if ( ((m & fHeightValue) == 0 ) ||
        ((m & fWidthValue)  == 0 )) {
     G4cout << "ERROR: Unrecognised geometry string \""
@@ -585 +594 @@
       fWindowLocationHintYNegative = false;
     }
-
   }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsViewer.cc,v 1.73 2009/01/13 10:10:47 lgarnier Exp $
+// $Id: G4VisCommandsViewer.cc,v 1.75 2009/01/19 15:47:49 lgarnier Exp $
 // GEANT4 tag $Name:  $