[Jmol-commits] CVS: Jmol/src/org/jmol/viewer Frame.java,1.9,1.10 ModelManager.java,1.17,1.18 Mmset.java,1.6,1.7 Viewer.java,1.14,1.15

[Nicolas <ni...@us...>]

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

Modified Files:
	Frame.java ModelManager.java Mmset.java Viewer.java 
Log Message:
Work on Povray output

Index: Frame.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Frame.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Frame.java	14 Dec 2004 03:07:21 -0000	1.9
+++ Frame.java	31 Dec 2004 00:32:27 -0000	1.10
@@ -656,6 +656,14 @@
     return mmset.getPolymerCount();
   }
 
+  int getPolymerCountInModel(int modelIndex) {
+    return mmset.getPolymerCountInModel(modelIndex);
+  }
+  
+  Polymer getPolymerAt(int modelIndex, int polymerIndex) {
+    return mmset.getPolymerAt(modelIndex, polymerIndex);
+  }
+  
   int getGroupCount() {
     return mmset.getGroupCount();
   }

Index: ModelManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/ModelManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ModelManager.java	14 Dec 2004 03:07:22 -0000	1.17
+++ ModelManager.java	31 Dec 2004 00:32:28 -0000	1.18
@@ -188,6 +188,10 @@
     return (frame == null) ? 0 : frame.getPolymerCount();
   }
 
+  int getPolymerCountInModel(int modelIndex) {
+    return (frame == null) ? 0 : frame.getPolymerCountInModel(modelIndex);
+  }
+  
   int getAtomCount() {
     return (frame == null) ? 0 : frame.getAtomCount();
   }
@@ -425,6 +429,10 @@
     return frame.getAtomAt(i).getSeqcodeString();
   }
 
+  int getAtomModelIndex(int i) {
+  	return frame.getAtomAt(i).getModelIndex();
+  }
+  
   Point3f getBondPoint3f1(int i) {
     return frame.getBondAt(i).getAtom1().getPoint3f();
   }
@@ -448,4 +456,21 @@
   short getBondColix2(int i) {
     return frame.getBondAt(i).getColix2();
   }
+  
+  int getBondModelIndex(int i) {
+  	Atom atom = frame.getBondAt(i).getAtom1();
+  	if (atom != null) {
+  	  return atom.getModelIndex();
+  	}
+  	atom = frame.getBondAt(i).getAtom2();
+  	if (atom != null) {
+  	  return atom.getModelIndex();
+  	}
+  	return 0;
+  }
+
+  public Point3f[] getPolymerLeadMidPoints(int modelIndex, int polymerIndex) {
+    Polymer polymer = frame.getPolymerAt(modelIndex, polymerIndex);
+    return polymer.getLeadMidpoints();
+  }
 }

Index: Mmset.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Mmset.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Mmset.java	14 Dec 2004 03:07:22 -0000	1.6
+++ Mmset.java	31 Dec 2004 00:32:29 -0000	1.7
@@ -181,6 +181,14 @@
     return polymerCount;
   }
 
+  int getPolymerCountInModel(int modelIndex) {
+    return models[modelIndex].getPolymerCount();
+  }
+  
+  Polymer getPolymerAt(int modelIndex, int polymerIndex) {
+    return models[modelIndex].getPolymer(polymerIndex);
+  }
+  
   int getGroupCount() {
     int groupCount = 0;
     for (int i = modelCount; --i >= 0; )

Index: Viewer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Viewer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Viewer.java	15 Dec 2004 17:03:21 -0000	1.14
+++ Viewer.java	31 Dec 2004 00:32:29 -0000	1.15
@@ -1198,6 +1198,10 @@
     return modelManager.getPolymerCount();
   }
 
+  public int getPolymerCountInModel(int modelIndex) {
+    return modelManager.getPolymerCountInModel(modelIndex);
+  }
+  
   public int getAtomCount() {
     return modelManager.getAtomCount();
   }
@@ -1419,7 +1423,7 @@
     return repaintManager.setDisplayModelIndex(modelIndex);
   }
 
-  int getDisplayModelIndex() {
+  public int getDisplayModelIndex() {
     return repaintManager.displayModelIndex;
   }
 
@@ -2303,10 +2307,14 @@
     return modelManager.getAtomChain(i);
   }
 
+  public int getAtomModelIndex(int i) {
+  	return modelManager.getAtomModelIndex(i);
+  }
+
   String getAtomSequenceCode(int i) {
     return modelManager.getAtomSequenceCode(i);
   }
-
+  
   public Point3f getBondPoint3f1(int i) {
     return modelManager.getBondPoint3f1(i);
   }
@@ -2327,10 +2335,18 @@
     return g3d.getColor(modelManager.getBondColix1(i));
   }
 
+  public int getBondModelIndex(int i) {
+  	return modelManager.getBondModelIndex(i);
+  }
+  
   public Color getBondColor2(int i) {
     return g3d.getColor(modelManager.getBondColix2(i));
   }
 
+  public Point3f[] getPolymerLeadMidPoints(int modelIndex, int polymerIndex) {
+    return modelManager.getPolymerLeadMidPoints(modelIndex, polymerIndex);
+  }
+  
   ////////////////////////////////////////////////////////////////
   //
   ////////////////////////////////////////////////////////////////