Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bioimage Analysis
wellPlateReader
Commits
d9d3a9de
Commit
d9d3a9de
authored
Feb 11, 2021
by
danyfel80
Browse files
v3.0.4-SNAPSHOT
added alphanumeric well id
parent
cd7da198
Changes
4
Hide whitespace changes
Inline
Side-by-side
WellPlateReader/pom.xml
View file @
d9d3a9de
...
...
@@ -7,7 +7,7 @@
<version>
1.0.1
</version>
</parent>
<artifactId>
well-plate-reader
</artifactId>
<version>
3.0.
3
</version>
<version>
3.0.
4-SNAPSHOT
</version>
<name>
Well Plate Reader
</name>
<description/>
<build>
...
...
WellPlateReader/src/main/java/danyfel80/wells/data/IWell.java
View file @
d9d3a9de
...
...
@@ -4,12 +4,20 @@ import java.awt.Point;
import
java.awt.geom.Rectangle2D
;
import
java.util.Map
;
import
icy.util.StringUtil
;
public
interface
IWell
{
long
getId
();
Point
getPositionInPlate
();
default
String
getAlphanumericID
()
{
Point
pos
=
getPositionInPlate
();
return
""
+
((
char
)
(
'A'
+
pos
.
x
-
1
))
+
StringUtil
.
toString
(
pos
.
y
,
2
);
}
Map
<
Long
,
?
extends
IField
>
getFields
();
IWellShape
getShape
();
...
...
WellPlateReader/src/main/java/danyfel80/wells/ui/WellPlateViewer.java
View file @
d9d3a9de
...
...
@@ -89,8 +89,7 @@ public class WellPlateViewer extends IcyFrame
Future
<?
extends
Sequence
>
sequenceFuture
=
plateReader
.
loadField
(
wellPlate
,
well
,
field
,
viewerSequence
,
null
);
Sequence
sequence
=
sequenceFuture
.
get
();
sequence
.
setName
(
"Well"
+
((
char
)
(
'A'
+
well
.
getPositionInPlate
().
x
-
1
))
+
StringUtil
.
toString
(
well
.
getPositionInPlate
().
y
,
2
)
+
"_Field"
+
field
.
getId
());
sequence
.
setName
(
"Well"
+
well
.
getAlphanumericID
()
+
"_Field"
+
field
.
getId
());
selectedFieldLabel
.
setText
(
"Field "
+
field
.
getId
());
fieldSlider
.
setValue
((
int
)
field
.
getId
());
if
(
sequence
.
getFirstViewer
()
==
null
)
...
...
WellPlateReader/src/main/java/plugins/adufour/hcs/blocks/WellPlateBatch.java
View file @
d9d3a9de
package
plugins.adufour.hcs.blocks
;
import
java.awt.Point
;
import
java.io.File
;
import
java.util.Collections
;
import
java.util.Iterator
;
...
...
@@ -16,7 +15,6 @@ import icy.gui.frame.progress.CancelableProgressFrame;
import
icy.sequence.Sequence
;
import
icy.system.IcyHandledException
;
import
icy.system.SystemUtil
;
import
icy.util.StringUtil
;
import
plugins.adufour.blocks.lang.Batch
;
import
plugins.adufour.blocks.lang.FileBatch
;
import
plugins.adufour.blocks.util.VarList
;
...
...
@@ -192,10 +190,7 @@ public class WellPlateBatch extends Batch
{
if
(
wellFilterValues
.
length
!=
0
)
{
Point
wellPos
=
well
.
getPositionInPlate
();
char
col
=
((
char
)
(
'A'
+
wellPos
.
x
-
1
));
String
row
=
StringUtil
.
toString
(
wellPos
.
y
,
2
);
String
wellAlphanumeric
=
""
+
col
+
row
;
String
wellAlphanumeric
=
well
.
getAlphanumericID
();
for
(
String
filter
:
wellFilterValues
)
{
if
(
wellAlphanumeric
.
contains
(
filter
))
...
...
@@ -225,9 +220,8 @@ public class WellPlateBatch extends Batch
if
(
fieldIterator
.
hasNext
())
{
IField
currentField
=
fieldIterator
.
next
();
Point
pos
=
currentWell
.
getPositionInPlate
();
plateID
.
setValue
(
currentWellPlate
.
getId
());
wellID
.
setValue
(
""
+
((
char
)
(
'A'
+
pos
.
x
-
1
))
+
StringUtil
.
toString
(
pos
.
y
,
2
));
wellID
.
setValue
(
currentWell
.
getAlphanumericID
(
));
fieldID
.
setValue
((
int
)
currentField
.
getId
());
reader
.
loadField
(
currentWellPlate
,
currentWell
,
currentField
,
sequence
,
null
);
sequence
.
setName
(
plateID
.
getValueAsString
()
+
"_"
+
wellID
.
getValueAsString
()
+
"_"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment