Changeset 16529 for branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable.Views

Timestamp:

01/10/19 15:40:44 (6 years ago)

Author:

gkronber

Message:

#2520: merged r16491:16528 from trunk to persistence branch

Location:

branches/2520_PersistenceReintegration

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs (modified) (7 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.Designer.cs

@@ -94 +94 @@
       // tabPage2
       // 
+      this.tabPage2.BackColor = System.Drawing.SystemColors.Window;
       this.tabPage2.Controls.Add(this.splitContainer1);
       this.tabPage2.Location = new System.Drawing.Point(4, 22);
@@ -101 +102 @@
       this.tabPage2.TabIndex = 1;
       this.tabPage2.Text = "Code";
-      this.tabPage2.UseVisualStyleBackColor = true;
       // 
       // splitContainer1
@@ -248 +248 @@
       // tabPage1
       // 
+      this.tabPage1.BackColor = System.Drawing.SystemColors.Window;
       this.tabPage1.Controls.Add(this.parameterCollectionView);
       this.tabPage1.Location = new System.Drawing.Point(4, 22);
@@ -255 +256 @@
       this.tabPage1.TabIndex = 0;
       this.tabPage1.Text = "Parameters";
-      this.tabPage1.UseVisualStyleBackColor = true;
       // 
       // parameterCollectionView

branches/2520_PersistenceReintegration/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs

@@ -83 +83 @@
       if (ProgrammableOperator == null) {
         codeEditor.UserCode = string.Empty;
+        codeEditor.ClearEditHistory();
         assembliesTreeView.Nodes.Clear();
         parameterCollectionView.Content = null;
@@ -91 +92 @@
         if (codeEditor.UserCode == string.Empty)
           codeEditor.UserCode = string.Format("    {0}", Environment.NewLine);
+        codeEditor.ClearEditHistory();
         InitializeAssemblyList();
         InitializeNamespacesList();
@@ -98 +100 @@
         showCodeButton.Enabled = !string.IsNullOrEmpty(ProgrammableOperator.CompilationUnitCode);
         parameterCollectionView.Content = ProgrammableOperator.Parameters;
-        if (ProgrammableOperator.CompileErrors == null) {
-          compilationLabel.ForeColor = SystemColors.ControlDarkDark;
-          compilationLabel.Text = "Not compiled";
-        } else if (ProgrammableOperator.CompileErrors.HasErrors) {
-          compilationLabel.ForeColor = Color.DarkRed;
-          compilationLabel.Text = "Compilation failed";
-        } else {
-          compilationLabel.ForeColor = Color.DarkGreen;
-          compilationLabel.Text = "Compilation successful";
-        }
-
+      }
+      UpdateCompilationLabel();
+    }
+
+    private void UpdateCompilationLabel() {
+      if (ProgrammableOperator == null || ProgrammableOperator.CompileErrors == null) {
+        compilationLabel.ForeColor = SystemColors.ControlDarkDark;
+        compilationLabel.Text = "Not compiled";
+      } else if (ProgrammableOperator.CompileErrors.HasErrors) {
+        compilationLabel.ForeColor = Color.DarkRed;
+        compilationLabel.Text = "Compilation failed";
+      } else {
+        compilationLabel.ForeColor = Color.DarkGreen;
+        compilationLabel.Text = "Compilation successful";
       }
     }
@@ -158 +163 @@
       }
       InitializeNamespacesList();
-      codeEditor.Prefix = GetGeneratedPrefix();
     }
     private void namespacesTreeView_AfterCheck(object sender, TreeViewEventArgs e) {
@@ -168 +172 @@
         ProgrammableOperator.UnselectNamespace(e.Node.FullPath);
       }
-      codeEditor.Prefix = GetGeneratedPrefix();
     }
     #endregion
@@ -190 +193 @@
     private string GetGeneratedPrefix() {
       StringBuilder prefix = new StringBuilder();
-      foreach (var ns in ProgrammableOperator.GetSelectedAndValidNamespaces()) {
-        prefix.Append("using ").Append(ns).AppendLine(";");
-      }
-      prefix.AppendLine();
       prefix.Append("public class ").Append(ProgrammableOperator.CompiledTypeName).AppendLine(" {");
       prefix.Append("  ").Append(ProgrammableOperator.Signature).AppendLine(" {");
@@ -203 +202 @@
       try {
         ProgrammableOperator.Compile();
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog(this, ex);
       }
-      OnContentChanged();
       this.Enabled = true;
+      UpdateCompilationLabel();
+      codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors);
     }