From: Stefan K. <sh...@us...> - 2005-06-29 09:28:52
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/applet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13386/src/org/openscience/cdk/applications/jchempaint/applet Modified Files: JChemPaintAbstractApplet.java Log Message: this makes numbering in applet like in mol file, when a mol file is loaded Index: JChemPaintAbstractApplet.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/applet/JChemPaintAbstractApplet.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- JChemPaintAbstractApplet.java 24 Jun 2005 07:20:00 -0000 1.11 +++ JChemPaintAbstractApplet.java 29 Jun 2005 09:28:33 -0000 1.12 @@ -114,6 +114,7 @@ } public void initPanelAndModel(JChemPaintPanel jcpp) { +System.err.println(theModel.getChemModel().getSetOfMolecules().getMolecules()[0].getAtomAt(3)+" after load"); getContentPane().removeAll(); getContentPane().setLayout(new BorderLayout()); theModel.setTitle("JCP Applet" /* getNewFrameName() */); @@ -132,6 +133,7 @@ // needed for applet as well jcpp.setEmbedded(); getContentPane().add(jcpp, BorderLayout.CENTER); +System.err.println(theModel.getChemModel().getSetOfMolecules().getMolecules()[0].getAtomAt(3)+" after load"); } // Code for both loadModel methods taken from JCPCDK applet @@ -163,6 +165,14 @@ InputStreamReader isReader = new InputStreamReader(fileURL.openStream()); ChemObjectReader reader = new ReaderFactory().createReader(isReader); ChemModel chemModel = (ChemModel) reader.read(new ChemModel()); + int count=0; + for(int i=0;i<chemModel.getSetOfMolecules().getMolecules().length;i++){ + for(int k=0;k<chemModel.getSetOfMolecules().getMolecules()[i].getAtomCount();k++){ + chemModel.getSetOfMolecules().getMolecules()[i].getAtomAt(k).setProperty("OriginalNumber", new Integer(count)); + count++; + } + } + System.err.println(chemModel.getSetOfMolecules().getMolecules()[0].getAtomAt(3)+" after load"); theModel = new JChemPaintModel(chemModel); } catch (Exception exception) { System.out.println("Cannot parse model: " + exception.toString()); |