Changeset 10488 for trunk/sources/HeuristicLab.Optimizer

Timestamp:

02/20/14 15:34:31 (11 years ago)

Author:

gkronber

Message:

#2155: remove the progress bar only after the last sample has been loaded (otherwise an exception occurs if at least two samples cannot be loaded)

File:

• trunk/sources/HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -70 +70 @@
     private void LoadSamples(object state) {
       progress = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(samplesListView, "Loading...");
-      Assembly assembly = Assembly.GetExecutingAssembly();
-      var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(".hl"));
-      int count = samples.Count();
-      string path = Path.GetTempFileName();
+      try {
+        Assembly assembly = Assembly.GetExecutingAssembly();
+        var samples = assembly.GetManifestResourceNames().Where(x => x.EndsWith(".hl"));
+        int count = samples.Count();
+        string path = Path.GetTempFileName();
 
-      foreach (string name in samples) {
-        try {
-          using (Stream stream = assembly.GetManifestResourceStream(name)) {
-            WriteStreamToTempFile(stream, path);
-            INamedItem item = XmlParser.Deserialize<INamedItem>(path);
-            OnSampleLoaded(item, 1.0 / count);
+        foreach (string name in samples) {
+          try {
+            using (Stream stream = assembly.GetManifestResourceStream(name)) {
+              WriteStreamToTempFile(stream, path);
+              INamedItem item = XmlParser.Deserialize<INamedItem>(path);
+              OnSampleLoaded(item, 1.0 / count);
+            }
+          }
+          catch (Exception) {
           }
         }
-        catch (Exception) {
-          MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
-        }
+        OnAllSamplesLoaded();
       }
-      OnAllSamplesLoaded();
+      finally {
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
+      }
     }
     private void OnSampleLoaded(INamedItem sample, double progress) {
@@ -111 +115 @@
             samplesListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
         }
-        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
       }
     }