From: Michael T H. <mic...@us...> - 2003-02-04 09:47:20
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol In directory sc8-pr-cvs1:/tmp/cvs-serv22881 Modified Files: DisplayControl.java DisplayPanel.java Log Message: changed selection display behavior Index: DisplayControl.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -r1.83 -r1.84 *** DisplayControl.java 3 Feb 2003 21:44:48 -0000 1.83 --- DisplayControl.java 4 Feb 2003 09:47:16 -0000 1.84 *************** *** 134,138 **** // figure out the interaction with the current holdRepaint setting setCenter(null); ! clearSelection(); transformManager.homePosition(); refresh(); --- 134,138 ---- // figure out the interaction with the current holdRepaint setting setCenter(null); ! selectAll(); transformManager.homePosition(); refresh(); *************** *** 417,421 **** public void setModeAtomColorProfile(byte mode) { colorManager.setModeAtomColorProfile(mode); ! distributor.setColorAtom(mode, null, iterAtomMenu()); refresh(); } --- 417,421 ---- public void setModeAtomColorProfile(byte mode) { colorManager.setModeAtomColorProfile(mode); ! distributor.setColorAtom(mode, null, iterAtom()); refresh(); } *************** *** 551,555 **** public void setColorBond(Color colorBond) { colorManager.setColorBond(colorBond); ! distributor.setColorBond(colorBond, iterBondMenu()); refresh(); } --- 551,555 ---- public void setColorBond(Color colorBond) { colorManager.setColorBond(colorBond); ! distributor.setColorBond(colorBond, iterBond()); refresh(); } *************** *** 599,604 **** public boolean hasSelectionHalo(Atom atom) { ! return selectionHaloEnabled && !repaintManager.fastRendering && ! isSelected(atom.getAtomNumber()); } --- 599,606 ---- public boolean hasSelectionHalo(Atom atom) { ! return ! selectionHaloEnabled && ! !repaintManager.fastRendering && ! selectionManager.isSelected(atom.getAtomNumber()); } *************** *** 617,621 **** } ! public boolean selectionHaloEnabled = true; public void setSelectionHaloEnabled(boolean selectionHaloEnabled) { this.selectionHaloEnabled = selectionHaloEnabled; --- 619,623 ---- } ! public boolean selectionHaloEnabled = false; public void setSelectionHaloEnabled(boolean selectionHaloEnabled) { this.selectionHaloEnabled = selectionHaloEnabled; *************** *** 784,788 **** public void setFrame(int fr) { modelManager.setFrame(fr); ! clearSelection(); recalcAxes(); structuralChange = true; --- 786,790 ---- public void setFrame(int fr) { modelManager.setFrame(fr); ! selectAll(); recalcAxes(); structuralChange = true; *************** *** 792,796 **** public void setFrame(ChemFrame frame) { modelManager.setFrame(frame); ! clearSelection(); recalcAxes(); structuralChange = true; --- 794,798 ---- public void setFrame(ChemFrame frame) { modelManager.setFrame(frame); ! selectAll(); recalcAxes(); structuralChange = true; *************** *** 824,828 **** public void setCenterAsSelected() { modelManager.setCenterAsSelected(); ! clearSelection(); scaleFitToScreen(); refresh(); --- 826,830 ---- public void setCenterAsSelected() { modelManager.setCenterAsSelected(); ! selectAll(); scaleFitToScreen(); refresh(); *************** *** 877,883 **** // the selection set *and* the script sets // selectionManager.delete(atomIndex); ! selectionManager.clearSelection(); modelManager.deleteAtom(atomIndex); // status.setStatus(2, "Atom deleted"); structuralChange = true; refresh(); --- 879,886 ---- // the selection set *and* the script sets // selectionManager.delete(atomIndex); ! clearSelection(); modelManager.deleteAtom(atomIndex); // status.setStatus(2, "Atom deleted"); + selectAll(); structuralChange = true; refresh(); *************** *** 985,989 **** * routines for java12 ****************************************************************/ ! private void maybeEnableAntialiasing(Graphics g) { if (repaintManager.useGraphics2D) --- 988,992 ---- * routines for java12 ****************************************************************/ ! private void maybeEnableAntialiasing(Graphics g) { if (repaintManager.useGraphics2D) *************** *** 1031,1073 **** } - private JmolAtomIterator iterAtomScript() { - if (! modelManager.haveFile || selectionManager.isEmpty()) - return iterNull; - return modelManager.getChemFrameIterator(selectionManager.bsSelection); - } - - private JmolAtomIterator iterBondScript() { - if (!modelManager.haveFile || selectionManager.isEmpty()) - return iterNull; - return modelManager.getChemFrameIterator(selectionManager.bsSelection, - bondSelectionModeOr); - } - public void setStyleMarAtomScript(byte style, short mar) { ! distributor.setStyleMarAtom(style, mar, iterAtomScript()); } public void setStyleAtomScript(byte style) { ! distributor.setStyleAtom(style, iterAtomScript()); } public void setStyleMarBondScript(byte style, short mar) { ! distributor.setStyleMarBond(style, mar, iterBondScript()); } public void setStyleBondScript(byte style) { ! distributor.setStyleBond(style, iterBondScript()); } public void setColorAtomScript(byte mode, Color color) { ! distributor.setColorAtom(mode, color, iterAtomScript()); } public void setColorBondScript(Color color) { ! distributor.setColorBond(color, iterBondScript()); } public void setLabelScript(String strLabel) { ! distributor.setLabel(strLabel, iterAtomScript()); } --- 1034,1063 ---- } public void setStyleMarAtomScript(byte style, short mar) { ! distributor.setStyleMarAtom(style, mar, iterAtom()); } public void setStyleAtomScript(byte style) { ! distributor.setStyleAtom(style, iterAtom()); } public void setStyleMarBondScript(byte style, short mar) { ! distributor.setStyleMarBond(style, mar, iterBond()); } public void setStyleBondScript(byte style) { ! distributor.setStyleBond(style, iterBond()); } public void setColorAtomScript(byte mode, Color color) { ! distributor.setColorAtom(mode, color, iterAtom()); } public void setColorBondScript(Color color) { ! distributor.setColorBond(color, iterBond()); } public void setLabelScript(String strLabel) { ! distributor.setLabel(strLabel, iterAtom()); } *************** *** 1107,1131 **** 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); } public void setStyleAtom(byte style) { styleManager.setStyleAtom(style); ! distributor.setStyleAtom(style, iterAtomMenu()); refresh(); } --- 1097,1117 ---- JmolAtomIterator iterNull = new JmolAtomIterator(); ! private JmolAtomIterator iterAtom() { ! if (! modelManager.haveFile || selectionManager.isEmpty()) return iterNull; return modelManager.getChemFrameIterator(selectionManager.bsSelection); } ! private JmolAtomIterator iterBond() { ! if (!modelManager.haveFile || selectionManager.isEmpty()) return iterNull; return modelManager.getChemFrameIterator(selectionManager.bsSelection, ! bondSelectionModeOr); } + public void setStyleAtom(byte style) { styleManager.setStyleAtom(style); ! distributor.setStyleAtom(style, iterAtom()); refresh(); } *************** *** 1137,1141 **** public void setPercentVdwAtom(int percentVdwAtom) { styleManager.setPercentVdwAtom(percentVdwAtom); ! distributor.setMarAtom((short)-percentVdwAtom, iterAtomMenu()); refresh(); } --- 1123,1127 ---- public void setPercentVdwAtom(int percentVdwAtom) { styleManager.setPercentVdwAtom(percentVdwAtom); ! distributor.setMarAtom((short)-percentVdwAtom, iterAtom()); refresh(); } *************** *** 1151,1155 **** public void setStyleBond(byte style) { styleManager.setStyleBond(style); ! distributor.setStyleBond(style, iterBondMenu()); refresh(); } --- 1137,1141 ---- public void setStyleBond(byte style) { styleManager.setStyleBond(style); ! distributor.setStyleBond(style, iterBond()); refresh(); } *************** *** 1161,1165 **** public void setMarBond(short marBond) { styleManager.setMarBond(marBond); ! distributor.setMarBond(marBond, iterBondMenu()); refresh(); } --- 1147,1151 ---- public void setMarBond(short marBond) { styleManager.setMarBond(marBond); ! distributor.setMarBond(marBond, iterBond()); refresh(); } *************** *** 1312,1316 **** public void setStyleLabel(byte style) { labelManager.setStyleLabel(style); ! distributor.setStyleLabel(style, iterAtomMenu()); refresh(); } --- 1298,1302 ---- public void setStyleLabel(byte style) { labelManager.setStyleLabel(style); ! distributor.setStyleLabel(style, iterAtom()); refresh(); } Index: DisplayPanel.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayPanel.java,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -r1.87 -r1.88 *** DisplayPanel.java 29 Jan 2003 18:48:53 -0000 1.87 --- DisplayPanel.java 4 Feb 2003 09:47:16 -0000 1.88 *************** *** 100,103 **** --- 100,104 ---- Jmol.setRotateButton(); control.setModeMouse(DisplayControl.ROTATE); + control.setSelectionHaloEnabled(false); } *************** *** 481,484 **** --- 482,486 ---- } else { control.setModeMouse(DisplayControl.PICK); + control.setSelectionHaloEnabled(true); } status.setStatus(1, "Select Atoms"); *************** *** 495,498 **** --- 497,501 ---- public void actionPerformed(ActionEvent e) { control.setModeMouse(DisplayControl.DELETE); + control.setSelectionHaloEnabled(false); status.setStatus(1, "Delete Atoms"); } *************** *** 508,511 **** --- 511,515 ---- public void actionPerformed(ActionEvent e) { control.setModeMouse(DisplayControl.ROTATE); + control.setSelectionHaloEnabled(false); status.setStatus(1, ((JComponent) e.getSource()).getToolTipText()); } *************** *** 521,524 **** --- 525,529 ---- public void actionPerformed(ActionEvent e) { control.setModeMouse(DisplayControl.ZOOM); + control.setSelectionHaloEnabled(false); status.setStatus(1, ((JComponent) e.getSource()).getToolTipText()); } *************** *** 534,537 **** --- 539,543 ---- public void actionPerformed(ActionEvent e) { control.setModeMouse(DisplayControl.XLATE); + control.setSelectionHaloEnabled(false); status.setStatus(1, ((JComponent) e.getSource()).getToolTipText()); } *************** *** 608,611 **** --- 614,618 ---- control.setCenterAsSelected(); setRotateMode(); + control.setSelectionHaloEnabled(false); } } |