Revision: 21028
http://sourceforge.net/p/jmol/code/21028
Author: hansonr
Date: 2016-03-26 15:14:08 +0000 (Sat, 26 Mar 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.5.4_2016.03.25"
bug fix: axisType ab should also be allowed when offset or center is set
bug fix: labels should not change size when creating images of
different size than screen when angstromsPerInch != 0.
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/render/AxesRenderer.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v14_4/Jmol/src/org/jmol/viewer/Viewer.java
trunk/Jmol/src/org/jmol/render/AxesRenderer.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: branches/v14_4/Jmol/src/org/jmol/render/AxesRenderer.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/render/AxesRenderer.java 2016-03-25
05:26:33 UTC (rev 21027)
+++ branches/v14_4/Jmol/src/org/jmol/render/AxesRenderer.java 2016-03-26
15:14:08 UTC (rev 21028)
@@ -100,6 +100,7 @@
int diameter = mad10;
boolean drawTicks = false;
P3 ptTemp = originScreen;
+ boolean checkAxisType = (axes.axisType != null && (isXY ||
vwr.getFloat(T.axesoffset) != 0 || axes.fixedOrigin != null));
if (isXY) {
if (exportType == GData.EXPORT_CARTESIAN)
return false;
@@ -163,8 +164,7 @@
colixes[2] = vwr.getObjectColix(StateManager.OBJ_AXIS3);
boolean showOrigin = (!isXY && nPoints == 3 && axes.scale == 2);
for (int i = nPoints; --i >= 0;) {
- if (isXY
- && axes.axisType != null
+ if (checkAxisType
&& !axes.axisType.contains(axesTypes[i])
|| Math.abs(xCenter - p3Screens[i].x)
+ Math.abs(yCenter - p3Screens[i].y) <= 2
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-03-25
05:26:33 UTC (rev 21027)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-03-26
15:14:08 UTC (rev 21028)
@@ -7,7 +7,13 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.4_2016.03.25"
+Jmol.___JmolVersion="14.5.4_2016.03.25"
+
+bug fix: axisType ab should also be allowed when offset or center is set
+bug fix: labels should not change size when creating images of
+ different size than screen when angstromsPerInch != 0.
+
+JmolVersion="14.4.4_2016.03.25"
released
fixes Jmol.getPropertyAsArray(), which fails to escape strings
(14.4.4_2016.03.24d)
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Viewer.java 2016-03-25 05:26:33 UTC
(rev 21027)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Viewer.java 2016-03-26 15:14:08 UTC
(rev 21028)
@@ -3429,8 +3429,14 @@
: isImageWrite && !isExport ? g.antialiasImages : false);
if (!isExport && !isImageWrite && (width > 0 || wasAntialiased !=
antialiased))
setShapeProperty(JC.SHAPE_LABELS, "clearBoxes", null);
- imageFontScaling = (antialiased ? 2f : 1f) * (isReset || width <= 0 ? 1
- : (g.zoomLarge == (height > width) ? height : width) / getScreenDim());
+ imageFontScaling = (antialiased ? 2f : 1f) * (isReset || tm.scale3D ||
width <= 0 ? 1
+ : (g.zoomLarge == (height > width) ? height : width) * 1f /
getScreenDim());
+ System.out.println(dimScreen.width + " " + dimScreen.height
+ + " " + (antialiased ? 2f : 1f)
+ + " " + width + " " + height + " " + (isReset || width <= 0 ? 1
+ : (g.zoomLarge == (height > width) ? height : width) * 1.0f /
getScreenDim()));
+ if (imageFontScaling == 0)
+ System.out.println("??? viewer");
if (width > 0) {
dimScreen.width = width;
dimScreen.height = height;
Modified: trunk/Jmol/src/org/jmol/render/AxesRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/AxesRenderer.java 2016-03-25 05:26:33 UTC
(rev 21027)
+++ trunk/Jmol/src/org/jmol/render/AxesRenderer.java 2016-03-26 15:14:08 UTC
(rev 21028)
@@ -100,6 +100,7 @@
int diameter = mad10;
boolean drawTicks = false;
P3 ptTemp = originScreen;
+ boolean checkAxisType = (axes.axisType != null && (isXY ||
vwr.getFloat(T.axesoffset) != 0 || axes.fixedOrigin != null));
if (isXY) {
if (exportType == GData.EXPORT_CARTESIAN)
return false;
@@ -163,8 +164,7 @@
colixes[2] = vwr.getObjectColix(StateManager.OBJ_AXIS3);
boolean showOrigin = (!isXY && nPoints == 3 && axes.scale == 2);
for (int i = nPoints; --i >= 0;) {
- if (isXY
- && axes.axisType != null
+ if (checkAxisType
&& !axes.axisType.contains(axesTypes[i])
|| Math.abs(xCenter - p3Screens[i].x)
+ Math.abs(yCenter - p3Screens[i].y) <= 2
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-03-25 05:26:33 UTC
(rev 21027)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-03-26 15:14:08 UTC
(rev 21028)
@@ -71,8 +71,14 @@
TODO: vector traces saved in state?
-Jmol.___JmolVersion="14.5.4_2016.03.24d"
+Jmol.___JmolVersion="14.5.4_2016.03.25"
+bug fix: axisType ab should also be allowed when offset or center is set
+bug fix: labels should not change size when creating images of
+ different size than screen when angstromsPerInch != 0.
+
+JmolVersion="14.5.4_2016.03.25"
+
new feature: moveto AXIS <a|b|c|-a|-b|-c> coupled with <1|2|3|4>
-- indicates direction of axis ("-a" indicates "a pointing away")
-- and clockwise position 1(top left), 2(top right), 3(bottom right), and
4(bottom left)
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2016-03-25 05:26:33 UTC (rev
21027)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2016-03-26 15:14:08 UTC (rev
21028)
@@ -3429,8 +3429,14 @@
: isImageWrite && !isExport ? g.antialiasImages : false);
if (!isExport && !isImageWrite && (width > 0 || wasAntialiased !=
antialiased))
setShapeProperty(JC.SHAPE_LABELS, "clearBoxes", null);
- imageFontScaling = (antialiased ? 2f : 1f) * (isReset || width <= 0 ? 1
- : (g.zoomLarge == (height > width) ? height : width) / getScreenDim());
+ imageFontScaling = (antialiased ? 2f : 1f) * (isReset || tm.scale3D ||
width <= 0 ? 1
+ : (g.zoomLarge == (height > width) ? height : width) * 1f /
getScreenDim());
+ System.out.println(dimScreen.width + " " + dimScreen.height
+ + " " + (antialiased ? 2f : 1f)
+ + " " + width + " " + height + " " + (isReset || width <= 0 ? 1
+ : (g.zoomLarge == (height > width) ? height : width) * 1.0f /
getScreenDim()));
+ if (imageFontScaling == 0)
+ System.out.println("??? viewer");
if (width > 0) {
dimScreen.width = width;
dimScreen.height = height;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
