[Jmol-commits] CVS: Jmol/src/org/openscience/jmol DisplayControl.java,1.74,1.75 ModelManager.java,1.9,1.10 SelectionManager.java,1.5,1.6 StyleManager.java,1.14,1.15

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

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol
In directory sc8-pr-cvs1:/tmp/cvs-serv8645

Modified Files:
	DisplayControl.java ModelManager.java SelectionManager.java 
	StyleManager.java 
Log Message:
more rasmol script settings, esp measure related


Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** DisplayControl.java	19 Jan 2003 11:29:36 -0000	1.74
--- DisplayControl.java	19 Jan 2003 18:20:54 -0000	1.75
***************
*** 156,159 ****
--- 156,163 ----
    }
  
+   public void logError(String strMsg) {
+     System.out.println("strMsg");
+   }
+ 
    /****************************************************************
     * delegated to TransformManager
***************
*** 637,640 ****
--- 641,654 ----
    }
  
+   public void invertSelection() {
+     selectionManager.invertSelection();
+     // only used from a script, so I do not think a refresh() is necessary
+   }
+ 
+   public void excludeSelectionSet(BitSet set) {
+     selectionManager.excludeSelectionSet(set);
+     // only used from a script, so I do not think a refresh() is necessary
+   }
+ 
    public BitSet getSelectionSet() {
      return selectionManager.bsSelection;
***************
*** 779,782 ****
--- 793,801 ----
    }
  
+   public void defineMeasure(int[] atomIndices) {
+     modelManager.defineMeasure(atomIndices);
+     refresh();
+   }
+ 
    public void defineMeasure(int atom1, int atom2) {
      modelManager.defineMeasure(atom1, atom2);
***************
*** 940,943 ****
--- 959,966 ----
    }
  
+   public void setStyleAtomScript(byte style) {
+     distributor.setStyleAtom(style, iterAtomScript());
+   }
+ 
    public void setStyleMarBondScript(byte style, short mar) {
      distributor.setStyleMarBond(style, mar, iterBondScript());
***************
*** 960,963 ****
--- 983,1004 ----
    }
  
+   boolean rasmolHydrogenSetting = true;
+   public void setRasmolHydrogenSetting(boolean b) {
+     rasmolHydrogenSetting = b;
+   }
+   
+   public boolean getRasmolHydrogenSetting() {
+     return rasmolHydrogenSetting;
+   }
+ 
+   boolean rasmolHeteroSetting = true;
+   public void setRasmolHeteroSetting(boolean b) {
+     rasmolHeteroSetting = b;
+   }
+   
+   public boolean getRasmolHeteroSetting() {
+     return rasmolHeteroSetting;
+   }
+ 
    /****************************************************************
     * delegated to StyleManager
***************
*** 1108,1111 ****
--- 1149,1162 ----
      return styleManager.showMeasurements;
    }
+ 
+   public void setShowMeasurementLabels(boolean showMeasurementLabels) {
+     styleManager.setShowMeasurementLabels(showMeasurementLabels);
+     refresh();
+   }
+ 
+   public boolean getShowMeasurementLabels() {
+     return styleManager.showMeasurementLabels;
+   }
+ 
  
    public Font getMeasureFont(int size) {

Index: ModelManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ModelManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ModelManager.java	18 Jan 2003 16:23:40 -0000	1.9
--- ModelManager.java	19 Jan 2003 18:20:55 -0000	1.10
***************
*** 157,160 ****
--- 157,176 ----
    }
  
+   public void defineMeasure(int[] atoms) {
+     switch (atoms.length) {
+     case 2:
+       defineMeasure(atoms[0], atoms[1]);
+       break;
+     case 3:
+       defineMeasure(atoms[0], atoms[1], atoms[2]);
+       break;
+     case 4:
+       defineMeasure(atoms[0], atoms[1], atoms[2], atoms[3]);
+       break;
+     default:
+       control.logError("unrecognized number of args to defineMeasure");
+     }
+   }
+ 
    public void defineMeasure(int atom1, int atom2) {
      mlist.addDistance(atom1, atom2);

Index: SelectionManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/SelectionManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SelectionManager.java	19 Jan 2003 11:29:36 -0000	1.5
--- SelectionManager.java	19 Jan 2003 18:20:55 -0000	1.6
***************
*** 109,111 ****
--- 109,131 ----
      empty = UNKNOWN;
    }
+ 
+   public void invertSelection() {
+     empty = TRUE;
+     for (int i = control.numberOfAtoms(); --i >= 0; )
+       if (bsSelection.get(i)) {
+         bsSelection.clear(i);
+       } else {
+         bsSelection.set(i);
+         empty = FALSE;
+       }
+   }
+ 
+   public void excludeSelectionSet(BitSet setExclude) {
+     if (empty == TRUE)
+       return;
+     for (int i = control.numberOfAtoms(); --i >= 0; )
+       if (setExclude.get(i))
+         bsSelection.clear(i);
+     empty = UNKNOWN;
+   }
  }

Index: StyleManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/StyleManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** StyleManager.java	18 Jan 2003 01:26:51 -0000	1.14
--- StyleManager.java	19 Jan 2003 18:20:55 -0000	1.15
***************
*** 94,97 ****
--- 94,102 ----
    }
  
+   public boolean showMeasurementLabels = true;
+   public void setShowMeasurementLabels(boolean showMeasurementLabels) {
+     this.showMeasurementLabels = showMeasurementLabels;
+   }
+ 
    public Font getMeasureFont(int size) {
      return new Font("Helvetica", Font.PLAIN, size);