Changeset 13258 for stable/HeuristicLab.Optimization.Views/3.3

Timestamp:

11/18/15 16:33:27 (8 years ago)

Author:

jkarder

Message:

#2116: merged r13014, r13244 and r13245 into stable

Location:

stable/HeuristicLab.Optimization.Views/3.3

Files:

• EngineAlgorithmView.Designer.cs (modified) (5 diffs)
• EngineAlgorithmView.cs (modified) (1 diff)
• UserDefinedAlgorithmView.Designer.cs (modified) (1 diff)
• UserDefinedAlgorithmView.cs (modified) (1 diff)

stable/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

@@ -50 +50 @@
       this.engineViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
-      this.openOperatorGraphButton = new System.Windows.Forms.Button();
-      this.newOperatorGraphButton = new System.Windows.Forms.Button();
-      this.operatorGraphViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.operatorGraphViewHost = new HeuristicLab.Core.Views.BreadcrumbViewHost();
       this.tabControl.SuspendLayout();
       this.parametersTabPage.SuspendLayout();
@@ -219 +217 @@
       // operatorGraphTabPage
       // 
-      this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton);
-      this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton);
       this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
       this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
@@ -229 +225 @@
       this.operatorGraphTabPage.UseVisualStyleBackColor = true;
       // 
-      // openOperatorGraphButton
-      // 
-      this.openOperatorGraphButton.Enabled = false;
-      this.openOperatorGraphButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
-      this.openOperatorGraphButton.Location = new System.Drawing.Point(33, 3);
-      this.openOperatorGraphButton.Name = "openOperatorGraphButton";
-      this.openOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
-      this.openOperatorGraphButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
-      this.openOperatorGraphButton.UseVisualStyleBackColor = true;
-      // 
-      // newOperatorGraphButton
-      // 
-      this.newOperatorGraphButton.Enabled = false;
-      this.newOperatorGraphButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewDocument;
-      this.newOperatorGraphButton.Location = new System.Drawing.Point(3, 3);
-      this.newOperatorGraphButton.Name = "newOperatorGraphButton";
-      this.newOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
-      this.newOperatorGraphButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
-      this.newOperatorGraphButton.UseVisualStyleBackColor = true;
-      // 
       // operatorGraphViewHost
       // 
@@ -258 +232 @@
       this.operatorGraphViewHost.Caption = "View";
       this.operatorGraphViewHost.Content = null;
+      this.operatorGraphViewHost.EnableBreadcrumbs = true;
       this.operatorGraphViewHost.Enabled = false;
-      this.operatorGraphViewHost.Location = new System.Drawing.Point(3, 33);
+      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 6);
       this.operatorGraphViewHost.Name = "operatorGraphViewHost";
       this.operatorGraphViewHost.ReadOnly = true;
-      this.operatorGraphViewHost.Size = new System.Drawing.Size(699, 431);
+      this.operatorGraphViewHost.ShowSingle = true;
+      this.operatorGraphViewHost.Size = new System.Drawing.Size(693, 455);
       this.operatorGraphViewHost.TabIndex = 0;
       this.operatorGraphViewHost.ViewsLabelVisible = true;
@@ -295 +271 @@
     protected HeuristicLab.MainForm.WindowsForms.ViewHost engineViewHost;
     protected System.Windows.Forms.TabPage operatorGraphTabPage;
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost operatorGraphViewHost;
-    protected System.Windows.Forms.Button openOperatorGraphButton;
-    protected System.Windows.Forms.Button newOperatorGraphButton;
+    protected HeuristicLab.Core.Views.BreadcrumbViewHost operatorGraphViewHost;
 
   }

stable/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs

@@ -95 +95 @@
       base.SetEnabledStateOfControls();
       engineViewHost.Enabled = Content != null;
-      newOperatorGraphButton.Enabled = false;
-      openOperatorGraphButton.Enabled = false;
       operatorGraphViewHost.Enabled = Content != null;
       operatorGraphViewHost.ReadOnly = true;

stable/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

@@ -65 +65 @@
       // 
       this.engineViewHost.Size = new System.Drawing.Size(693, 402);
-      // 
-      // openOperatorGraphButton
-      // 
-      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
-      this.openOperatorGraphButton.Click += new System.EventHandler(openOperatorGraphButton_Click);
-      // 
-      // newOperatorGraphButton
-      // 
-      this.toolTip.SetToolTip(this.newOperatorGraphButton, "New Operator Graph");
-      this.newOperatorGraphButton.Click += new System.EventHandler(newOperatorGraphButton_Click);
       // 
       // tabControl

stable/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.cs

@@ -57 +57 @@
       base.SetEnabledStateOfControls();
       globalScopeView.Enabled = Content != null;
-      newOperatorGraphButton.Enabled = Content != null && !ReadOnly;
-      openOperatorGraphButton.Enabled = Content != null && !ReadOnly;
       operatorGraphViewHost.ReadOnly = Content == null || ReadOnly;
-    }
-
-    private void newOperatorGraphButton_Click(object sender, EventArgs e) {
-      Content.OperatorGraph = new OperatorGraph();
-    }
-    private void openOperatorGraphButton_Click(object sender, EventArgs e) {
-      openFileDialog.Title = "Open Operator Graph";
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = false;
-        operatorGraphViewHost.Enabled = false;
-
-        ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
-          try {
-            if (error != null) throw error;
-            OperatorGraph operatorGraph = content as OperatorGraph;
-            if (operatorGraph == null)
-              MessageBox.Show(this, "The selected file does not contain an operator graph.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            else
-              Content.OperatorGraph = operatorGraph;
-          }
-          catch (Exception ex) {
-            ErrorHandling.ShowErrorDialog(this, ex);
-          }
-          finally {
-            Invoke(new Action(delegate() {
-              operatorGraphViewHost.Enabled = true;
-              newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = true;
-            }));
-          }
-        });
-      }
     }
   }