Menu
▾
▴
[Jmol-commits] CVS: Jmol/src/org/openscience/jmol ColorManager.java,1.10,1.11 DisplayControl.java,1.65,1.66 JmolAtomIterator.java,1.2,1.3 LabelManager.java,1.2,1.3 PreferencesDialog.java,1.21,1.22 StyleManager.java,1.11,1.12
|
From: Michael T H. <mic...@us...> - 2003-01-15 23:56:37
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol
In directory sc8-pr-cvs1:/tmp/cvs-serv5094
Modified Files:
ColorManager.java DisplayControl.java JmolAtomIterator.java
LabelManager.java PreferencesDialog.java StyleManager.java
Log Message:
more work on settings--trying to maintain jmol behaivor + rasmol compatibility
Index: ColorManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ColorManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ColorManager.java 15 Jan 2003 15:32:49 -0000 1.10
--- ColorManager.java 15 Jan 2003 23:56:34 -0000 1.11
***************
*** 48,67 ****
private AtomColorer colorProfile = AtomColors.getInstance();
public int modeAtomColorProfile = DisplayControl.ATOMTYPE;
! public void setModeAtomColorProfile(int mode, boolean setDefault,
! JmolAtomIterator iter) {
! AtomColorer colorProfile;
if (mode == DisplayControl.ATOMTYPE)
colorProfile = atomColors;
else
colorProfile = chargeColors;
- if (setDefault) {
- this.modeAtomColorProfile = mode;
- this.colorProfile = colorProfile;
- }
- while (iter.hasNext()) {
- Atom atom = iter.nextAtom();
- Color color = colorProfile.getAtomColor(atom);
- atom.atomShape.setColorAtom(color);
- }
}
--- 48,57 ----
private AtomColorer colorProfile = AtomColors.getInstance();
public int modeAtomColorProfile = DisplayControl.ATOMTYPE;
! public void setModeAtomColorProfile(int mode) {
! this.modeAtomColorProfile = mode;
if (mode == DisplayControl.ATOMTYPE)
colorProfile = atomColors;
else
colorProfile = chargeColors;
}
***************
*** 108,126 ****
}
- public boolean isLabelAtomColor;
- public void setIsLabelAtomColor(boolean isLabelAtomColor) {
- this.isLabelAtomColor = isLabelAtomColor;
- }
-
- public Color colorText = Color.black;
- public void setColorText(Color c) {
- colorText = c;
- }
- public Color getColorText() {
- return colorText;
- }
-
public Color colorLabel = Color.black;
! public void setColorLabel(Color c) {
colorLabel = c;
}
--- 98,103 ----
}
public Color colorLabel = Color.black;
! public void setColorLabel (Color c) {
colorLabel = c;
}
***************
*** 130,136 ****
colorDistance = c;
}
- public Color getColorDistance() {
- return colorDistance;
- }
public Color colorAngle = Color.black;
--- 107,110 ----
***************
*** 138,144 ****
colorAngle = c;
}
- public Color getColorAngle() {
- return colorAngle;
- }
public Color colorDihedral = Color.black;
--- 112,115 ----
***************
*** 146,152 ****
colorDihedral = c;
}
- public Color getColorDihedral() {
- return colorDihedral;
- }
public Color colorBackground = Color.white;
--- 117,120 ----
***************
*** 156,162 ****
else
colorBackground = bg;
- }
- public Color getColorBackground() {
- return colorBackground;
}
--- 124,127 ----
Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** DisplayControl.java 15 Jan 2003 15:32:50 -0000 1.65
--- DisplayControl.java 15 Jan 2003 23:56:34 -0000 1.66
***************
*** 63,66 ****
--- 63,67 ----
public BondRenderer bondRenderer;
public LabelRenderer labelRenderer;
+ public Distributor distributor;
public String strJvmVersion;
***************
*** 85,88 ****
--- 86,90 ----
styleManager = new StyleManager(this);
labelManager = new LabelManager(this);
+ distributor = new Distributor(this);
atomRenderer = new AtomRenderer(this);
***************
*** 409,417 ****
public void setModeAtomColorProfile(int mode) {
! if (!modelManager.haveFile)
! return;
! boolean empty = selectionManager.isEmpty();
! colorManager.setModeAtomColorProfile(mode, empty,
! empty ? iterAll() : iterSelection());
refresh();
}
--- 411,416 ----
public void setModeAtomColorProfile(int mode) {
! colorManager.setModeAtomColorProfile(mode);
! distributor.setColorAtom(null, iterAtomMenu());
refresh();
}
***************
*** 443,462 ****
}
! public void setIsLabelAtomColor(boolean isLabelAtomColor) {
! colorManager.setIsLabelAtomColor(isLabelAtomColor);
refresh();
}
! public boolean getIsLabelAtomColor() {
! return colorManager.isLabelAtomColor;
! }
!
! public void setColorText(Color c) {
! colorManager.setColorText(c);
! refresh();
! }
!
! public Color getColorText() {
! return colorManager.colorText;
}
--- 442,452 ----
}
! public void setColorLabel(Color c) {
! colorManager.setColorLabel(c);
refresh();
}
! public Color getColorLabel() {
! return colorManager.colorLabel;
}
***************
*** 546,570 ****
}
! public void setIsBondAtomColor(boolean isBondAtomColor) {
! setColorBond(null);
! }
!
! public boolean getIsBondAtomColor() {
! return colorManager.isBondAtomColor;
! }
!
public void setColorBond(Color colorBond) {
! boolean empty = selectionManager.isEmpty();
! if (empty) {
! if (colorBond == null)
! colorManager.setIsBondAtomColor(true);
! else {
! colorManager.setIsBondAtomColor(false);
! colorManager.setColorBond(colorBond);
! }
! }
! if (!modelManager.haveFile)
! return;
! styleManager.setColorBond(colorBond, empty ? iterAll() : iterBond());
refresh();
}
--- 536,543 ----
}
! // note that colorBond could be null -- meaning inherit atom color
public void setColorBond(Color colorBond) {
! colorManager.setColorBond(colorBond);
! distributor.setColorBond(colorBond, iterBondMenu());
refresh();
}
***************
*** 671,675 ****
public void setChemFile(ChemFile chemfile) {
modelManager.setChemFile(chemfile);
! styleManager.initializeAtomShapes();
homePosition();
// don't know if I need this firm refresh here or not
--- 644,648 ----
public void setChemFile(ChemFile chemfile) {
modelManager.setChemFile(chemfile);
! distributor.initializeAtomShapes();
homePosition();
// don't know if I need this firm refresh here or not
***************
*** 879,891 ****
****************************************************************/
! private JmolAtomIterator iterAll() {
! return modelManager.getChemFileIterator();
! }
!
! private JmolAtomIterator iterSelection() {
return modelManager.getChemFrameIterator(selectionManager.bsSelection);
}
! private JmolAtomIterator iterBond() {
return modelManager.getChemFrameIterator(selectionManager.bsSelection,
false);
--- 852,882 ----
****************************************************************/
! /*
! * for rasmol compatibility with continued menu operation:
! * - if it is from the menu & nothing selected
! * * set the setting
! * * apply to all
! * - if it is from the menu and something is selected
! * * apply to selection
! * - if it is from a script
! * * apply to selection
! * * possibly set the setting for some things
! */
!
! JmolAtomIterator iterNull = new JmolAtomIterator();
!
! private JmolAtomIterator iterAtomMenu() {
! if (! modelManager.haveFile)
! return iterNull;
! if (selectionManager.isEmpty())
! return modelManager.getChemFileIterator();
return modelManager.getChemFrameIterator(selectionManager.bsSelection);
}
! private JmolAtomIterator iterBondMenu() {
! if (! modelManager.haveFile)
! return iterNull;
! if (selectionManager.isEmpty())
! return modelManager.getChemFileIterator();
return modelManager.getChemFrameIterator(selectionManager.bsSelection,
false);
***************
*** 893,901 ****
public void setStyleAtom(byte style) {
! if (!modelManager.haveFile)
! return;
! boolean empty = selectionManager.isEmpty();
! styleManager.setStyleAtom(style, empty,
! empty ? iterAll() : iterSelection());
refresh();
}
--- 884,889 ----
public void setStyleAtom(byte style) {
! styleManager.setStyleAtom(style);
! distributor.setStyleAtom(style, iterAtomMenu());
refresh();
}
***************
*** 906,914 ****
public void setPercentVdwAtom(int percentVdwAtom) {
! if (!modelManager.haveFile)
! return;
! boolean empty = selectionManager.isEmpty();
! styleManager.setPercentVdwAtom(percentVdwAtom, empty,
! empty ? iterAll() : iterSelection());
refresh();
}
--- 894,899 ----
public void setPercentVdwAtom(int percentVdwAtom) {
! styleManager.setPercentVdwAtom(percentVdwAtom);
! distributor.setMadAtom(-percentVdwAtom, iterAtomMenu());
refresh();
}
***************
*** 919,927 ****
public void setStyleBond(byte style) {
! if (!modelManager.haveFile)
! return;
! boolean empty = selectionManager.isEmpty();
! styleManager.setStyleBond(style, empty,
! empty ? iterAll() : iterBond());
refresh();
}
--- 904,909 ----
public void setStyleBond(byte style) {
! styleManager.setStyleBond(style);
! distributor.setStyleBond(style, iterBondMenu());
refresh();
}
***************
*** 932,940 ****
public void setPercentAngstromBond(int percentAngstromBond) {
! if (!modelManager.haveFile)
! return;
! boolean empty = selectionManager.isEmpty();
! styleManager.setPercentAngstromBond(percentAngstromBond, empty,
! empty ? iterAll() : iterBond());
refresh();
}
--- 914,919 ----
public void setPercentAngstromBond(int percentAngstromBond) {
! styleManager.setPercentAngstromBond(percentAngstromBond);
! distributor.setMadBond(percentAngstromBond * 10, iterBondMenu());
refresh();
}
***************
*** 1004,1008 ****
public void setWireframeRotation(boolean wireframeRotation) {
styleManager.setWireframeRotation(wireframeRotation);
! // no need to refresh
}
--- 983,987 ----
public void setWireframeRotation(boolean wireframeRotation) {
styleManager.setWireframeRotation(wireframeRotation);
! // no need to refresh since we are not currently rotating
}
***************
*** 1047,1055 ****
public void setStyleLabel(byte style) {
! if (!modelManager.haveFile)
! return;
! boolean empty = selectionManager.isEmpty();
! labelManager.setStyleLabel(style, empty,
! empty ? iterAll() : iterSelection());
refresh();
}
--- 1026,1031 ----
public void setStyleLabel(byte style) {
! labelManager.setStyleLabel(style);
! distributor.setStyleLabel(style, iterAtomMenu());
refresh();
}
***************
*** 1060,1064 ****
public String getLabelAtom(Atom atom) {
! return labelManager.getLabelAtom(atom);
}
--- 1036,1044 ----
public String getLabelAtom(Atom atom) {
! return labelManager.getLabelAtom(labelManager.styleLabel, atom);
! }
!
! public String getLabelAtom(byte styleLabel, Atom atom) {
! return labelManager.getLabelAtom(styleLabel, atom);
}
Index: JmolAtomIterator.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/JmolAtomIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** JmolAtomIterator.java 14 Jan 2003 23:58:57 -0000 1.2
--- JmolAtomIterator.java 15 Jan 2003 23:56:34 -0000 1.3
***************
*** 27,33 ****
import java.util.Iterator;
! public abstract class JmolAtomIterator implements Iterator {
! public abstract boolean hasNext();
public Object next() {
--- 27,35 ----
import java.util.Iterator;
! public class JmolAtomIterator implements Iterator {
! public boolean hasNext() {
! return false;
! }
public Object next() {
***************
*** 35,39 ****
}
! public abstract Atom nextAtom();
public boolean allBonds() {
--- 37,43 ----
}
! public Atom nextAtom() {
! return null;
! }
public boolean allBonds() {
Index: LabelManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/LabelManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** LabelManager.java 15 Jan 2003 15:32:50 -0000 1.2
--- LabelManager.java 15 Jan 2003 23:56:34 -0000 1.3
***************
*** 39,56 ****
public byte styleLabel = DisplayControl.NOLABELS;
! public void setStyleLabel(byte styleLabel, boolean setDefault,
! JmolAtomIterator iter) {
! if (setDefault)
! this.styleLabel = styleLabel;
! while (iter.hasNext()) {
! Atom atom = iter.nextAtom();
! atom.atomShape.setLabel(getLabel(styleLabel, atom));
! }
}
!
! public String getLabelAtom(Atom atom) {
! return getLabel(styleLabel, atom);
! }
!
public String strFontFace = "Helvetica";
public void setFontFace(String strFontFace) {
--- 39,46 ----
public byte styleLabel = DisplayControl.NOLABELS;
! public void setStyleLabel(byte styleLabel) {
! this.styleLabel = styleLabel;
}
!
public String strFontFace = "Helvetica";
public void setFontFace(String strFontFace) {
***************
*** 76,80 ****
}
! private String getLabel(byte styleLabel, Atom atom) {
String label = null;
switch (styleLabel) {
--- 66,70 ----
}
! public String getLabelAtom(byte styleLabel, Atom atom) {
String label = null;
switch (styleLabel) {
Index: PreferencesDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/PreferencesDialog.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** PreferencesDialog.java 15 Jan 2003 15:32:50 -0000 1.21
--- PreferencesDialog.java 15 Jan 2003 23:56:34 -0000 1.22
***************
*** 1,3 ****
-
/*
* Copyright 2002 The Jmol Development Team
--- 1,2 ----
***************
*** 256,266 ****
g2dPanel.setBorder(new TitledBorder(JmolResourceHandler.getInstance()
.getString("Prefs.graphics2DPanelLabel")));
! graphics2D = control.getWantsGraphics2D();
cbGraphics2D = guimap.newJCheckBox("Prefs.graphics2D", graphics2D);
cbGraphics2D.addItemListener(checkBoxListener);
! antialias = control.getWantsAntialias();
cbAntialias = guimap.newJCheckBox("Prefs.antialias", antialias);
cbAntialias.addItemListener(checkBoxListener);
! antialiasAlways = control.getWantsAntialiasAlways();
cbAntialiasAlways = guimap.newJCheckBox("Prefs.antialiasAlways",
antialiasAlways);
--- 255,265 ----
g2dPanel.setBorder(new TitledBorder(JmolResourceHandler.getInstance()
.getString("Prefs.graphics2DPanelLabel")));
! // graphics2D = control.getWantsGraphics2D();
cbGraphics2D = guimap.newJCheckBox("Prefs.graphics2D", graphics2D);
cbGraphics2D.addItemListener(checkBoxListener);
! // antialias = control.getWantsAntialias();
cbAntialias = guimap.newJCheckBox("Prefs.antialias", antialias);
cbAntialias.addItemListener(checkBoxListener);
! // antialiasAlways = control.getWantsAntialiasAlways();
cbAntialiasAlways = guimap.newJCheckBox("Prefs.antialiasAlways",
antialiasAlways);
***************
*** 945,949 ****
.getString("Prefs.textLabel")));
! isLabelAtomColor = control.getIsLabelAtomColor();
cbIsLabelAtomColor =
guimap.newJCheckBox("Prefs.isLabelAtomColor", isLabelAtomColor);
--- 944,948 ----
.getString("Prefs.textLabel")));
! isLabelAtomColor = control.getColorLabel() == null;
cbIsLabelAtomColor =
guimap.newJCheckBox("Prefs.isLabelAtomColor", isLabelAtomColor);
***************
*** 966,970 ****
colorText = color;
tButton.setBackground(colorText);
! control.setColorText(colorText);
props.put("colorText", Integer.toString(colorText.getRGB()));
}
--- 965,969 ----
colorText = color;
tButton.setBackground(colorText);
! control.setColorLabel(colorText);
props.put("colorText", Integer.toString(colorText.getRGB()));
}
***************
*** 981,985 ****
.getString("Prefs.bondLabel")));
! isBondAtomColor = control.getIsBondAtomColor();
cbIsBondAtomColor =
guimap.newJCheckBox("Prefs.isBondAtomColor", isBondAtomColor);
--- 980,984 ----
.getString("Prefs.bondLabel")));
! isBondAtomColor = control.getColorBond() == null;
cbIsBondAtomColor =
guimap.newJCheckBox("Prefs.isBondAtomColor", isBondAtomColor);
***************
*** 1319,1326 ****
control.setColorOutline(colorOutline);
control.setColorSelection(colorSelection);
! control.setIsLabelAtomColor(isLabelAtomColor);
! control.setColorText(colorText);
! control.setIsBondAtomColor(isBondAtomColor);
! control.setColorBond(colorBond);
control.setPercentVdwAtom(percentVdwAtom);
control.setStyleAtom(styleAtom);
--- 1318,1323 ----
control.setColorOutline(colorOutline);
control.setColorSelection(colorSelection);
! control.setColorLabel(isLabelAtomColor ? null : colorText);
! control.setColorBond(isBondAtomColor ? null : colorBond);
control.setPercentVdwAtom(percentVdwAtom);
control.setStyleAtom(styleAtom);
***************
*** 1347,1352 ****
control.setPerspectiveDepth(perspectiveDepth);
control.setShowDarkerOutline(showDarkerOutline);
- control.setIsLabelAtomColor(isLabelAtomColor);
- control.setIsBondAtomColor(isBondAtomColor);
Vibrate.setAmplitudeScale(VibrateAmplitudeScale);
Vibrate.setVectorScale(VibrateVectorScale);
--- 1344,1347 ----
***************
*** 1415,1424 ****
} else if (key.equals("Prefs.isLabelAtomColor")) {
isLabelAtomColor = isSelected;
! control.setIsLabelAtomColor(isLabelAtomColor);
props.put("isLabelAtomColor", strSelected);
tButton.setEnabled(!isLabelAtomColor);
} else if (key.equals("Prefs.isBondAtomColor")) {
isBondAtomColor = isSelected;
! control.setIsBondAtomColor(isBondAtomColor);
props.put("isBondAtomColor", strSelected);
eButton.setEnabled(!isBondAtomColor);
--- 1410,1419 ----
} else if (key.equals("Prefs.isLabelAtomColor")) {
isLabelAtomColor = isSelected;
! control.setColorLabel(isLabelAtomColor ? null : colorText);
props.put("isLabelAtomColor", strSelected);
tButton.setEnabled(!isLabelAtomColor);
} else if (key.equals("Prefs.isBondAtomColor")) {
isBondAtomColor = isSelected;
! control.setColorBond(isBondAtomColor ? null : colorBond);
props.put("isBondAtomColor", strSelected);
eButton.setEnabled(!isBondAtomColor);
Index: StyleManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/StyleManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** StyleManager.java 15 Jan 2003 15:32:50 -0000 1.11
--- StyleManager.java 15 Jan 2003 23:56:34 -0000 1.12
***************
*** 39,100 ****
}
- public void initializeAtomShapes() {
- JmolAtomIterator iter = control.getChemFileIterator();
- while (iter.hasNext()) {
- Atom atom = iter.nextAtom();
- atom.setAtomShape(new AtomShape(atom,
- styleAtom, -percentVdwAtom,
- control.getColorAtom(atom),
- styleBond, percentAngstromBond * 10,
- control.getIsBondAtomColor()
- ? null : control.getColorBond(),
- control.getLabelAtom(atom)));
- }
- }
-
public byte styleAtom = DisplayControl.QUICKDRAW;
! public void setStyleAtom(byte styleAtom, boolean setDefault,
! JmolAtomIterator iter) {
! if (setDefault)
! this.styleAtom = styleAtom;
! while (iter.hasNext())
! iter.nextAtom().atomShape.setStyleAtom(styleAtom);
}
public int percentVdwAtom = 20;
! public void setPercentVdwAtom(int percentVdwAtom, boolean setDefault,
! JmolAtomIterator iter) {
! if (setDefault)
! this.percentVdwAtom = percentVdwAtom;
! while (iter.hasNext())
! iter.nextAtom().atomShape.setMadAtom(-percentVdwAtom);
}
public byte styleBond = DisplayControl.QUICKDRAW;
! public void setStyleBond(byte styleBond, boolean setDefault,
! JmolAtomIterator iter) {
! if (setDefault)
! this.styleBond = styleBond;
! while (iter.hasNext()) {
! if (iter.allBonds())
! iter.nextAtom().atomShape.setStyleAllBonds(styleBond);
! else
! iter.nextAtom().atomShape.setStyleBond(styleBond, iter.indexBond());
! }
}
public int percentAngstromBond = 10;
! public void setPercentAngstromBond(int percentAngstromBond,
! boolean setDefault,
! JmolAtomIterator iter) {
! if (setDefault)
! this.percentAngstromBond = percentAngstromBond;
! int mad = percentAngstromBond * 10;
! while (iter.hasNext()) {
! if (iter.allBonds())
! iter.nextAtom().atomShape.setMadAllBonds(mad);
! else
! iter.nextAtom().atomShape.setMadBond(mad, iter.indexBond());
! }
}
--- 39,60 ----
}
public byte styleAtom = DisplayControl.QUICKDRAW;
! public void setStyleAtom(byte styleAtom) {
! this.styleAtom = styleAtom;
}
public int percentVdwAtom = 20;
! public void setPercentVdwAtom(int percentVdwAtom) {
! this.percentVdwAtom = percentVdwAtom;
}
public byte styleBond = DisplayControl.QUICKDRAW;
! public void setStyleBond(byte styleBond) {
! this.styleBond = styleBond;
}
public int percentAngstromBond = 10;
! public void setPercentAngstromBond(int percentAngstromBond) {
! this.percentAngstromBond = percentAngstromBond;
}
|