Revision: 5695
http://sourceforge.net/p/jump-pilot/code/5695
Author: michaudm
Date: 2018-01-28 21:22:53 +0000 (Sun, 28 Jan 2018)
Log Message:
-----------
Upgrade JumpPrinter : add ant file + version number, replace obsolete
de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer by
current version of RasterImageLayer in the code.
Modified Paths:
--------------
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/PrinterExtension.java
Added Paths:
-----------
plug-ins/CadPlan_JumpPrinter/trunk/build.xml
Copied: plug-ins/CadPlan_JumpPrinter/trunk/build.xml (from rev 5694,
plug-ins/CadPlan_VertexSymbols/trunk/build.xml)
===================================================================
--- plug-ins/CadPlan_JumpPrinter/trunk/build.xml
(rev 0)
+++ plug-ins/CadPlan_JumpPrinter/trunk/build.xml 2018-01-28 21:22:53 UTC
(rev 5695)
@@ -0,0 +1,96 @@
+<project name="JumpPrinter" default="compile-all" basedir=".">
+
+
<!--*************************************************************************
+
*****************************************************************************
+ ** PROPERTIES
**
+
*****************************************************************************
+
**************************************************************************-->
+
+ <!-- PROPERTIES : MAIN ARCHITECTURE -->
+ <property name="src" value="src" />
+ <property name="bin" value="bin" />
+ <property name="lib" value="lib" />
+ <property name="build" value="build" />
+ <property name="dist" value="dist" />
+ <property name="doc-api" value="doc-api" />
+ <property name="resources" value="resources" />
+ <property name="oj-classpath" value="../../openjump_lib" />
+
+ <!-- plugins -->
+ <property name="jump-printer-version" value="1.88" />
+
+
+ <!-- ===================================================================
-->
+ <!-- Defines the classpath used for compilation and test.
-->
+ <!-- ===================================================================
-->
+ <path id="classpath">
+ <!--fileset dir="${lib}">
+ <include name="**/*.jar"/>
+ </fileset-->
+ <fileset dir="${oj-classpath}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="clean" id="clean">
+ <delete dir="${build}"/>
+ </target>
+
+ <target name="compile-all" id="compile-all" depends="clean">
+ <tstamp/>
+ <mkdir dir="${build}"/>
+ <javac srcdir="${src}" destdir="${build}"
+ debug="on" deprecation="false" verbose="no"
+ includeantruntime="false"
+ encoding="windows-1252"
+ source="1.7"
+ target="1.7">
+ <exclude name="**/clean/*"/>
+ <classpath refid="classpath"/>
+ </javac>
+ <copy todir="${build}" >
+ <fileset dir="${src}" casesensitive="false" includes="**/*.gif,
**/*.jpg, **/*.png" />
+ <fileset dir="${src}" casesensitive="false"
includes="**/*.properties" />
+ <fileset dir="${src}" casesensitive="false" includes="**/*.html" />
+ <fileset dir="${src}" casesensitive="false" includes="**/*.txt" />
+ <fileset dir="${src}" casesensitive="false"
includes="**/*.java2xml" />
+ <fileset dir="." casesensitive="false" includes="**/*.gif,
**/*.jpg, **/*.png" />
+ <fileset dir="." casesensitive="false" includes="**/*.properties"
/>
+ </copy>
+ </target>
+
+
+ <!-- ===================================================================
-->
+ <!-- csv driver
-->
+ <!-- ===================================================================
-->
+ <target name="jar-jump-printer" id="jar-jump-printer"
depends="compile-all">
+ <jar basedir="${build}"
jarfile="${dist}/JumpPrinter-${jump-printer-version}.jar">
+ <include name="com/ashs/**/*"/>
+ <include name="com/cadplan/**/*"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.png"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.java2xml"/>
+ <include name="**/*.html"/>
+ </jar>
+ <!--copy file="${dist}/csv-driver-${csv-driver-version}.jar"
todir="${openjump-ext}"/-->
+ </target>
+
+ <target name="zip-jump-printer-src" id="zip-jump-printer-src"
depends="jar-jump-printer">
+ <zip basedir="."
destfile="${dist}/csv-driver-src-${jump-printer-version}.zip">
+ <include name="${dist}/csv-driver-${jump-printer-version}.jar"/>
+ <include name="com/cadplan/**/*.java"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.java2xml"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.html"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ <include name="build.xml"/>
+ </zip>
+ </target>
+
+</project>
\ No newline at end of file
Modified:
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
===================================================================
---
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
2018-01-28 20:48:34 UTC (rev 5694)
+++
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
2018-01-28 21:22:53 UTC (rev 5695)
@@ -30,7 +30,7 @@
import com.cadplan.designer.GridBagDesigner;
-import com.cadplan.fileio.*;
+//import com.cadplan.fileio.*;
import com.cadplan.fileioA.FileChooser;
public class FurnitureImagePanel extends JPanel implements ActionListener,
AdjustmentListener
Modified:
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java
===================================================================
---
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java
2018-01-28 20:48:34 UTC (rev 5694)
+++
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java
2018-01-28 21:22:53 UTC (rev 5695)
@@ -120,10 +120,10 @@
Layerable layer = (Layerable) ijj.next();
try
{
- Class dummy =
Class.forName("de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer");
- if((AbstractLayerable) layer instanceof
de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)
+ Class dummy =
Class.forName("org.openjump.core.rasterimage.RasterImageLayer");
+ if((AbstractLayerable) layer instanceof
org.openjump.core.rasterimage.RasterImageLayer)
{
- boolean isVisible =
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).isVisible();
+ boolean isVisible =
((org.openjump.core.rasterimage.RasterImageLayer)layer).isVisible();
if(isVisible) rasterLayers.add(layer);
if(debug)
System.out.println("Layer:"+layer.getName()+" Layer is Raster***********
visible:"+isVisible);
}
@@ -172,11 +172,11 @@
}
else
{
- bimage =
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).createImage(context.getLayerViewPanel());
- imageEnvelope =
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getEnvelope();
- transparencyLevel =
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getTransparencyLevel();
- imageX =
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getXOffset();
- imageY =
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getYOffset();
+ bimage =
((org.openjump.core.rasterimage.RasterImageLayer)layer).createImage(context.getLayerViewPanel());
+ imageEnvelope =
((org.openjump.core.rasterimage.RasterImageLayer)layer).getWholeImageEnvelope();
+ transparencyLevel =
((org.openjump.core.rasterimage.RasterImageLayer)layer).getTransparencyLevel();
+ imageX =
((org.openjump.core.rasterimage.RasterImageLayer)layer).getXOffset();
+ imageY =
((org.openjump.core.rasterimage.RasterImageLayer)layer).getYOffset();
}
if(debug) System.out.println("View envelope:
"+envelope.getMinX()+","+envelope.getMinY()+":"+envelope.getWidth()+","+envelope.getHeight());
@@ -1399,7 +1399,7 @@
double len = Math.sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0));
double bearing = Math.atan2(y1-y0, x1-x0);
- String note = String.valueOf(format(len) +"/"+
String.valueOf(formatAngle(Math.toDegrees(bearing)))+"\xB0");
+ String note = String.valueOf(format(len) +"/"+
String.valueOf(formatAngle(Math.toDegrees(bearing)))+"�");
g.drawString(note,x,y);
}
Modified:
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/PrinterExtension.java
===================================================================
---
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/PrinterExtension.java
2018-01-28 20:48:34 UTC (rev 5694)
+++
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/PrinterExtension.java
2018-01-28 21:22:53 UTC (rev 5695)
@@ -38,4 +38,8 @@
{
new PrinterPlugIn().initialize(context);
}
+
+ public String getVersion() {
+ return "1.88 (2018-01-28)";
+ }
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
