Preparing Classes & GUI for tile mirroring

Author: Nils Fo

CellomicsArrayScanPuzzleHelper.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="CellomicsPuzzleHelper" level="project" />
+    <orderEntry type="library" name="lib" level="project" />
+  </component>
+</module>

src/de/rub/bph/CellomicsPuzzleHelper.java

@@ -9,24 +9,25 @@
  */
 
 public class CellomicsPuzzleHelper {
-
-	public static final String NAME = "ThermoFischer SCIENTIFIC ArrayScan Cellomics Image Puzzle-Helper";
-	public static final String VERSION = "1.1";
+	
 	public static final String AUTHOR = "Nils Förster";
-
+	public static final String NAME = "ThermoFischer SCIENTIFIC ArrayScan Cellomics Image Puzzle-Helper";
+	public static final String VERSION = "1.2";
 	public static PuzzleHelperGUI helperGUI;
-
+	
 	public static void main(String[] args) {
-
+		
 		SwingUtilities.invokeLater(() -> {
 			try {
 				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 			} catch (ClassNotFoundException | InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
 				e.printStackTrace();
 			}
-
+			
 			helperGUI = new PuzzleHelperGUI();
 		});
-	};
-
+	}
+	
+	;
+	
 }

src/de/rub/bph/data/Puzzler.java

@@ -7,35 +7,39 @@
  * Created by nilfoe on 12/03/2018.
  */
 public class Puzzler {
-
+	
 	public static final int POSITION_NOT_USED = -1;
-
+	
 	private int w;
 	private int h;
+	private boolean mirrorRowTiling;
+	private boolean mirrorColumnTiling;
 	private PuzzleDirection direction;
-
+	
 	private HashMap<Integer, Point> visitedMap;
-
-	public Puzzler(int w, int h, PuzzleDirection direction) {
+	
+	public Puzzler(int w, int h, boolean mirrorRowTiling, boolean mirrorColumnTiling, PuzzleDirection direction) {
 		this.w = w;
 		this.h = h;
 		this.direction = direction;
+		this.mirrorRowTiling = mirrorRowTiling;
+		this.mirrorColumnTiling = mirrorColumnTiling;
 		visitedMap = new HashMap<>();
 	}
-
+	
 	public void puzzle() {
 		System.out.println("Puzzling a new structure: " + getW() + "x" + getH());
-
+		
 		PuzzleDirection currentDirection = direction;
 		PuzzleDirection startDirection = direction;
-
+		
 		int x = 0;
 		int y = getH() - 1;
-
+		
 		for (int i = 0; i <= getSize(); i++) {
-			visitedMap.put(i, new Point(x, y));
+			visitedMap.put(i, transformPosition(x, y));
 			System.out.println("Map: " + i + " -> " + x + "x" + y + " - " + currentDirection);
-
+			
 			switch (currentDirection) {
 				case RIGHT:
 					if (x + 1 < getW() && !hasPosition(x + 1, y)) {
@@ -92,56 +96,73 @@ public void puzzle() {
 			}
 		}
 	}
-
-	public boolean equals(Puzzler p) {
-		return getW() == p.getW() && getH() == p.getH() && getDirection() == p.getDirection();
+	
+	public int getW() {
+		return w;
 	}
-
-	@Override
-	public int hashCode() {
-		int hash = "Nils".hashCode();
-
-		hash = 31 * hash + getW();
-		hash = 31 * hash + getH();
-		hash = 31 * hash + visitedMap.hashCode();
-
-		return hash;
+	
+	public int getH() {
+		return h;
 	}
-
+	
+	public int getSize() {
+		return getW() * getH();
+	}
+	
+	private Point transformPosition(int x, int y) {
+		if (isMirrorRowTiling()) {
+			x = getW() - x;
+		}
+		if (isMirrorColumnTiling()) {
+			y = getH() - y;
+		}
+		return new Point(x, y);
+	}
+	
 	public boolean hasPosition(int x, int y) {
 		return getPosition(x, y) != POSITION_NOT_USED;
 	}
-
-	public Point getPosition(int i) {
-		return visitedMap.get(i);
+	
+	public boolean isMirrorRowTiling() {
+		return mirrorRowTiling;
 	}
-
-
+	
+	public boolean isMirrorColumnTiling() {
+		return mirrorColumnTiling;
+	}
+	
 	public int getPosition(int x, int y) {
-		return getPosition(new Point(x, y));
+		return getPosition(transformPosition(x, y));
 	}
-
+	
 	public int getPosition(Point v) {
 		for (Integer i : visitedMap.keySet()) {
 			Point visited = getPosition(i);
 			if (visited.equals(v)) return i;
 		}
 		return POSITION_NOT_USED;
 	}
-
-	public int getSize() {
-		return getW() * getH();
-	}
-
-	public int getW() {
-		return w;
+	
+	public Point getPosition(int i) {
+		return visitedMap.get(i);
 	}
-
-	public int getH() {
-		return h;
+	
+	public boolean equals(Puzzler p) {
+		return getW() == p.getW() && getH() == p.getH() && getDirection() == p.getDirection() && isMirrorColumnTiling() == p.isMirrorColumnTiling() && isMirrorRowTiling() && isMirrorRowTiling();
 	}
-
+	
 	public PuzzleDirection getDirection() {
 		return direction;
 	}
+	
+	@Override
+	public int hashCode() {
+		int hash = "Nils".hashCode();
+		
+		hash = 31 * hash + getW();
+		hash = 31 * hash + getH();
+		hash = 31 * hash + visitedMap.hashCode();
+		
+		return hash;
+	}
 }

src/de/rub/bph/ui/PuzzleHelperGUI.form

@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="basePanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="true" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="403"/>
+      <xy x="20" y="20" width="638" height="453"/>
     </constraints>
     <properties/>
     <clientProperties>
@@ -65,7 +65,7 @@
           </component>
         </children>
       </grid>
-      <grid id="f29b" layout-manager="GridLayoutManager" row-count="10" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="f29b" layout-manager="GridLayoutManager" row-count="12" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -83,7 +83,7 @@
           </component>
           <vspacer id="1fb0">
             <constraints>
-              <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
           </vspacer>
           <component id="bb32b" class="javax.swing.JLabel">
@@ -162,7 +162,7 @@
           </component>
           <component id="9f5cc" class="javax.swing.JButton" binding="autoReadImageSizesButton" default-binding="true">
             <constraints>
-              <grid row="9" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="11" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Auto read image sizes"/>
@@ -190,6 +190,22 @@
             </constraints>
             <properties/>
           </component>
+          <component id="870e2" class="javax.swing.JCheckBox" binding="mirrorRowTilingCB">
+            <constraints>
+              <grid row="8" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Mirror horizontal Tile position"/>
+            </properties>
+          </component>
+          <component id="deaef" class="javax.swing.JCheckBox" binding="mirrorColumnTilingCB">
+            <constraints>
+              <grid row="9" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Mirror vertical Tile positionBox"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="c5429" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">