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

Timestamp:

Jan 22, 2009, 4:40:22 PM (15 years ago)

Author:

garnier

Message:

History change, and a Warning added

File:

• trunk/source/visualization/management/src/G4ViewParameters.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ViewParameters.cc,v 1.34 2009/01/19 16:26:40 lgarnier Exp $
+// $Id: G4ViewParameters.cc,v 1.36 2009/01/21 17:05:12 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -556 +556 @@
   }
  
-  G4int m = ParseGeometry( geomString, &x, &y, &w, &h );
+  fGeometryMask = ParseGeometry( geomString, &x, &y, &w, &h );
 
   // Handle special case :
-  if ((m & fYValue) == 0)
+  if ((fGeometryMask & fYValue) == 0)
     {  // Using default
-      y =  fWindowLocationHintY;      
-    }
-  if ((m & fXValue) == 0)
+      y =  fWindowLocationHintY;
+    }
+  if ((fGeometryMask & fXValue) == 0)
     {  // Using default
-      x =  fWindowLocationHintX;      
+      x =  fWindowLocationHintX;
     }
 
   // Check errors
-  if ( ((m & fHeightValue) == 0 ) ||
-       ((m & fWidthValue)  == 0 )) {
-    G4cout << "ERROR: Unrecognised geometry string \""
+  // if there is no Width and Height
+  if ( ((fGeometryMask & fHeightValue) == 0 ) &&
+       ((fGeometryMask & fWidthValue)  == 0 )) {
+    h = fWindowSizeHintY;
+    w = fWindowSizeHintX;
+  } else  if ((fGeometryMask & fHeightValue) == 0 ) {
+
+    // if there is only Width. Special case to be backward compatible
+    // We set Width and Height the same to obtain a square windows.
+    
+    G4cout << "Unrecognised geometry string \""
            << geomString
-           << "\".  Using default"
+           << "\".  No Height found. Using Width value instead"
            << G4endl;
-  } else {
-    // Set the string
-    fXGeometryString = geomString;
-
-    // Set values
-    fWindowSizeHintX = w;
-    fWindowSizeHintY = h;
-    fWindowLocationHintX = x;
-    fWindowLocationHintY = y;
-    if ( (m & fXNegative) ) {
+    h = w;
+  }
+  if ( ((fGeometryMask & fXValue) == 0 ) ||
+       ((fGeometryMask & fYValue)  == 0 )) {
+    //Using defaults
+    x = fWindowLocationHintX;
+    y = fWindowLocationHintY;
+  }
+  // Set the string
+  fXGeometryString = geomString;
+  
+  // Set values
+  fWindowSizeHintX = w;
+  fWindowSizeHintY = h;
+  fWindowLocationHintX = x;
+  fWindowLocationHintY = y;
+
+  if ( ((fGeometryMask & fXValue)) &&
+       ((fGeometryMask & fYValue))) {
+
+    if ( (fGeometryMask & fXNegative) ) {
       fWindowLocationHintXNegative = true;
     } else {
       fWindowLocationHintXNegative = false;
     }
-    if ( (m & fYNegative) ) {
-      fWindowLocationHintYNegative = true;
+    if ( (fGeometryMask & fYNegative) ) {
+    fWindowLocationHintYNegative = true;
     } else {
       fWindowLocationHintYNegative = false;
     }
   }
-
 }