Skip to content
Permalink
Browse files

Update for release 2.1.4

  • Loading branch information...
gwlucastrig committed Sep 23, 2019
1 parent 5dee69e commit 62baff1ae9ab273c9b9d00e4aadb4ae5653ecba8
@@ -10,7 +10,7 @@
<parent>
<groupId>org.tinfour</groupId>
<artifactId>Tinfour</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4</version>
</parent>

<artifactId>TinfourAnalysis</artifactId>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.tinfour</groupId>
<artifactId>Tinfour</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4</version>
</parent>

<artifactId>TinfourCore</artifactId>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.tinfour</groupId>
<artifactId>Tinfour</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4</version>
</parent>

<artifactId>TinfourDemo</artifactId>
@@ -40,9 +40,6 @@
import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import static java.lang.Math.sin;
import static java.lang.Math.cos;
import static java.lang.Math.tan;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@@ -239,7 +236,7 @@ private void addGrid(List<Vertex> vertices) {
final static double A72 = Math.toRadians(72);

final static double rNotch = 1.0; // radius for inner (notch) vertices
final static double rPoint = rNotch * (cos(A36) + sin(A36) * tan(A72));
final static double rPoint = rNotch * (Math.cos(A36) + Math.sin(A36) * Math.tan(A72));

/**
* Add a region (polygon) constraint in the form of a five-pointed start to
@@ -314,12 +314,7 @@ private void test(IQuadEdge edge, IIncrementalTin tin, BitSet perimeterFlags) {
private String fail(IQuadEdge edge, String message) {
return "Edge +(" + edge.getIndex() + "): " + message;
}

private String eString(IQuadEdge edge) {
Vertex A = edge.getA();
Vertex B = edge.getB();
return edge.getIndex() + ": " + A + ", " + B + ">> " + edge.toString();
}


PolygonConstraint makePoly(String label, int xMin, int yMin, int xMax, int yMax) {
PolygonConstraint p = new PolygonConstraint();
@@ -137,13 +137,9 @@ public void runTest(PrintStream ps, String args[]) throws IOException {

int iAvg = 3; // minimum index to start collecting average
for (int iTest = 0; iTest < nTests; iTest++) {
String preallocTime = " ~~~";
tin = options.getNewInstanceOfTestTin();
if (usePreAlloc) {
time0 = System.nanoTime();
tin.preAllocateEdges(nVertices);
time1 = System.nanoTime();
preallocTime = String.format("%12.3f", (time1 - time0) / 1000000.0);
}
time0 = System.nanoTime();
tin.add(vertexList, null);
@@ -48,7 +48,8 @@
import org.tinfour.utils.loaders.ICoordinateTransform;

/**
* Builds a TIN from the specified Lidar file, running once and terminating to
* Builds a TIN from the specified input file (text, Lidar, Shapefile),
* running once and terminating to
* provide a simple test of the IncrementalTin logic.
*/
public class SingleBuildTest implements IDevelopmentTest {
@@ -175,6 +175,10 @@ public void runTest(PrintStream ps, String[] args) throws IOException {
TestOptions options = new TestOptions();
boolean[] recognized = options.argumentScan(args);
File target = options.getInputFile();
if(target==null){
ps.println("Missing valid input target");
return;
}

Class<?> tinClass = options.getTinClass();

@@ -209,7 +213,7 @@ public void runTest(PrintStream ps, String[] args) throws IOException {
String dateString = sdFormat.format(date);
ps.println("Date of test: " + dateString);
ps.println("TIN Class: " + tinClass.getName());
ps.println("File: " + options.getInputFile().getCanonicalPath());
ps.println("File: " + target.getCanonicalPath());
ps.println("Random size: "
+ (randomSize == null
? "Unspecified, Use full size"
@@ -55,9 +55,6 @@
<Property name="text" type="java.lang.String" value="Add frame to image"/>
<Property name="toolTipText" type="java.lang.String" value="Draw a thin frame (box) around image"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="imageFrameCheckBoxActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="transparentBackgroundCheckBox">
<Properties>
@@ -59,11 +59,6 @@ private void initComponents() {

imageFrameCheckBox.setText("Add frame to image");
imageFrameCheckBox.setToolTipText("Draw a thin frame (box) around image");
imageFrameCheckBox.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
imageFrameCheckBoxActionPerformed(evt);
}
});

transparentBackgroundCheckBox.setText("Transparent Background");
transparentBackgroundCheckBox.setToolTipText("Save image with transparent background (PNG iimages only)");
@@ -96,10 +91,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
);
}// </editor-fold>//GEN-END:initComponents

private void imageFrameCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_imageFrameCheckBoxActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_imageFrameCheckBoxActionPerformed

boolean isImageFrameEnabled() {
return imageFrameCheckBox.isSelected();
}
@@ -1752,18 +1752,13 @@ private Shape makeClipMask() {
List<Vertex> vList = con.getVertices();
double[] c = new double[4];
boolean moveFlag = true;

double x0 = 0;
double y0 = 0;
for (Vertex v : vList) {
c[0] = v.getX();
c[1] = v.getY();
m2c.transform(c, 0, c, 2, 1);
if (moveFlag) {
moveFlag = false;
path.moveTo(c[2], c[3]);
x0 = c[2];
y0 = c[3];
} else {
foundStuff = true;
path.lineTo(c[2], c[3]);
@@ -8,7 +8,7 @@
<parent>
<groupId>org.tinfour</groupId>
<artifactId>Tinfour</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4</version>
</parent>

<artifactId>TinfourGis</artifactId>
@@ -19,7 +19,7 @@
<dependency>
<groupId>com.github.mreutegg</groupId>
<artifactId>laszip4j</artifactId>
<version>0.5</version>
<version>0.7</version>
</dependency>

<dependency>
@@ -9,7 +9,7 @@

<groupId>org.tinfour</groupId>
<artifactId>Tinfour</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4</version>
<packaging>pom</packaging>

<name>Tinfour</name>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.tinfour</groupId>
<artifactId>Tinfour</artifactId>
<version>2.1.4-SNAPSHOT</version>
<version>2.1.4</version>
</parent>

<artifactId>TinfourSvm</artifactId>

0 comments on commit 62baff1

Please sign in to comment.
You can’t perform that action at this time.