Skip to content

Commit 5afb79c

Browse files
author
Nils Fo
committed
Bugfixes and cleaner UI. Implemented spiral highlighting
1 parent 29e5e11 commit 5afb79c

File tree

5 files changed

+207
-125
lines changed

5 files changed

+207
-125
lines changed

‎CellomicsArrayScanPuzzleHelper.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$">
66
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

‎src/de/rub/bph/CellomicsPuzzleHelper.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class CellomicsPuzzleHelper {
1212

1313
public static final String AUTHOR = "Nils Förster";
14-
public static final String NAME = "ThermoFischer SCIENTIFIC ArrayScan Cellomics Image Puzzle-Helper";
14+
public static final String NAME = "OmniSphero Smart-Well Creator";
1515
public static final String VERSION = "1.2";
1616
public static PuzzleHelperGUI helperGUI;
1717

@@ -27,7 +27,4 @@ public static void main(String[] args) {
2727
helperGUI = new PuzzleHelperGUI();
2828
});
2929
}
30-
31-
;
32-
3330
}

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

Lines changed: 148 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<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">
44
<margin top="0" left="0" bottom="0" right="0"/>
55
<constraints>
6-
<xy x="20" y="20" width="638" height="453"/>
6+
<xy x="20" y="20" width="638" height="534"/>
77
</constraints>
88
<properties/>
99
<clientProperties>
1010
<html.disable class="java.lang.Boolean" value="false"/>
1111
</clientProperties>
1212
<border type="none"/>
1313
<children>
14-
<grid id="f214" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
14+
<grid id="f214" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
1515
<margin top="0" left="0" bottom="0" right="0"/>
1616
<constraints>
1717
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -21,7 +21,7 @@
2121
<children>
2222
<component id="3ffea" class="javax.swing.JLabel" binding="imagecountLB">
2323
<constraints>
24-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="4" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
24+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="4" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
2525
</constraints>
2626
<properties>
2727
<text value="Image count per well: ?"/>
@@ -47,7 +47,7 @@
4747
</grid>
4848
<component id="74077" class="javax.swing.JButton" binding="button2" default-binding="true">
4949
<constraints>
50-
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
50+
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
5151
</constraints>
5252
<properties>
5353
<horizontalAlignment value="4"/>
@@ -56,13 +56,21 @@
5656
</component>
5757
<component id="9cd39" class="javax.swing.JButton" binding="button3" default-binding="true">
5858
<constraints>
59-
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
59+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
6060
</constraints>
6161
<properties>
6262
<horizontalAlignment value="4"/>
6363
<text value="+"/>
6464
</properties>
6565
</component>
66+
<component id="e837f" class="javax.swing.JCheckBox" binding="highlightPuzzleCB">
67+
<constraints>
68+
<grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
69+
</constraints>
70+
<properties>
71+
<text value="Highlight Spiral Orientation"/>
72+
</properties>
73+
</component>
6674
</children>
6775
</grid>
6876
<grid id="f29b" layout-manager="GridLayoutManager" row-count="12" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -71,109 +79,19 @@
7179
<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"/>
7280
</constraints>
7381
<properties/>
74-
<border type="none" title="Cellomics Image Properties"/>
82+
<border type="none" title="Smart Well Properties"/>
7583
<children>
76-
<component id="954f3" class="javax.swing.JLabel">
77-
<constraints>
78-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
79-
</constraints>
80-
<properties>
81-
<text value="Puzzle width:"/>
82-
</properties>
83-
</component>
8484
<vspacer id="1fb0">
8585
<constraints>
8686
<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"/>
8787
</constraints>
8888
</vspacer>
89-
<component id="bb32b" class="javax.swing.JLabel">
90-
<constraints>
91-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
92-
</constraints>
93-
<properties>
94-
<text value="Puzzle height:"/>
95-
</properties>
96-
</component>
97-
<component id="ecc14" class="javax.swing.JLabel">
98-
<constraints>
99-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
100-
</constraints>
101-
<properties>
102-
<text value="Image width (px):"/>
103-
</properties>
104-
</component>
105-
<component id="9701a" class="javax.swing.JLabel">
106-
<constraints>
107-
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
108-
</constraints>
109-
<properties>
110-
<text value="Image height (px):"/>
111-
</properties>
112-
</component>
113-
<component id="c4570" class="javax.swing.JSpinner" binding="imWidthSP">
114-
<constraints>
115-
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
116-
</constraints>
117-
<properties/>
118-
</component>
119-
<component id="96146" class="javax.swing.JSpinner" binding="imHeightSP">
120-
<constraints>
121-
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
122-
</constraints>
123-
<properties/>
124-
</component>
125-
<component id="23b71" class="javax.swing.JLabel">
126-
<constraints>
127-
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
128-
</constraints>
129-
<properties>
130-
<text value="Puzzle direction:"/>
131-
</properties>
132-
</component>
133-
<component id="a65e5" class="javax.swing.JComboBox" binding="directionCB">
134-
<constraints>
135-
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
136-
</constraints>
137-
<properties>
138-
<enabled value="true"/>
139-
</properties>
140-
</component>
141-
<component id="ac11e" class="javax.swing.JCheckBox" binding="flipRowCB">
142-
<constraints>
143-
<grid row="6" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
144-
</constraints>
145-
<properties>
146-
<text value="Flip row images along the y axis"/>
147-
</properties>
148-
</component>
149-
<component id="a4c2" class="javax.swing.JSpinner" binding="pHeightSP">
150-
<constraints>
151-
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
152-
</constraints>
153-
<properties/>
154-
</component>
155-
<component id="4a0ac" class="javax.swing.JSpinner" binding="pWidthSP">
156-
<constraints>
157-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
158-
</constraints>
159-
<properties>
160-
<enabled value="true"/>
161-
</properties>
162-
</component>
16389
<component id="9f5cc" class="javax.swing.JButton" binding="autoReadImageSizesButton" default-binding="true">
16490
<constraints>
16591
<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"/>
16692
</constraints>
16793
<properties>
168-
<text value="Auto read image sizes"/>
169-
</properties>
170-
</component>
171-
<component id="47c0b" class="javax.swing.JCheckBox" binding="flipFinalImageCB">
172-
<constraints>
173-
<grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
174-
</constraints>
175-
<properties>
176-
<text value="Flip final image along the y axis"/>
94+
<text value="Read tile properties from image"/>
17795
</properties>
17896
</component>
17997
<component id="594c2" class="javax.swing.JLabel">
@@ -190,22 +108,142 @@
190108
</constraints>
191109
<properties/>
192110
</component>
193-
<component id="870e2" class="javax.swing.JCheckBox" binding="mirrorRowTilingCB">
111+
<grid id="522cd" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
112+
<margin top="0" left="0" bottom="0" right="0"/>
194113
<constraints>
195-
<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"/>
114+
<grid row="6" column="0" row-span="2" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
196115
</constraints>
197-
<properties>
198-
<text value="Mirror horizontal Tile position"/>
199-
</properties>
200-
</component>
201-
<component id="deaef" class="javax.swing.JCheckBox" binding="mirrorColumnTilingCB">
116+
<properties/>
117+
<border type="none" title="Tile Image Flipping"/>
118+
<children>
119+
<component id="ac11e" class="javax.swing.JCheckBox" binding="flipRowCB">
120+
<constraints>
121+
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
122+
</constraints>
123+
<properties>
124+
<text value="Flip row images along the y axis"/>
125+
</properties>
126+
</component>
127+
<component id="47c0b" class="javax.swing.JCheckBox" binding="flipFinalImageCB">
128+
<constraints>
129+
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
130+
</constraints>
131+
<properties>
132+
<text value="Flip final image along the y axis"/>
133+
</properties>
134+
</component>
135+
</children>
136+
</grid>
137+
<grid id="a3f29" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
138+
<margin top="0" left="0" bottom="0" right="0"/>
202139
<constraints>
203-
<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"/>
140+
<grid row="8" column="0" row-span="2" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
204141
</constraints>
205-
<properties>
206-
<text value="Mirror vertical Tile positionBox"/>
207-
</properties>
208-
</component>
142+
<properties/>
143+
<border type="none" title="Tile Positioning"/>
144+
<children>
145+
<component id="870e2" class="javax.swing.JCheckBox" binding="mirrorRowTilingCB">
146+
<constraints>
147+
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
148+
</constraints>
149+
<properties>
150+
<text value="Mirror horizontal Tile position"/>
151+
</properties>
152+
</component>
153+
<component id="deaef" class="javax.swing.JCheckBox" binding="mirrorColumnTilingCB">
154+
<constraints>
155+
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
156+
</constraints>
157+
<properties>
158+
<text value="Mirror vertical Tile position"/>
159+
</properties>
160+
</component>
161+
</children>
162+
</grid>
163+
<grid id="d8e63" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
164+
<margin top="0" left="0" bottom="0" right="0"/>
165+
<constraints>
166+
<grid row="0" column="0" row-span="5" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
167+
</constraints>
168+
<properties/>
169+
<border type="none" title="Spiral Properties"/>
170+
<children>
171+
<component id="954f3" class="javax.swing.JLabel">
172+
<constraints>
173+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
174+
</constraints>
175+
<properties>
176+
<text value="Puzzle width:"/>
177+
</properties>
178+
</component>
179+
<component id="bb32b" class="javax.swing.JLabel">
180+
<constraints>
181+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
182+
</constraints>
183+
<properties>
184+
<text value="Puzzle height:"/>
185+
</properties>
186+
</component>
187+
<component id="ecc14" class="javax.swing.JLabel">
188+
<constraints>
189+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
190+
</constraints>
191+
<properties>
192+
<text value="Image width (px):"/>
193+
</properties>
194+
</component>
195+
<component id="9701a" class="javax.swing.JLabel">
196+
<constraints>
197+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
198+
</constraints>
199+
<properties>
200+
<text value="Image height (px):"/>
201+
</properties>
202+
</component>
203+
<component id="c4570" class="javax.swing.JSpinner" binding="imWidthSP">
204+
<constraints>
205+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
206+
</constraints>
207+
<properties/>
208+
</component>
209+
<component id="96146" class="javax.swing.JSpinner" binding="imHeightSP">
210+
<constraints>
211+
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
212+
</constraints>
213+
<properties/>
214+
</component>
215+
<component id="23b71" class="javax.swing.JLabel">
216+
<constraints>
217+
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
218+
</constraints>
219+
<properties>
220+
<text value="Puzzle direction:"/>
221+
</properties>
222+
</component>
223+
<component id="a65e5" class="javax.swing.JComboBox" binding="directionCB">
224+
<constraints>
225+
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
226+
</constraints>
227+
<properties>
228+
<enabled value="true"/>
229+
</properties>
230+
</component>
231+
<component id="a4c2" class="javax.swing.JSpinner" binding="pHeightSP">
232+
<constraints>
233+
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
234+
</constraints>
235+
<properties/>
236+
</component>
237+
<component id="4a0ac" class="javax.swing.JSpinner" binding="pWidthSP">
238+
<constraints>
239+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
240+
</constraints>
241+
<properties>
242+
<enabled value="true"/>
243+
</properties>
244+
</component>
245+
</children>
246+
</grid>
209247
</children>
210248
</grid>
211249
<grid id="c5429" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -216,7 +254,7 @@
216254
<properties/>
217255
<border type="none" title="Actions"/>
218256
<children>
219-
<component id="9546b" class="javax.swing.JButton" binding="button1" default-binding="true">
257+
<component id="9546b" class="javax.swing.JButton" binding="refreshBT">
220258
<constraints>
221259
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
222260
</constraints>

0 commit comments

Comments
 (0)