Merge branch 'dev/19_fixing_restore_MP_task_edf' into 'development'

#19 fixing crash on workspace restore when MP task exists, which decomposed edf file

See merge request brain/svarog2!208

Author: Marian Dovgialo

installer_builder/build/svarog_exe/Svarog.nsi

@@ -76,6 +76,35 @@ InstallDir "$PROGRAMFILES\Svarog"
 
 ######################################################################
 
+Section -SecUninstallPrevious
+
+    Call UninstallPrevious
+
+SectionEnd
+
+
+Function UninstallPrevious
+
+    ; Check for uninstaller.
+    ReadRegStr $R0 HKLM "${UNINSTALL_PATH}" "UninstallString"
+    DetailPrint "Uninstaller path $R0"
+    ${If} $R0 == ""
+        Goto Done
+    ${EndIf}
+
+    DetailPrint "Removing previous installation."
+
+    MessageBox MB_YESNO "Uninstall previous version?" IDYES true IDNO false
+    true:
+      ExecWait '"$R0" /S _?=$INSTDIR'
+      Goto Done
+    false:
+      Abort
+    ; Run the uninstaller silently.
+    Done:
+
+FunctionEnd
+
 Section -MainProgram
 ${INSTALL_TYPE}
 SetOverwrite ifnewer

svarog/src/main/java/org/signalml/app/view/document/opensignal/elements/SignalSourceTabbedPane.java

@@ -171,16 +171,11 @@ protected void autodetectFileTypeAndReadMetadata(File file) {
 		String extension = Util.getFileExtension(file, false);
 
 		if ("edf".equalsIgnoreCase(extension) || "d".equals(extension)){
-			String formatName = null;
-			if (extension.equalsIgnoreCase("edf")) {
-				formatName = "EDF";
-			}
-			else if (extension.equalsIgnoreCase("d")) {
-				formatName = "EASYS";
-			}
+			
 
 			SignalMLCodecManager codecManager = viewerElementManager.getCodecManager();
-			SignalMLCodec codec = codecManager.getCodecForFormat(formatName);
+			SignalMLCodec codec = codecManager.getCodecForFilename(file.toString());
+
 
 			if (codec == null) {
 				openSignalDescriptor = null;

svarog/src/main/java/org/signalml/codec/DefaultSignalMLCodecManager.java

@@ -56,6 +56,19 @@ public SignalMLCodec getCodecForFormat(String formatName) {
 			return codecsByFormatName.get(formatName);
 		}
 	}
+	
+	@Override
+	public SignalMLCodec getCodecForFilename(String filename) {
+		String extension = Util.getFileExtension(new File(filename), false);
+		String formatName = null;
+			if (extension.equalsIgnoreCase("edf")) {
+				formatName = "EDF";
+			}
+			else if (extension.equalsIgnoreCase("d")) {
+				formatName = "EASYS";
+			}
+		return getCodecForFormat(formatName);
+	}
 
 	@Override
 	public SignalMLCodec getCodecByUID(String uid) {

svarog/src/main/java/org/signalml/codec/SignalMLCodecManager.java

@@ -18,6 +18,7 @@ public interface SignalMLCodecManager {
 	int getCodecCount();
 	SignalMLCodec getCodecAt(int index);
 	SignalMLCodec getCodecForFormat(String formatName);
+	SignalMLCodec getCodecForFilename(String formatName);
 	SignalMLCodec getCodecByUID(String uid);
 	int getIndexOfCodec(SignalMLCodec codec);
 

svarog/src/main/java/org/signalml/domain/signal/SignalProcessingChain.java

@@ -117,12 +117,24 @@ public SignalProcessingChain(SignalProcessingChainDescriptor descriptor) throws
 		MRUDEntry mrud = descriptor.getDocument();
 
 		OriginalMultichannelSampleSource source = null;
-
+		// THIS CODE seems to run only on workspace recovery,
+		// when there are MP related tasks on the task list.
 		if (mrud instanceof SignalMLMRUDEntry) {
 
 			SignalMLMRUDEntry smlEntry = (SignalMLMRUDEntry) mrud;
-			String codecUID = smlEntry.getDescriptor().getCodecUID();
-			SignalMLCodec codec = SvarogApplication.getSharedInstance().getSignalMLCodecManager().getCodecByUID(codecUID);
+			SignalMLDescriptor smlEntryDescriptor = smlEntry.getDescriptor();
+			String codecUID = smlEntryDescriptor.getCodecUID();
+			SignalMLCodec codec;
+			if (codecUID == null)
+			{
+				//restoring non RAW format MP decomposition on start
+				codec = SvarogApplication.getSharedInstance().getSignalMLCodecManager().getCodecForFilename(smlEntry.getFileName());
+
+			}
+			else
+			{
+				codec = SvarogApplication.getSharedInstance().getSignalMLCodecManager().getCodecByUID(codecUID);
+			}
 			if (codec == null) {
 				logger.warn("Mrud codec not found for uid [" + codecUID + "]");
 				throw new MissingCodecException("error.mrudMissingCodecException");
@@ -132,18 +144,6 @@ public SignalProcessingChain(SignalProcessingChainDescriptor descriptor) throws
 			reader.open(smlEntry.getPath());
 
 			source = new SignalMLCodecSampleSource(reader);
-
-			SignalParameters signalParameters = smlEntry.getDescriptor().getSignalParameters();
-			if (source.isCalibrationCapable()) {
-				source.setCalibrationGain(signalParameters.getCalibrationGain());
-			}
-			if (!source.isSamplingFrequencyCapable()) {
-				source.setSamplingFrequency(signalParameters.getSamplingFrequency());
-			}
-			if (!source.isChannelCountCapable()) {
-				source.setChannelCount(signalParameters.getChannelCount());
-			}
-
 		}
 		else if (mrud instanceof RawSignalMRUDEntry) {