Menu
▾
▴
[Jmol-commits] SF.net SVN: jmol: [4790] branches/r4453rollback/Jmol/src/org/jmol/viewer
|
From: <mig...@us...> - 2006-03-27 21:23:26
|
Revision: 4790 Author: migueljmol Date: 2006-03-27 13:23:17 -0800 (Mon, 27 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4790&view=rev Log Message: ----------- patches r4584 & r4585 for java.awt.Color elimination Modified Paths: -------------- branches/r4453rollback/Jmol/src/org/jmol/viewer/ColorManager.java branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java branches/r4453rollback/Jmol/src/org/jmol/viewer/Viewer.java Modified: branches/r4453rollback/Jmol/src/org/jmol/viewer/ColorManager.java =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/viewer/ColorManager.java 2006-03-27 18:15:43 UTC (rev 4789) +++ branches/r4453rollback/Jmol/src/org/jmol/viewer/ColorManager.java 2006-03-27 21:23:17 UTC (rev 4790) @@ -3,9 +3,9 @@ * $Date$ * $Revision$ * - * Copyright (C) 2003-2005 The Jmol Development Team + * Copyright (C) 2003-2006 Miguel, Jmol Development, www.jmol.org * - * Contact: jmo...@li... + * Contact: mi...@jm... * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -44,8 +44,8 @@ System.out.println("setting color scheme to:" + colorScheme); if (colorScheme.equals("jmol")) { argbsCpk = JmolConstants.argbsCpk; - viewer.setColorBackground(Color.black); - viewer.setShapeColorProperty(JmolConstants.SHAPE_DOTS, null); + viewer.setColorBackground("black"); + viewer.setShapeColorProperty(JmolConstants.SHAPE_DOTS, 0); } else if (colorScheme.equals("rasmol")) { copyArgbsCpk(); int argb = JmolConstants.argbsCpkRasmol[0] | 0xFF000000; @@ -57,9 +57,8 @@ argb |= 0xFF000000; argbsCpk[atomNo] = argb; } - viewer.setColorBackground(Color.black); - setMeasurementColix(Graphics3D.WHITE); - viewer.setShapeColorProperty(JmolConstants.SHAPE_DOTS, null); + viewer.setColorBackground("black"); + viewer.setShapeColorProperty(JmolConstants.SHAPE_DOTS, 0); } else { System.out.println("unrecognized color scheme"); return; @@ -87,36 +86,10 @@ } short colixRubberband = Graphics3D.HOTPINK; - - void setColorRubberband(Color color) { - if (color == null) - color = Color.pink; - colixRubberband = Graphics3D.getColix(color); + void setRubberbandArgb(int argb) { + colixRubberband = (argb == 0 ? 0 : Graphics3D.getColix(argb)); } - short colixDotsConvex = 0; - short colixDotsConcave = 0; - short colixDotsSaddle = 0; - - void setColorDotsConvex(Color color) { - colixDotsConvex = Graphics3D.getColix(color); - } - void setColorDotsConcave(Color color) { - colixDotsConcave = Graphics3D.getColix(color); - } - void setColorDotsSaddle(Color color) { - colixDotsSaddle = Graphics3D.getColix(color); - } - - short colixMeasurement = 0; - void setMeasurementArgb(int argb) { - colixMeasurement = Graphics3D.getColix(argb); - } - - void setMeasurementColix(short colix) { - colixMeasurement = colix; - } - short colixBackground = Graphics3D.BLACK; void setBackgroundArgb(int argb) { colixBackground = Graphics3D.getColix(argb | 0xFF000000); @@ -309,14 +282,13 @@ flushCaches(); } - void setElementColor(int elementNumber, Color color) { - int argb; - if (color == null) { + void setElementArgb(int elementNumber, int argb) { + if (argb == 0) { if (argbsCpk == JmolConstants.argbsCpk) return; argb = JmolConstants.argbsCpk[elementNumber]; } else - argb = color.getRGB() | 0xFF000000; + argb |= 0xFF000000; if (argbsCpk == JmolConstants.argbsCpk) copyArgbsCpk(); argbsCpk[elementNumber] = argb; Modified: branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java 2006-03-27 18:15:43 UTC (rev 4789) +++ branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java 2006-03-27 21:23:17 UTC (rev 4790) @@ -1459,6 +1459,14 @@ return new Color(statement[itoken].intValue); } + int getArgbParam(int itoken) throws ScriptException { + if (itoken >= statementLength) + colorExpected(); + if (statement[itoken].tok != Token.colorRGB) + colorExpected(); + return statement[itoken].intValue; + } + Color getColorOrNoneParam(int itoken) throws ScriptException { if (itoken >= statementLength) colorExpected(); @@ -1469,12 +1477,22 @@ return null; } + int getArgbOrNoneParam(int itoken) throws ScriptException { + if (itoken >= statementLength) + colorExpected(); + if (statement[itoken].tok == Token.colorRGB) + return statement[itoken].intValue; + if (statement[itoken].tok != Token.none) + colorExpected(); + return 0; + } + void background() throws ScriptException { if (statementLength < 2 || statementLength > 3) badArgumentCount(); int tok = statement[1].tok; if (tok == Token.colorRGB) - viewer.setColorBackground(getColorParam(1)); + viewer.setBackgroundArgb(getArgbParam(1)); else viewer.setShapeProperty(getShapeType(tok), "bgcolor", getColorOrNoneParam(2)); @@ -1514,10 +1532,10 @@ colorObject(Token.atom, 1); break; case Token.rubberband: - viewer.setColorRubberband(getColorParam(2)); + viewer.setRubberbandArgb(getArgbParam(2)); break; case Token.background: - viewer.setColorBackground(getColorParam(2)); + viewer.setBackgroundArgb(getArgbParam(2)); break; case Token.identifier: case Token.hydrogen: @@ -1544,14 +1562,14 @@ } for (int i = JmolConstants.elementNames.length; --i >= 0; ) { if (str.equalsIgnoreCase(JmolConstants.elementNames[i])) { - viewer.setElementColor(i, getColorParam(2)); + viewer.setElementArgb(i, getArgbParam(2)); return; } } for (int i = JmolConstants.alternateElementNames.length; --i >= 0; ) { if (str.equalsIgnoreCase(JmolConstants.alternateElementNames[i])) { - viewer.setElementColor(JmolConstants.alternateElementNumbers[i], - getColorParam(2)); + viewer.setElementArgb(JmolConstants.alternateElementNumbers[i], + getArgbParam(2)); return; } } Modified: branches/r4453rollback/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- branches/r4453rollback/Jmol/src/org/jmol/viewer/Viewer.java 2006-03-27 18:15:43 UTC (rev 4789) +++ branches/r4453rollback/Jmol/src/org/jmol/viewer/Viewer.java 2006-03-27 21:23:17 UTC (rev 4790) @@ -3,7 +3,7 @@ * $Date$ * $Revision$ * - * Copyright (C) 2003-2005 Miguel, Jmol Development, www.jmol.org + * Copyright (C) 2003-2006 Miguel, Jmol Development, www.jmol.org * * Contact: mi...@jm... * @@ -608,45 +608,18 @@ return colorManager.getColixSelection(); } - void setColorRubberband(Color color) { - colorManager.setColorRubberband(color); + void setRubberbandArgb(int argb) { + colorManager.setRubberbandArgb(argb); } short getColixRubberband() { return colorManager.colixRubberband; } - void setElementColor(int elementNumber, Color color) { - colorManager.setElementColor(elementNumber, color); + void setElementArgb(int elementNumber, int argb) { + colorManager.setElementArgb(elementNumber, argb); } - void setColorDotsSaddle(Color color) { - colorManager.setColorDotsSaddle(color); - setShapeProperty(JmolConstants.SHAPE_DOTS, "dotssaddle", color); - } - - short getColixDotsSaddle() { - return colorManager.colixDotsSaddle; - } - - void setColorDotsConvex(Color color) { - colorManager.setColorDotsConvex(color); - setShapeProperty(JmolConstants.SHAPE_DOTS, "dotsconvex", color); - } - - short getColixDotsConvex() { - return colorManager.colixDotsConvex; - } - - void setColorDotsConcave(Color color) { - colorManager.setColorDotsConcave(color); - setShapeProperty(JmolConstants.SHAPE_DOTS, "dotsconcave", color); - } - - short getColixDotsConcave() { - return colorManager.colixDotsConcave; - } - float getVectorScale() { return transformManager.vectorScale; } @@ -672,23 +645,11 @@ return g3d.getColixArgb(colorManager.colixBackground); } - public void setColorBackground(Color bg) { - setBackgroundArgb(bg == null ? 0 : bg.getRGB()); - } - - public Color getColorBackground() { - return new Color(getBackgroundArgb()); - } - public void setColorBackground(String colorName) { colorManager.setColorBackground(colorName); refresh(); } - Color getColorFromString(String colorName) { - return Graphics3D.getColorFromString(colorName); - } - int getArgbFromString(String colorName) { return Graphics3D.getArgbFromString(colorName); } @@ -1750,10 +1711,6 @@ refresh(); } - void setShapeColorProperty(int shapeType, Color color) { - setShapeProperty(shapeType, "color", color); - } - void setShapeColorProperty(int shapeType, int argb) { setShapeProperty(shapeType, "color", argb == 0 ? null : new Color(argb|0xFF000000)); @@ -1769,24 +1726,12 @@ return modelManager.getShapeProperty(shapeType, propertyName, index); } - Color getShapePropertyAsColor(int shapeID, String propertyName) { - return (Color)getShapeProperty(shapeID, propertyName); - } - int getShapePropertyAsInt(int shapeID, String propertyName) { Object value = getShapeProperty(shapeID, propertyName); return value == null || !(value instanceof Integer) ? Integer.MIN_VALUE : ((Integer)value).intValue(); } - Color getColorShape(int shapeID) { - return (Color)getShapeProperty(shapeID, "color"); - } - - short getColixShape(int shapeID) { - return Graphics3D.getColix(getColorShape(shapeID)); - } - int getShapeID(String shapeName) { for (int i = JmolConstants.SHAPE_MAX; --i >= 0; ) if (JmolConstants.shapeClassBases[i].equals(shapeName)) @@ -1796,10 +1741,6 @@ throw new NullPointerException(msg); } - short getColix(Color color) { - return Graphics3D.getColix(color); - } - short getColix(Object object) { return Graphics3D.getColix(object); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
