[Jmol-commits] CVS: Jmol/src/org/jmol/viewer/datamodel Frame.java,1.1,1.2 FrameBuilder.java,1.1,1.2 Mmset.java,1.1,1.2

[Miguel <mig...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/jmol/viewer/datamodel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32034/src/org/jmol/viewer/datamodel

Modified Files:
	Frame.java FrameBuilder.java Mmset.java 
Log Message:
more work on using AtomSetName ... on the viewer side


Index: Frame.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/datamodel/Frame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Frame.java	22 Oct 2004 16:18:24 -0000	1.1
+++ Frame.java	22 Oct 2004 17:10:19 -0000	1.2
@@ -181,6 +181,10 @@
     return mmset.getModelCount();
   }
 
+  public String getModelTag(int modelIndex) {
+    return mmset.getModelTag(modelIndex);
+  }
+
   public int getModelIndex(String modelTag) {
     return mmset.getModelIndex(modelTag);
   }

Index: FrameBuilder.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/datamodel/FrameBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FrameBuilder.java	22 Oct 2004 16:18:24 -0000	1.1
+++ FrameBuilder.java	22 Oct 2004 17:10:19 -0000	1.2
@@ -125,9 +125,33 @@
     //    System.out.println("Build a frame:" + msToBuild + " ms");
     adapter.finish(clientFile);
     finalizeBuild();
+    dumpAtomSetNameDiagnostics(clientFile, frame);
     return frame;
   }
 
+  void dumpAtomSetNameDiagnostics(Object clientFile, Frame frame) {
+    int frameModelCount = frame.getModelCount();
+    int adapterAtomSetCount = adapter.getAtomSetCount(clientFile);
+    System.out.println("----------------\n" +
+                       "debugging of AtomSetName stuff\n" +
+                       "\nframeModelCount=" + frameModelCount +
+                       "\nadapterAtomSetCount=" + adapterAtomSetCount +
+                       "\n -- \n"
+                       );
+    for (int i = 0; i < adapterAtomSetCount; ++i) {
+      System.out.println("atomSetName[" + i + "]=" +
+                         adapter.getAtomSetName(clientFile, i) +
+                         " atomSetNumber[" + i + "]=" +
+                         adapter.getAtomSetNumber(clientFile, i));
+                         
+    }
+    for (int i = 0; i < frameModelCount; ++i) {
+      System.out.println("frame.getModelTag(" + i + ") => " +
+                         frame.getModelTag(i));
+    }
+  }
+
+
   private final static int ATOM_GROWTH_INCREMENT = 2000;
 
   String currentModelTag;

Index: Mmset.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/datamodel/Mmset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Mmset.java	22 Oct 2004 16:18:24 -0000	1.1
+++ Mmset.java	22 Oct 2004 17:10:19 -0000	1.2
@@ -99,6 +99,10 @@
     return model;
   }
 
+  String getModelTag(int modelIndex) {
+    return modelTags[modelIndex];
+  }
+
   int getModelIndex(String modelTag) {
     int i;
     for (i = modelCount; --i >= 0 && !modelTags[i].equals(modelTag); )