Changeset 13258

Timestamp:

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

Author:

jkarder

Message:

#2116: merged r13014, r13244 and r13245 into stable

Location:

stable

Files:

• HeuristicLab.Core.Views/3.3/BreadcrumbViewHost.Designer.cs (added)
• HeuristicLab.Core.Views/3.3/BreadcrumbViewHost.cs (added)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (3 diffs)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.cs (modified) (1 diff)

stable/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -123 +123 @@
   <ItemGroup>
     <None Include="Plugin.cs.frame" />
+    <Compile Include="BreadcrumbViewHost.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="BreadcrumbViewHost.Designer.cs">
+      <DependentUpon>BreadcrumbViewHost.cs</DependentUpon>
+    </Compile>
     <Compile Include="CheckedItemCollectionView.cs">
       <SubType>UserControl</SubType>

stable/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

@@ -129 +129 @@
     #endregion
 
-    private System.Windows.Forms.Label viewsLabel;
+    protected System.Windows.Forms.Label viewsLabel;
     private System.Windows.Forms.Label messageLabel;
     private System.Windows.Forms.ToolTip toolTip;

stable/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -29 +29 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   [Content(typeof(IContent))]
-  public sealed partial class ViewHost : AsynchronousContentView {
+  public partial class ViewHost : AsynchronousContentView {
     public ViewHost() {
       InitializeComponent();
@@ -93 +93 @@
             if (view != null) {
               view.Visible = true;
-              if (ViewsLabelVisible) {
-                view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
-                view.Size = new Size(Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
-              } else view.Dock = DockStyle.Fill;
+              ConfigureViewLayout(view);
               if (!Controls.Contains((view))) Controls.Add(view);
               view.OnShown(new ViewShownEventArgs(view, false));
@@ -108 +105 @@
         }
       }
+    }
+
+    protected virtual void ConfigureViewLayout(View view) {
+      if (ViewsLabelVisible) {
+        view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
+        view.Size = new Size(Width - viewsLabel.Width - viewsLabel.Margin.Left - viewsLabel.Margin.Right, Height);
+      } else view.Dock = DockStyle.Fill;
     }
 

stable/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.Designer.cs

@@ -61 +61 @@
       this.selectButton = new System.Windows.Forms.Button();
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
-      this.detailsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.detailsViewHost = new HeuristicLab.Core.Views.BreadcrumbViewHost();
       this.buttonToolTip = new System.Windows.Forms.ToolTip(this.components);
       this.shapeContextMenu.SuspendLayout();
@@ -235 +235 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.detailsViewHost.Content = null;
+      this.detailsViewHost.EnableBreadcrumbs = true;
       this.detailsViewHost.Location = new System.Drawing.Point(3, 16);
       this.detailsViewHost.Name = "detailsViewHost";
@@ -270 +271 @@
     private System.Windows.Forms.SplitContainer splitContainer;
     private System.Windows.Forms.GroupBox detailsGroupBox;
-    private HeuristicLab.MainForm.WindowsForms.ViewHost detailsViewHost;
+    private HeuristicLab.Core.Views.BreadcrumbViewHost detailsViewHost;
     private System.Windows.Forms.Button selectButton;
     private System.Windows.Forms.Button zoomOutButton;

stable/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -140 +141 @@
           if (shapeInfo != null) {
             IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
-            IContentView view = MainFormManager.MainForm.ShowContent(op);
-            if (view != null) {
-              view.ReadOnly = this.ReadOnly;
-              view.Locked = this.Locked;
+            IOperatorGraphOperator graphOp = op as IOperatorGraphOperator;
+
+            Control c = this;
+            BreadcrumbViewHost vh;
+
+            do {
+              c = c.Parent;
+              vh = c as BreadcrumbViewHost;
+            } while ((vh == null || !vh.EnableBreadcrumbs) && c != null);
+
+            if (graphOp != null && vh != null) {
+              vh.AddBreadcrumbs(vh.Content);
+              vh.AddBreadcrumb(graphOp.Name, graphOp.OperatorGraph);
+              vh.Content = graphOp.OperatorGraph;
+              vh.ReadOnly = ReadOnly;
+              vh.Locked = Locked;
+            } else {
+              IContentView view = MainFormManager.MainForm.ShowContent(op);
+              if (view != null) {
+                view.ReadOnly = ReadOnly;
+                view.Locked = Locked;
+              }
             }
+
             HandledMouseEventArgs eventArgs = e as HandledMouseEventArgs;
             if (eventArgs != null)

stable/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]

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;
-            }));
-          }
-        });
-      }
     }
   }