Changeset 16685 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views

Timestamp:

03/14/19 08:05:26 (6 years ago)

Author:

gkronber

Message:

#2971: merged r16658 from trunk to branch

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views

Files:

• . (modified) (1 prop)
• 3.4/Solution Views/DataAnalysisSolutionView.cs (modified) (4 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
 
@@ -126 +126 @@
       if (loadProblemDataFileDialog.ShowDialog(this) != DialogResult.OK) return;
       try {
-        object hlFile = XmlParser.Deserialize(loadProblemDataFileDialog.FileName);
+        var ser = new ProtoBufSerializer();
+        object hlFile = ser.Deserialize(loadProblemDataFileDialog.FileName);
 
         IDataAnalysisProblemData problemData = null;
@@ -145 +146 @@
           solution.Name += " with loaded problemData";
         MainFormManager.MainForm.ShowContent(solution);
-      }
-      catch (InvalidOperationException invalidOperationException) {
+      } catch (InvalidOperationException invalidOperationException) {
         ErrorHandling.ShowErrorDialog(this, invalidOperationException);
-      }
-      catch (ArgumentException argumentException) {
+      } catch (ArgumentException argumentException) {
         ErrorHandling.ShowErrorDialog(this, argumentException);
       }
@@ -235 +234 @@
         Content.Filename = string.Empty;
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().UpdateTitle();
-      }
-      catch (InvalidOperationException invalidOperationException) {
+      } catch (InvalidOperationException invalidOperationException) {
         ErrorHandling.ShowErrorDialog(this, invalidOperationException);
-      }
-      catch (ArgumentException argumentException) {
+      } catch (ArgumentException argumentException) {
         ErrorHandling.ShowErrorDialog(this, argumentException);
       }