[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/app DisplayPanel.java,1.25,1.26 PreferencesDialog.java,1.19,1.20

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12468/src/org/openscience/jmol/app

Modified Files:
	DisplayPanel.java PreferencesDialog.java 
Log Message:
made boundingbox more like a shape


Index: DisplayPanel.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/DisplayPanel.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DisplayPanel.java	19 Jan 2004 18:20:49 -0000	1.25
+++ DisplayPanel.java	15 Feb 2004 22:54:28 -0000	1.26
@@ -463,7 +463,7 @@
 
     public void actionPerformed(ActionEvent e) {
       JCheckBoxMenuItem cbmi = (JCheckBoxMenuItem) e.getSource();
-      viewer.setShowBoundingBox(cbmi.isSelected());
+      viewer.setShapeShow(JmolConstants.SHAPE_BBOX, cbmi.isSelected());
     }
   }
 
@@ -492,7 +492,8 @@
     guimap.setSelected("vectorsCheck", viewer.getShowVectors());
     guimap.setSelected("measurementsCheck", viewer.getShowMeasurements());
     guimap.setSelected("axesCheck", viewer.getShowAxes());
-    guimap.setSelected("boundboxCheck", viewer.getShowBoundingBox());
+    guimap.setSelected("boundboxCheck",
+                       viewer.getShapeShow(JmolConstants.SHAPE_BBOX));
   }
 
   public Action[] getActions() {

Index: PreferencesDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PreferencesDialog.java	19 Jan 2004 21:26:08 -0000	1.19
+++ PreferencesDialog.java	15 Feb 2004 22:54:28 -0000	1.20
@@ -285,7 +285,7 @@
 
     cbShowBoundingBox =
       guimap.newJCheckBox("Prefs.showBoundingBox",
-                          viewer.getShowBoundingBox());
+                          viewer.getShapeShow(JmolConstants.SHAPE_BBOX));
     cbShowBoundingBox.addItemListener(checkBoxListener);
     fooPanel.add(cbShowBoundingBox);
 
@@ -981,7 +981,9 @@
 
     cbPerspectiveDepth.setSelected(viewer.getPerspectiveDepth());
     cbShowAxes.setSelected(viewer.getShowAxes());
-    cbShowBoundingBox.setSelected(viewer.getShowBoundingBox());
+    cbShowBoundingBox.setSelected(viewer.
+                                  getShapeShow(JmolConstants.SHAPE_BBOX));
+
     cbOrientationRasMolChime.setSelected(viewer.getOrientationRasMolChime());
 
     // Atom panel controls: 
@@ -1106,7 +1108,7 @@
     viewer.setWireframeRotation(wireframeRotation);
     viewer.setPerspectiveDepth(perspectiveDepth);
     viewer.setShowAxes(showAxes);
-    viewer.setShowBoundingBox(showBoundingBox);
+    viewer.setShapeShow(JmolConstants.SHAPE_BBOX, showBoundingBox);
     viewer.setOrientationRasMolChime(orientationRasMolChime);
     Vibrate.setAmplitudeScale(VibrateAmplitudeScale);
     Vibrate.setVectorScale(VibrateVectorScale);
@@ -1183,7 +1185,7 @@
         currentProperties.put("showAxes", strSelected);
       } else if (key.equals("Prefs.showBoundingBox")) {
         showBoundingBox = isSelected;
-        viewer.setShowBoundingBox(isSelected);
+        viewer.setShapeShow(JmolConstants.SHAPE_BBOX, isSelected);
         currentProperties.put("showBoundingBox", strSelected);
       } else if (key.equals("Prefs.orientationRasMolChime")) {
         orientationRasMolChime = isSelected;