Compare commits
1 Commits
zmq_stream
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| f12d75fe8f |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>ch.psi</groupId>
|
||||
<artifactId>fda.ui</artifactId>
|
||||
<version>3.5.0_zmq</version>
|
||||
<version>4.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>fda.ui.application</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>fda.ui</artifactId>
|
||||
<groupId>ch.psi</groupId>
|
||||
<version>3.5.0_zmq</version>
|
||||
<version>4.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>fda.ui.module</artifactId>
|
||||
@@ -117,7 +117,7 @@
|
||||
<dependency>
|
||||
<groupId>ch.psi</groupId>
|
||||
<artifactId>fda</artifactId>
|
||||
<version>2.5.1_zmq</version>
|
||||
<version>2.6.8</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@@ -172,7 +172,7 @@ public class SimpleExecutionService implements ExecutionService {
|
||||
@Override
|
||||
public boolean supportsFeature(String feature) {
|
||||
if(feature.equalsIgnoreCase("ch.psi.aq.feature.otfscan")){
|
||||
String prefix = ch.psi.fda.ui.ee.Configuration.getInstance().getConfiguration().getOtfChannelPrefix();
|
||||
String prefix = ch.psi.fda.ui.ee.Configuration.getInstance().getConfiguration().getCrlogicPrefix();
|
||||
if(prefix != null && !prefix.trim().equals("")){
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
CTL_MainWindow_Title=FDA 3.5.0 ZMQ
|
||||
CTL_MainWindow_Title_No_Project=FDA 3.5.0 ZMQ
|
||||
CTL_MainWindow_Title=FDA 4.0.0
|
||||
CTL_MainWindow_Title_No_Project=FDA 4.0.0
|
||||
|
||||
Reference in New Issue
Block a user