Merge pull request 'Fix htype parsing of message (to work with standard daq)' (#1) from fix_htype into master
Reviewed-on: #1
This commit is contained in:
commit
3302d8209d
2
pom.xml
2
pom.xml
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>ch.psi.zmq</groupId>
|
<groupId>ch.psi.zmq</groupId>
|
||||||
<artifactId>ch.psi.zmq.imagej</artifactId>
|
<artifactId>ch.psi.zmq.imagej</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>0.6.0</version>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -163,7 +163,7 @@ public class Collector implements Runnable {
|
|||||||
// hinfo.setHeader(header);
|
// hinfo.setHeader(header);
|
||||||
Map<String, Object> m = mapper.readValue(header, new TypeReference<HashMap<String, Object>>() {
|
Map<String, Object> m = mapper.readValue(header, new TypeReference<HashMap<String, Object>>() {
|
||||||
});
|
});
|
||||||
if (((List<String>) m.get("htype")).contains("array-1.0")) { // currently
|
if (((String) m.get("htype")).equals("array-1.0")) { // currently
|
||||||
// we
|
// we
|
||||||
// only
|
// only
|
||||||
// support
|
// support
|
||||||
@ -195,7 +195,7 @@ public class Collector implements Runnable {
|
|||||||
hinfo.setText(m);
|
hinfo.setText(m);
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (((List<String>) m.get("htype")).contains("pilatus-1.0")) { // pilatus
|
else if (((String) m.get("htype")).equals("pilatus-1.0")) { // pilatus
|
||||||
// 1.0
|
// 1.0
|
||||||
// message
|
// message
|
||||||
// support
|
// support
|
||||||
|
Loading…
x
Reference in New Issue
Block a user