Revision: 21134
http://sourceforge.net/p/jmol/code/21134
Author: hansonr
Date: 2016-05-25 02:54:03 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.6.0_2016.05.24"
bug fix: localization broken due to too-old GNU msgfmt version.
bug fix: splash image not appearing in Jmol application Help...about Jmol
bug fix: Jmol application Help may not appear at all
bug fix: switching out of hermite "fancy" cartoons doesn't actually do that.
code: removing unnecessary J/api/JmolBioMeshRenderer.js
-- when I started working with Java2Script, I thought that
all references to a class had to be removed and an interface used instead
if modularization was to work in JavaScript. But it turns out only "new
Xxx()"
will trigger that request. This might be something I changed in
j2sjmol.js early
on; I cannot remember.
Modified Paths:
--------------
branches/v14_6/Jmol/src/org/jmol/renderbio/BioMeshRenderer.java
branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
Modified: branches/v14_6/Jmol/src/org/jmol/renderbio/BioMeshRenderer.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/renderbio/BioMeshRenderer.java
2016-05-25 02:48:43 UTC (rev 21133)
+++ branches/v14_6/Jmol/src/org/jmol/renderbio/BioMeshRenderer.java
2016-05-25 02:54:03 UTC (rev 21134)
@@ -30,7 +30,6 @@
import javajs.util.T3;
import javajs.util.V3;
-import org.jmol.api.JmolBioMeshRenderer;
import org.jmol.java.BS;
import org.jmol.render.MeshRenderer;
import org.jmol.render.ShapeRenderer;
@@ -41,7 +40,7 @@
import org.jmol.util.Logger;
import org.jmol.util.Normix;
-public class BioMeshRenderer extends MeshRenderer implements
JmolBioMeshRenderer {
+public class BioMeshRenderer extends MeshRenderer {
private Mesh[] meshes;
private boolean[] meshReady;
@@ -55,7 +54,6 @@
return false;
}
- @Override
public void initialize(ShapeRenderer bsr, BioShape bioShape, int
monomerCount) {
this.bsr = (BioShapeRenderer) bsr;
bsRenderMesh = BS.newN(monomerCount);
@@ -78,7 +76,6 @@
// know what all the options are, and they aren't important,
// until it gets rendered, if ever.
- @Override
public void setFancyRibbon(int i) {
try {
if ((meshes[i] == null || !meshReady[i])
@@ -95,7 +92,6 @@
}
}
- @Override
public void setFancyConic(int i, int tension) {
try {
if ((meshes[i] == null || !meshReady[i])
@@ -112,7 +108,6 @@
}
}
- @Override
public void setFancyArrowHead(int i) {
try {
doCap0 = true;
@@ -379,7 +374,6 @@
}
}
- @Override
public void renderMeshes() {
if (bsRenderMesh.isEmpty())
return;
@@ -389,12 +383,10 @@
renderBioMesh(meshes[i]);
}
- @Override
public void initBS() {
bsRenderMesh.clearAll();
}
- @Override
public boolean check(boolean doCap0, boolean doCap1) {
this.doCap0 = doCap0;
this.doCap1 = doCap1;
@@ -405,7 +397,7 @@
}
private boolean checkDiameter(int d) {
- return (bsr.isHighRes & d > ABSOLUTE_MIN_MESH_SIZE || d >=
MIN_MESH_RENDER_SIZE);
+ return (bsr.isHighRes && d > ABSOLUTE_MIN_MESH_SIZE || d >=
MIN_MESH_RENDER_SIZE);
}
/*
Modified: branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
2016-05-25 02:48:43 UTC (rev 21133)
+++ branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
2016-05-25 02:54:03 UTC (rev 21134)
@@ -1,7 +1,7 @@
/* $RCSfile$
* $Author: hansonr $
- * $Date: 2016-02-27 20:43:05 -0500 (Sat, 27 Feb 2016) $
- * $Revision: 20968 $
+ * $Date: 2016-05-24 21:30:49 -0500 (Tue, 24 May 2016) $
+ * $Revision: 21129 $
*
* Copyright (C) 2003-2005 The Jmol Development Team
*
@@ -24,7 +24,6 @@
package org.jmol.renderbio;
-import org.jmol.api.JmolBioMeshRenderer;
import org.jmol.c.STR;
import org.jmol.java.BS;
import org.jmol.modelset.Atom;
@@ -84,7 +83,7 @@
protected boolean wireframeOnly;
private boolean needTranslucent;
- JmolBioMeshRenderer meshRenderer;
+ BioMeshRenderer meshRenderer;
BioShape bioShape;
protected abstract void renderBioShape(BioShape bioShape);
@@ -139,7 +138,7 @@
invalidateMesh = true;
aspectRatio = val;
if (aspectRatio > 0 && meshRenderer == null) {
- meshRenderer = (JmolBioMeshRenderer)
Interface.getInterface("org.jmol.renderbio.BioMeshRenderer");
+ meshRenderer = (BioMeshRenderer)
Interface.getInterface("org.jmol.renderbio.BioMeshRenderer");
meshRenderer.setup(g3d, vwr.ms, shape);
meshRenderer.setViewerG3dShapeID(vwr, shape.shapeID);
}
@@ -363,7 +362,7 @@
&& structureTypes[i] != structureTypes[iPrev]);
boolean doCap1 = (iNext == iNext2 || thisTypeOnly
&& structureTypes[i] != structureTypes[iNext]);
- return (meshRenderer != null && meshRenderer.check(doCap0, doCap1));
+ return (aspectRatio > 0 && meshRenderer != null &&
meshRenderer.check(doCap0, doCap1));
}
protected void renderHermiteCylinder(P3[] screens, int i) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
