Changeset 13244

Timestamp:

11/18/15 12:30:56 (9 years ago)

Author:

jkarder

Message:

#2116: worked on breadcrumb navigation

• OperatorGraphView now checks for IOperatorGraphOperator instead of AlgorithmOperator
• removed breadcrumbs from collection views

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -277 +277 @@
         T item = itemsListView.SelectedItems[0].Tag as T;
         if (item != null) {
-          Control c = this;
-          BreadcrumbViewHost bcvh;
-
-          do {
-            c = c.Parent;
-            bcvh = c as BreadcrumbViewHost;
-          } while ((bcvh == null || !bcvh.EnableBreadcrumbs) && c != null);
-
-          if (bcvh != null) {
-            bcvh.AddBreadcrumbs(bcvh.Content);
-            bcvh.AddBreadcrumbs(item);
-            bcvh.Content = item;
-            bcvh.ReadOnly = ReadOnly;
-            bcvh.Locked = Locked;
-          } else {
-            IContentView view = MainFormManager.MainForm.ShowContent(item);
-            if (view != null) {
-              view.ReadOnly = ReadOnly;
-              view.Locked = Locked;
-            }
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly;
+            view.Locked = Locked;
           }
         }

trunk/sources/HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs

@@ -27 +27 @@
 using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Core.Views {
@@ -155 +154 @@
         IParameter item = itemsListView.SelectedItems[0].Tag as IParameter;
         if (item != null) {
-          Control c = this;
-          BreadcrumbViewHost bcvh;
-
-          do {
-            c = c.Parent;
-            bcvh = c as BreadcrumbViewHost;
-          } while ((bcvh == null || !bcvh.EnableBreadcrumbs) && c != null);
-
-          if (bcvh != null) {
-            bcvh.AddBreadcrumbs(bcvh.Content);
-            bcvh.AddBreadcrumbs(item);
-            bcvh.Content = item;
-            bcvh.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
-            bcvh.Locked = Locked;
-          } else {
-            IContentView view = MainFormManager.MainForm.ShowContent(item);
-            if (view != null) {
-              view.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
-              view.Locked = Locked;
-            }
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
+          if (view != null) {
+            view.ReadOnly = ReadOnly || (item.Hidden && !AllowEditingOfHiddenParameters);
+            view.Locked = Locked;
           }
         }

trunk/sources/HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.parameterCollectionView = new HeuristicLab.Core.Views.BreadcrumbViewHost();
+      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -72 +72 @@
       this.parameterCollectionView.Size = new System.Drawing.Size(490, 327);
       this.parameterCollectionView.TabIndex = 3;
-      this.parameterCollectionView.ViewsLabelVisible = false;
       // 
       // ParameterizedNamedItemView
@@ -93 +92 @@
     #endregion
 
-    protected HeuristicLab.Core.Views.BreadcrumbViewHost parameterCollectionView;
+    protected ParameterCollectionView parameterCollectionView;
 
   }

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs

@@ -141 +141 @@
           if (shapeInfo != null) {
             IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
-            AlgorithmOperator algOp = op as AlgorithmOperator;
+            IOperatorGraphOperator graphOp = op as IOperatorGraphOperator;
 
             Control c = this;
@@ -151 +151 @@
             } while ((vh == null || !vh.EnableBreadcrumbs) && c != null);
 
-            if (algOp != null && vh != null) {
+            if (graphOp != null && vh != null) {
               vh.AddBreadcrumbs(vh.Content);
-              vh.AddBreadcrumb(algOp.Name, algOp.OperatorGraph);
-              vh.Content = algOp.OperatorGraph;
+              vh.AddBreadcrumb(graphOp.Name, graphOp.OperatorGraph);
+              vh.Content = graphOp.OperatorGraph;
               vh.ReadOnly = ReadOnly;
               vh.Locked = Locked;

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs

@@ -41 +41 @@
       this.newProblemButton = new System.Windows.Forms.Button();
       this.parametersTabPage = new System.Windows.Forms.TabPage();
-      this.parameterCollectionView = new HeuristicLab.Core.Views.BreadcrumbViewHost();
+      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
       this.resultsTabPage = new System.Windows.Forms.TabPage();
       this.resultsView = new HeuristicLab.Optimization.Views.ResultCollectionView();
@@ -179 +179 @@
       // parameterCollectionView
       // 
+      this.parameterCollectionView.AllowEditingOfHiddenParameters = true;
       this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
@@ -184 +185 @@
       this.parameterCollectionView.Caption = "ParameterCollection View";
       this.parameterCollectionView.Content = null;
-      this.parameterCollectionView.EnableBreadcrumbs = true;
       this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
       this.parameterCollectionView.Name = "parameterCollectionView";
@@ -190 +190 @@
       this.parameterCollectionView.Size = new System.Drawing.Size(659, 388);
       this.parameterCollectionView.TabIndex = 0;
-      this.parameterCollectionView.ViewsLabelVisible = false;
       // 
       // resultsTabPage
@@ -298 +297 @@
     protected System.Windows.Forms.TabPage parametersTabPage;
     protected System.Windows.Forms.TabPage problemTabPage;
-    protected HeuristicLab.Core.Views.BreadcrumbViewHost parameterCollectionView;
+    protected HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
     protected HeuristicLab.MainForm.WindowsForms.ViewHost problemViewHost;
     protected System.Windows.Forms.Button newProblemButton;

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -88 +88 @@
       } else {
         parameterCollectionView.Content = Content.Parameters;
-        var view = parameterCollectionView.ActiveView as ParameterCollectionView;
-        if (view != null) view.AllowEditingOfHiddenParameters = true;
         problemViewHost.ViewType = null;
         problemViewHost.Content = Content.Problem;

trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs

@@ -58 +58 @@
       // parameterCollectionView
       // 
-      this.parameterCollectionView.EnableBreadcrumbs = true;
       this.parameterCollectionView.Location = new System.Drawing.Point(6, 27);
       this.parameterCollectionView.Size = new System.Drawing.Size(501, 303);