Changeset 17436

Timestamp:

02/17/20 09:29:51 (5 years ago)

Author:

dpiringe

Message:

#3026:

• removed unnecessary code in FileManager
• updated ExportJsonDialog and Testprogram (Heuristiclab.ConfigStarter/Program.cs) to use the new GenerateTemplate method

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.OptimizerIntegration/FileManager.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs (modified) (3 diffs)
• Heuristiclab.ConfigStarter/Program.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/FileManager.cs

@@ -14 +14 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   internal static class FileManager {
-    private static SaveFileDialog saveFileDialog;
     private static OpenFileDialog openFileDialog;
     private static ExportJsonDialog exportDialog = new ExportJsonDialog();
@@ -26 +25 @@
     public static void ExportJsonTemplate(IContentView view) {
       // TODO: view to select free params, warning if no results are generated
-      
-
-
       IStorableContent content = view.Content as IStorableContent;
       if (!view.Locked && content != null) {
         exportDialog.Content = content;
         exportDialog.ShowDialog();
-        /*
-        if (saveFileDialog == null) {
-          saveFileDialog = new SaveFileDialog();
-          saveFileDialog.Title = "Export .json-Template";
-          saveFileDialog.DefaultExt = "json";
-          saveFileDialog.Filter = ".json-Template|*.json|All Files|*.*";
-          saveFileDialog.FilterIndex = 1;
-        }
-
-        INamedItem namedItem = content as INamedItem;
-        string suggestedFileName = string.Empty;
-        if (!string.IsNullOrEmpty(content.Filename)) suggestedFileName = content.Filename;
-        else if (namedItem != null) suggestedFileName = namedItem.Name;
-        else suggestedFileName = "Item";
-
-        saveFileDialog.FileName = suggestedFileName + " " + namedItem.GetType().Name;
-
-        if (saveFileDialog.ShowDialog() == DialogResult.OK) {
-          IAlgorithm alg = namedItem as IAlgorithm;
-          File.WriteAllText(saveFileDialog.FileName, JCGenerator.GenerateTemplate(alg));
-        }
-        */
       }
     }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs

@@ -22 +22 @@
     private IList<JsonItemVMBase> VMs { get; set; }
     private JCGenerator Generator { get; set; } = new JCGenerator();
-    private IDictionary<string, IJsonItem> ResultItems = new Dictionary<string, IJsonItem>();
+    private IDictionary<string, IJsonItem> ResultItems { get; set; } = new Dictionary<string, IJsonItem>();
 
     private IContent content;
@@ -33 +33 @@
         treeView.Nodes.Clear();
         ResultItems.Clear();
-        
+        resultItems.Items.Clear();
+
         Optimizer = content as IOptimizer;
         Root = JsonItemConverter.Extract(Optimizer);
@@ -93 +94 @@
 
       if (SaveFileDialog.ShowDialog() == DialogResult.OK) {
-        File.WriteAllText(SaveFileDialog.FileName, Generator.GenerateTemplate(Root, Optimizer));
+        Generator.GenerateTemplate(@"C:\Users\p41997\Desktop", "template", Optimizer, Root);
       }
 

branches/3026_IntegrationIntoSymSpace/Heuristiclab.ConfigStarter/Program.cs

@@ -46 +46 @@
 
       JCGenerator generator = new JCGenerator();
-
-      File.WriteAllText(@"C:\Workspace\Template.json", generator.GenerateTemplate(alg));
+      generator.GenerateTemplate(@"C:\Workspace\Template.json", alg);
       JsonTemplateInstantiator.Instantiate(@"C:\Workspace\Template.json");
       /*