fda/ch.psi.fda.ui
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgraded to new FDA version ...

Browse Source
This commit is contained in:
ebner
2014-01-20 13:58:05 +01:00
parent 6149f95eed
commit a4ffeee271
3 changed files with 19 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fda.ui.ee/pom.xml
View File

@@ -87,7 +87,7 @@
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda</artifactId>
<version>2.0.1</version>
<version>2.0.4</version>
<type>jar</type>
</dependency>
</dependencies>

18
fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/Installer.java
View File

@@ -40,14 +40,7 @@ public class Installer extends ModuleInstall {
ApplicationConfigurator c = new ApplicationConfigurator();
c.initializeApplication();
// try {
Configuration.getInstance().getConfiguration().loadConfiguration();
// new AcquisitionConfiguration().loadConfiguration();
// JcaeProperties.getInstance().loadProperties();
// } catch (IOException ex) {
// Exceptions.printStackTrace(ex);
// }
// Configuration.getInstance().getConfiguration().loadConfiguration();
// Register a change listener to reconfigure scan engine when the home directory changes
p.addPropertyChangeListener(new PropertyChangeListener() {
@@ -56,16 +49,11 @@ public class Installer extends ModuleInstall {
public void propertyChange(PropertyChangeEvent pce) {
File h = (File) pce.getNewValue();
System.setProperty(ApplicationConfigurator.FDA_HOME_ARGUMENT, h.getAbsolutePath());
ApplicationConfigurator c = new ApplicationConfigurator();
c.initializeApplication();
// try {
Configuration.getInstance().getConfiguration().loadConfiguration();
// JcaeProperties.getInstance().loadProperties();
// } catch (IOException ex) {
// Exceptions.printStackTrace(ex);
// }
// Configuration.getInstance().getConfiguration().loadConfiguration();
}
});

59
fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleConversionService.java
View File

@@ -16,19 +16,20 @@
*/
package ch.psi.fda.ui.ee;
import ch.psi.fda.deserializer.DataDeserializer;
import ch.psi.fda.deserializer.DataDeserializerMDA;
import ch.psi.fda.deserializer.DataDeserializerTXT;
import ch.psi.fda.serializer.DataSerializer;
import ch.psi.fda.serializer.DataSerializerMAT;
import ch.psi.fda.serializer.DataSerializerMAT2D;
import ch.psi.fda.serializer.DataSerializerMAT2DZigZag;
import ch.psi.fda.serializer.DataSerializerMDA;
import ch.psi.fda.serializer.DataSerializerTXT;
import ch.psi.fda.serializer.DataSerializerTXT2D;
import ch.psi.fda.serializer.DataSerializerTXTSplit;
import ch.psi.fda.ConversionMain;
//import ch.psi.fda.deserializer.DataDeserializer;
//import ch.psi.fda.deserializer.DataDeserializerMDA;
//import ch.psi.fda.deserializer.DataDeserializerTXT;
//import ch.psi.fda.serializer.DataSerializer;
//import ch.psi.fda.serializer.DataSerializerMAT;
//import ch.psi.fda.serializer.DataSerializerMAT2D;
//import ch.psi.fda.serializer.DataSerializerMAT2DZigZag;
//import ch.psi.fda.serializer.DataSerializerMDA;
//import ch.psi.fda.serializer.DataSerializerTXT;
//import ch.psi.fda.serializer.DataSerializerTXT2D;
//import ch.psi.fda.serializer.DataSerializerTXTSplit;
import ch.psi.fda.ui.ee.api.ConversionService;
import com.google.common.eventbus.EventBus;
//import com.google.common.eventbus.EventBus;
import java.io.File;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -50,39 +51,9 @@ public class SimpleConversionService implements ConversionService {
try {
Logger.getLogger(SimpleConversionService.class.getName()).log(Level.INFO, "Convert file {0} from {1} to {2}", new Object[]{input.getAbsolutePath(), reader, writer});
EventBus ebus = new EventBus();
// Create deserializer
final DataDeserializer deserializer;
if (reader.equals(Reader.TXT)) {
deserializer = new DataDeserializerTXT(ebus, input);
} else if (reader.equals(Reader.MDA)) {
deserializer = new DataDeserializerMDA(ebus, input);
} else {
throw new IllegalArgumentException("Reader of type " + reader + " not supported.");
}
final DataSerializer serializer;
if (writer.equals(Writer.MAT)) {
serializer = new DataSerializerMAT(output);
} else if (writer.equals(Writer.MAT_2D)) {
serializer = new DataSerializerMAT2D(output);
} else if (writer.equals(Writer.TXT)) {
serializer = new DataSerializerTXT(output, false);
} else if (writer.equals(Writer.TXT_2D)) {
serializer = new DataSerializerTXT2D(output);
} else if (writer.equals(Writer.TXT_SPLIT)) {
serializer = new DataSerializerTXTSplit(output);
} else if (writer.equals(Writer.MDA)) {
serializer = new DataSerializerMDA(output);
} else if (writer.equals(Writer.MAT_2D_Z)) {
serializer = new DataSerializerMAT2DZigZag(output);
} else {
throw new IllegalArgumentException("Writer of type " + writer + " not supported.");
}
ebus.register(serializer);
deserializer.read();
ConversionMain c = new ConversionMain();
c.convert(input, output, ConversionMain.Reader.values()[reader.ordinal()], ConversionMain.Writer.values()[writer.ordinal()]);
} catch (Exception e) {
// Inform the user without waiting for its response