Menu
▾
▴
[Cdk-commits] SF.net SVN: cdk:[14073] jchempaint/trunk/src/main/org/openscience/ jchempaint
|
From: <sh...@us...> - 2009-02-05 16:26:27
|
Revision: 14073
http://cdk.svn.sourceforge.net/cdk/?rev=14073&view=rev
Author: shk3
Date: 2009-02-05 16:26:24 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
activated zoom
Modified Paths:
--------------
jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java
jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties
Added Paths:
-----------
jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java
Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-02-05 16:04:00 UTC (rev 14072)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-02-05 16:26:24 UTC (rev 14073)
@@ -313,7 +313,7 @@
return "<html>"
+ formula
+ (implicitHs == 0 ? "" : " ("+GT._("of these")+ " "
- + implicitHs + " "+GT._("Hs implicit")+")")+" (mass "+mass+")</html>";
+ + implicitHs + " "+GT._("Hs implicit")+")")+" ("+GT._("mass")+" "+mass+")</html>";
}
public Renderer getRenderer() {
Added: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java (rev 0)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java 2009-02-05 16:26:24 UTC (rev 14073)
@@ -0,0 +1,67 @@
+/*
+ * $RCSfile$
+ * $Author: shk3 $
+ * $Date: 2008-10-02 16:45:12 +0100 (Thu, 02 Oct 2008) $
+ * $Revision: 12535 $
+ *
+ * Copyright (C) 2003-2007 The JChemPaint project
+ *
+ * Contact: jch...@li...
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ * All we ask is that proper credit is given for our work, which includes
+ * - but is not limited to - adding the above copyright notice to the beginning
+ * of your source code files, and to any copyright notice that you may distribute
+ * with programs based on this work.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+package org.openscience.jchempaint.action;
+
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+
+import org.openscience.cdk.renderer.RendererModel;
+
+
+/**
+ * @cdk.module jchempaint
+ * @author steinbeck
+ */
+public class ZoomAction extends JCPAction
+{
+
+ private static final long serialVersionUID = -2459332630141921895L;
+
+ public void actionPerformed(ActionEvent e)
+ {
+ logger.debug("Zooming in/out in mode: ", type);
+ if (type.equals("in") && jcpPanel.getRenderPanel().getRenderer().getZoom()<10)
+ {
+ jcpPanel.getRenderPanel().getRenderer().setZoom(jcpPanel.getRenderPanel().getRenderer().getZoom() * 1.5);
+ } else if (type.equals("out")&& jcpPanel.getRenderPanel().getRenderer().getZoom()>.1)
+ {
+ jcpPanel.getRenderPanel().getRenderer().setZoom(jcpPanel.getRenderPanel().getRenderer().getZoom() / 1.5);
+ } else if (type.equals("original"))
+ {
+ jcpPanel.getRenderPanel().getRenderer().setZoom(1);
+ } else
+ {
+ logger.error("Unkown zoom command: " + type);
+ }
+ jcpPanel.get2DHub().updateView();
+ jcpPanel.updateStatusBar();
+ }
+
+}
+
Property changes on: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java
___________________________________________________________________
Added: svn:executable
+ *
Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2009-02-05 16:04:00 UTC (rev 14072)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2009-02-05 16:26:24 UTC (rev 14073)
@@ -159,8 +159,8 @@
statusbarAction=org.openscience.jchempaint.action.StatusBarAction
menubarAction=org.openscience.jchempaint.action.MenuBarAction
insertstructureAction=org.openscience.jchempaint.action.InsertStructureAction
-zoominAction=org.openscience.cdk.applications.jchempaint.action.ZoomAction@in
-zoomoutAction=org.openscience.cdk.applications.jchempaint.action.ZoomAction@out
+zoominAction=org.openscience.jchempaint.action.ZoomAction@in
+zoomoutAction=org.openscience.jchempaint.action.ZoomAction@out
zoomoriginalAction=org.openscience.cdk.applications.jchempaint.action.ZoomAction@original
renderOptionsAction=org.openscience.jchempaint.action.ModifyDisplaySettingsAction
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|