Skip to content
Snippets Groups Projects
Commit 5a1675f6 authored by Katy Saintin's avatar Katy Saintin
Browse files

Update Irfu plugin with last DataBrowser version 1.3.3

parent eb39c415
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 739 additions and 729 deletions
DataBrowserPlugins/IrfuPlugin/lib/archappl_v0.0.1_SNAPSHOT_13-janvier-2022T15-19-35.jar 0 → 100644
+ 0
− 0
View file @ 5a1675f6
File added
DataBrowserPlugins/IrfuPlugin/lib/cdma-plugin-1.3.0.jar deleted 100644 → 0
+ 0
− 0
View file @ eb39c415
File deleted
DataBrowserPlugins/IrfuPlugin/lib/databrowser-core-1.3.0.jar deleted 100644 → 0
+ 0
− 0
View file @ eb39c415
File deleted
DataBrowserPlugins/IrfuPlugin/lib/databrowser-gui-1.3.0.jar deleted 100644 → 0
+ 0
− 0
View file @ eb39c415
File deleted
DataBrowserPlugins/IrfuPlugin/lib/fr.soleil.lib-BasicUtilities-1.3.6-5812.jar deleted 100644 → 0
+ 0
− 0
View file @ eb39c415
File deleted
DataBrowserPlugins/IrfuPlugin/lib/fr.soleil.lib.comete-CometeDefinition-2.5.1-5756.jar deleted 100644 → 0
+ 0
− 0
View file @ eb39c415
File deleted
DataBrowserPlugins/IrfuPlugin/lib/tango-plugin-1.3.0.jar deleted 100644 → 0
+ 0
− 0
View file @ eb39c415
File deleted
DataBrowserPlugins/IrfuPlugin/pom.xml
+ 104
− 92
View file @ 5a1675f6
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.cdma.gui</groupId>
<artifactId>databrowser</artifactId>
<version>1.3.3</version>
</parent>
<groupId>fr.cea.irfu</groupId> <groupId>fr.cea.irfu</groupId>
<artifactId>IrfuPlugin</artifactId> <artifactId>IrfuPlugin</artifactId>
<name>IrfuPlugin</name> <name>IrfuPlugin</name>
<version>1.3.0</version> <version>1.3.3</version>
<scm> <scm>
<connection>scm:svn:http://svn.code.sf.net/p/cometeapps/code/DataBrowser/branches/cea/DataBrowserPlugins/IrfuPlugin</connection> <connection>scm:svn:http://svn.code.sf.net/p/cometeapps/code/DataBrowser/branches/cea/DataBrowserPlugins/IrfuPlugin</connection>
...@@ -14,157 +21,162 @@ ...@@ -14,157 +21,162 @@
</scm> </scm>
<dependencies> <dependencies>
<!-- DataBrowser tool dependency -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
</dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>DockingCore</artifactId>
</dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>DockingInfoNode</artifactId>
</dependency>
<dependency>
<groupId>fr.soleil.lib.comete</groupId>
<artifactId>CDMADataSource</artifactId>
</dependency>
<dependency>
<groupId>org.cdma.gui</groupId>
<artifactId>cdma-plugin</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.cdma.gui</groupId>
<artifactId>databrowser-core</artifactId>
</dependency>
<dependency>
<groupId>org.cdma.gui</groupId>
<artifactId>databrowser-gui</artifactId>
</dependency>
<dependency>
<groupId>org.cdma</groupId>
<artifactId>core</artifactId>
</dependency>
<dependency>
<groupId>org.cdma.engine</groupId>
<artifactId>hdf</artifactId>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.7.RC1</version>
</dependency>
<dependency>
<groupId>fr.soleil.lib.comete</groupId>
<artifactId>CometeSwing</artifactId>
</dependency>
<dependency>
<groupId>fr.soleil.lib.comete</groupId>
<artifactId>CometeBox</artifactId>
</dependency>
<dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swingx</artifactId>
</dependency>
<!-- MOONArch library --> <!-- MOONArch library -->
<dependency> <dependency>
<groupId>heps.epics</groupId> <groupId>heps.epics</groupId>
<artifactId>moonarch-appliance</artifactId> <artifactId>moonarch-appliance</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.cdma.gui</groupId> <groupId>org.epics.archiverappliance</groupId>
<artifactId>databrowser-core</artifactId> <artifactId>archiving-appliance</artifactId>
<version>1.3.0</version> <version>0.0.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/archappl_v0.0.1_SNAPSHOT_13-janvier-2022T15-19-35.jar</systemPath>
</dependency>
<!-- edu.stanford.slac.archiverappliance.PlainPB -->
<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.4.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.epics</groupId>
<artifactId>epics-pvdata</artifactId>
<version>6.1.1</version>
</dependency> </dependency>
<!-- comete https://svn.code.sf.net/p/comete/ --> <!-- comete https://svn.code.sf.net/p/comete/ -->
<dependency> <dependency>
<groupId>fr.soleil.lib.comete</groupId> <groupId>fr.soleil.lib.comete</groupId>
<artifactId>CometeDefinition</artifactId> <artifactId>CometeDefinition</artifactId>
<version>2.5.1-5756</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/fr.soleil.lib.comete-CometeDefinition-2.5.1-5756.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>fr.soleil.lib</groupId> <groupId>fr.soleil.lib</groupId>
<artifactId>BasicUtilities</artifactId> <artifactId>BasicUtilities</artifactId>
<version>1.3.6-5812</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/fr.soleil.lib-BasicUtilities-1.3.6-5812.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>fr.soleil.lib</groupId> <groupId>fr.soleil.lib</groupId>
<artifactId>DataConnectionManagement</artifactId> <artifactId>DataConnectionManagement</artifactId>
<version>1.3.2-5816</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/fr.soleil.lib-DataConnectionManagement-1.3.2-5816.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.comm</groupId> <groupId>javax.comm</groupId>
<artifactId>commapi</artifactId> <artifactId>commapi</artifactId>
<version>2.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>heps.muscade</groupId> <groupId>heps.muscade</groupId>
<artifactId>muscade-clientapi</artifactId> <artifactId>muscade-clientapi</artifactId>
<version>3.3.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>heps.commons</groupId> <groupId>heps.commons</groupId>
<artifactId>heps-util</artifactId> <artifactId>heps-util</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>heps.commons</groupId> <groupId>heps.commons</groupId>
<artifactId>heps-net</artifactId> <artifactId>heps-net</artifactId>
<version>2.0.2</version>
</dependency> </dependency>
<!-- <Epics api> --> <!-- <Epics api> -->
<!-- plc portal parser to get constant --> <!-- plc portal parser to get constant -->
<dependency> <dependency>
<groupId>heps.epics</groupId> <groupId>heps.epics</groupId>
<artifactId>plcparser</artifactId> <artifactId>plcparser</artifactId>
<version>2.2.1</version> <version>2.2.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-examples</artifactId>
</exclusion>
<exclusion>
<groupId>org.jxls</groupId>
<artifactId>jxls</artifactId>
</exclusion>
<exclusion>
<groupId>org.jxls</groupId>
<artifactId>jxls-poi</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-excelant</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
</exclusion>
<exclusion>
<groupId>org.jdesktop.swingx</groupId>
<artifactId>swingx</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>heps.epics</groupId> <groupId>heps.epics</groupId>
<artifactId>CafeJava</artifactId> <artifactId>CafeJava</artifactId>
<version>0.0.3-SNAPSHOT</version> <version>0.0.7</version>
<exclusions>
<exclusion>
<groupId>org.jdesktop.swingx</groupId>
<artifactId>swingx</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.epics</groupId> <groupId>org.epics</groupId>
<artifactId>caj</artifactId> <artifactId>caj</artifactId>
<version>1.1.15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.swinglabs.swingx</groupId> <groupId>org.swinglabs</groupId>
<artifactId>swingx-all</artifactId> <artifactId>swingx</artifactId>
<version>1.6.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
<distributionManagement>
<repository>
<id>irfulxsis1-deploy</id>
<name>LDISC shared export</name>
<url>scp://irfulxsis1/home/data/mnt/maven/ldisc-shared</url>
</repository>
<snapshotRepository>
<id>irfulxsis1-deploy</id>
<name>LDISC shared export</name>
<uniqueVersion>true</uniqueVersion>
<url>scp://irfulxsis1/home/data/mnt/maven/ldisc-shared</url>
</snapshotRepository>
</distributionManagement>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
</project> </project>
\ No newline at end of file
DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java
+ 218
− 218
View file @ 5a1675f6
...@@ -30,7 +30,8 @@ import heps.epics.ca.interfaces.IRecord; ...@@ -30,7 +30,8 @@ import heps.epics.ca.interfaces.IRecord;
import heps.epics.ca.interfaces.ISimpleRecord; import heps.epics.ca.interfaces.ISimpleRecord;
import heps.epics.ca.interfaces.IocEvent; import heps.epics.ca.interfaces.IocEvent;
public class EpicsDataSourceProducer implements IDataSourceProducer, IConstantSourceProducer, ICafeProcessVariableListener { public class EpicsDataSourceProducer
implements IDataSourceProducer, IConstantSourceProducer, ICafeProcessVariableListener {
public static final String EPICS_ID = "EPICS_ID"; public static final String EPICS_ID = "EPICS_ID";
private static final Map<IKey, AbstractEpicsDataSource<?>> dataSourceMap = new HashMap<IKey, AbstractEpicsDataSource<?>>(); private static final Map<IKey, AbstractEpicsDataSource<?>> dataSourceMap = new HashMap<IKey, AbstractEpicsDataSource<?>>();
...@@ -179,8 +180,7 @@ public class EpicsDataSourceProducer implements IDataSourceProducer, IConstantSo ...@@ -179,8 +180,7 @@ public class EpicsDataSourceProducer implements IDataSourceProducer, IConstantSo
if (readValue != null && readValue.length > 0) { if (readValue != null && readValue.length > 0) {
valueMap.put(message, readValue); valueMap.put(message, readValue);
} }
} } else {
else {
Object readValue = ((ICafeProcessVariable<?>) source).getValue(); Object readValue = ((ICafeProcessVariable<?>) source).getValue();
valueMap.put(message, readValue); valueMap.put(message, readValue);
} }
......
DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java
+ 26
− 27
View file @ 5a1675f6
...@@ -36,7 +36,6 @@ public class EpicsIntegerDataSource extends AbstractEpicsDataSource<Integer> { ...@@ -36,7 +36,6 @@ public class EpicsIntegerDataSource extends AbstractEpicsDataSource<Integer> {
return value; return value;
} }
public String getFormat() { public String getFormat() {
return "%5d"; return "%5d";
} }
......
DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java
+ 161
− 160
View file @ 5a1675f6
...@@ -108,7 +108,8 @@ public class EpicsKey extends IrfuKey { ...@@ -108,7 +108,8 @@ public class EpicsKey extends IrfuKey {
// Can take a while and freeze the application // Can take a while and freeze the application
RecordType recordType = record.getRecordType(); RecordType recordType = record.getRecordType();
// System.out.println("recordType=" + recordType); // System.out.println("recordType=" + recordType);
dataType = recordType == RecordType.waveForm ? org.cdma.gui.databrowser.interfaces.DataType.SPECTRUM : org.cdma.gui.databrowser.interfaces.DataType.SCALAR; dataType = recordType == RecordType.waveForm ? org.cdma.gui.databrowser.interfaces.DataType.SPECTRUM
: org.cdma.gui.databrowser.interfaces.DataType.SCALAR;
} catch (Exception e) { } catch (Exception e) {
dataType = org.cdma.gui.databrowser.interfaces.DataType.SCALAR; dataType = org.cdma.gui.databrowser.interfaces.DataType.SCALAR;
} }
......
DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java
+ 26
− 27
View file @ 5a1675f6
...@@ -36,7 +36,6 @@ public class EpicsShortDataSource extends AbstractEpicsDataSource<Short> { ...@@ -36,7 +36,6 @@ public class EpicsShortDataSource extends AbstractEpicsDataSource<Short> {
return value; return value;
} }
public String getFormat() { public String getFormat() {
return "%5d"; return "%5d";
} }
......
DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsStringDataSource.java
+ 17
− 18
View file @ 5a1675f6
...@@ -26,7 +26,6 @@ public class EpicsStringDataSource extends AbstractEpicsDataSource<String> { ...@@ -26,7 +26,6 @@ public class EpicsStringDataSource extends AbstractEpicsDataSource<String> {
return value; return value;
} }
public String getFormat() { public String getFormat() {
return null; return null;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

The place to be for your source code