Changeset 4435

Timestamp:

09/19/10 19:43:05 (14 years ago)

Author:

mkommend

Message:

Adjusted the SetEnabledStateOfControls method in all views, added the Enabled property into the IView interface and adapted the ViewHost, View and ContentView class (ticket #1155).

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/VariableValueView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/VariableValueView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/ContentView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/View.cs (modified) (3 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (4 diffs)
• HeuristicLab.MainForm/3.3/Interfaces/IView.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views/3.3/MultiOperatorView.cs (modified) (1 diff)
• HeuristicLab.Operators.Views/3.3/OperatorView.cs (modified) (1 diff)
• HeuristicLab.Operators.Views/3.3/ValuesCollectorView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ResultView.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionComparisonConstraintView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionEqualityConstraintView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionTabularView.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/ConstantView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/LaggedVariableView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/VariableView.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/PathTSPTourView.cs (modified) (1 diff)

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

@@ -182 +182 @@
         try {
           i++;
+          SetEnabledStateOfContentViews(item, false);
           XmlGenerator.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl", 9);
           OnItemSaved(item, progressBar.Maximum / listView.Items.Count);
@@ -192 +193 @@
       if (item != null) {
         if (InvokeRequired)
-          Invoke(new Action<T, int>(OnItemLoaded), item, progress);
-        else
+          Invoke(new Action<T, int>(OnItemSaved), item, progress);
+        else {
           progressBar.Value += progress;
+          SetEnabledStateOfContentViews(item, true);
+        }
       }
     }
@@ -203 +206 @@
         Enabled = true;
         infoPanel.Visible = false;
+      }
+    }
+
+    private void SetEnabledStateOfContentViews(IItem item, bool enabled) {
+      if (InvokeRequired)
+        Invoke((Action<IItem, bool>)SetEnabledStateOfContentViews, item, enabled);
+      else {
+        var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == item).ToList();
+        views.ForEach(v => v.Enabled = enabled);
       }
     }

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.valuePanel = new System.Windows.Forms.Panel();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.valuePanel.SuspendLayout();
       this.SuspendLayout();
-      // 
-      // valuePanel
-      // 
-      this.valuePanel.AllowDrop = true;
-      this.valuePanel.Controls.Add(this.viewHost);
-      this.valuePanel.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.valuePanel.Location = new System.Drawing.Point(0, 0);
-      this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(359, 274);
-      this.valuePanel.TabIndex = 0;
-      this.valuePanel.DragOver += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
-      this.valuePanel.DragDrop += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragDrop);
-      this.valuePanel.DragEnter += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
       // 
       // viewHost
       // 
+      this.viewHost.Caption = "View";
       this.viewHost.Content = null;
       this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.viewHost.Location = new System.Drawing.Point(0, 0);
       this.viewHost.Name = "viewHost";
+      this.viewHost.ReadOnly = false;
       this.viewHost.Size = new System.Drawing.Size(359, 274);
       this.viewHost.TabIndex = 0;
@@ -77 +64 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.valuePanel);
+      this.Controls.Add(this.viewHost);
       this.Name = "VariableValueView";
       this.Size = new System.Drawing.Size(359, 274);
-      this.valuePanel.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -87 +73 @@
     #endregion
 
-    protected HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;
-    protected System.Windows.Forms.Panel valuePanel;
+    protected MainForm.WindowsForms.ViewHost viewHost;
+
   }
 }

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

@@ -77 +77 @@
     }
 
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-      valuePanel.Enabled = Content != null;
-    }
-
     protected virtual void Content_ValueChanged(object sender, EventArgs e) {
       if (InvokeRequired)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ContentView.cs

@@ -67 +67 @@
         } else {
           if (value != locked) {
-            this.SuspendRepaint();
             locked = value;
             OnLockedChanged();
-            this.SetEnabledStateOfControls();
+            SetEnabledStateOfControls();
             PropertyInfo prop = typeof(IContentView).GetProperty("Locked");
             PropagateStateChanges(this, typeof(IContentView), prop);
             OnChanged();
-            this.ResumeRepaint(true);
           }
         }
@@ -111 +109 @@
     /// </summary>
     protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      Enabled = Content != null;
     }
   }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/View.cs

@@ -65 +65 @@
         } else {
           if (value != readOnly) {
-            this.SuspendRepaint();
             this.readOnly = value;
-            this.OnReadOnlyChanged();
-            this.SetEnabledStateOfControls();
+            OnReadOnlyChanged();
+            SetEnabledStateOfControls();
             PropertyInfo prop = typeof(IView).GetProperty("ReadOnly");
             PropagateStateChanges(this, typeof(IView), prop);
-            this.ResumeRepaint(true);
+            OnChanged();
           }
         }
       }
     }
+
+    bool IView.Enabled {
+      get { return base.Enabled; }
+      set {
+        if (base.Enabled != value) {
+          this.SuspendRepaint();
+          base.Enabled = value;
+          bool isTopLevelView = MainFormManager.MainForm.Views.Contains(this);
+          this.ResumeRepaint(isTopLevelView);
+        }
+      }
+    }
+
+    protected override void OnEnabledChanged(EventArgs e) {
+      base.OnEnabledChanged(e);
+      if (Enabled) SetEnabledStateOfControls();
+    }
+
     /// <summary>
     /// This method is called if the ReadyOnly property of the View changes to update the controls of the view.
@@ -160 +177 @@
           var thisValue = propertyInfo.GetValue(this, null);
           controlPropertyInfo.SetValue(c, thisValue, null);
-        } else
-          PropagateStateChanges(c, type, propertyInfo);
+        } else PropagateStateChanges(c, type, propertyInfo);
       }
     }
@@ -226 +242 @@
     }
 
-    public new bool Enabled {
-      get { return base.Enabled; }
-      set {
-        SuspendRepaint();
-        base.Enabled = value;
-        ResumeRepaint(true);
-      }
-    }
 
     public void SuspendRepaint() {

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -61 +61 @@
             View view = activeView as View;
             if (view != null) {
+              view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
+              view.Size = new System.Drawing.Size(this.Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
               view.OnShown(new ViewShownEventArgs(view, false));
               Controls.Add(view);
             }
           } else viewType = null;
-          OnActiveViewChanged();
         }
       }
@@ -84 +85 @@
           OnViewTypeChanged();
         }
-      }
-    }
-
-    public new bool Enabled {
-      get { return base.Enabled; }
-      set {
-        base.Enabled = value;
-        this.viewsLabel.Enabled = value;
       }
     }
@@ -136 +129 @@
         IContentView view;
         view = MainFormManager.CreateView(viewType);
+        view.Locked = this.Locked;
         view.ReadOnly = this.ReadOnly;
-        view.Locked = this.Locked;
         ActiveView = view; //necessary to allow the views to change the status of the viewhost
         view.Content = Content;
@@ -145 +138 @@
     }
 
-    private void OnActiveViewChanged() {
-      this.SuspendRepaint();
-      if (activeView != null) {
-        this.ActiveView.ReadOnly = this.ReadOnly;
-        this.ActiveView.Locked = this.Locked;
-        this.ActiveViewControl.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
-        this.ActiveViewControl.Size = new System.Drawing.Size(this.Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
-      }
-      this.ResumeRepaint(true);
-    }
-
     private void RegisterActiveViewEvents() {
-      activeView.Changed += new EventHandler(activeView_Changed);
       activeView.CaptionChanged += new EventHandler(activeView_CaptionChanged);
+      activeView.LockedChanged += new EventHandler(activeView_LockedChanged);
     }
     private void DeregisterActiveViewEvents() {
-      activeView.Changed -= new EventHandler(activeView_Changed);
-      activeView.CaptionChanged -= new EventHandler(activeView_CaptionChanged);
+      activeView.CaptionChanged += new EventHandler(activeView_CaptionChanged);
+      activeView.LockedChanged += new EventHandler(activeView_LockedChanged);
     }
     private void activeView_CaptionChanged(object sender, EventArgs e) {
-      this.ActiveViewChanged();
-    }
-    private void activeView_Changed(object sender, EventArgs e) {
-      this.ActiveViewChanged();
-    }
-    private void ActiveViewChanged() {
-      if (ActiveView != null) {
-        this.Caption = this.ActiveView.Caption;
-        this.ReadOnly = this.ActiveView.ReadOnly;
-        this.Locked = this.ActiveView.Locked;
-      }
+      this.Caption = activeView.Caption;
+    }
+    private void activeView_LockedChanged(object sender, EventArgs e) {
+      this.Locked = activeView.Locked;
     }
 

trunk/sources/HeuristicLab.MainForm/3.3/Interfaces/IView.cs

@@ -27 +27 @@
     string Caption { get; set; }
     bool ReadOnly { get; set; }
+    bool Enabled { get; set; }
+
+    event EventHandler CaptionChanged;
     event EventHandler ReadOnlyChanged;
-    event EventHandler CaptionChanged;
+    event EventHandler EnabledChanged;
     event EventHandler Changed;
 

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

@@ -86 +86 @@
         screenshotButton.Enabled = true;
         detailsViewHost.Enabled = true;
-        connectButton.Enabled = !ReadOnly && !Locked;
+        connectButton.Enabled = !ReadOnly;
       }
     }
@@ -168 +168 @@
         this.initialToolStripMenuItem.Enabled = !ReadOnly && !Locked;
         this.breakPointToolStripMenuItem.Checked = op.Breakpoint;
-        this.breakPointToolStripMenuItem.Enabled = !Locked;
+        this.breakPointToolStripMenuItem.Enabled = !ReadOnly && !Locked;
       }
     }

trunk/sources/HeuristicLab.Operators.Views/3.3/MultiOperatorView.cs

@@ -77 +77 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      breakpointCheckBox.Enabled = Content != null && !Locked;
+      breakpointCheckBox.Enabled = Content != null && !ReadOnly;
       operatorListView.Enabled = Content != null;
       parameterCollectionView.Enabled = Content != null;

trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.cs

@@ -74 +74 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      breakpointCheckBox.Enabled = Content != null && !Locked;
+      breakpointCheckBox.Enabled = Content != null && !ReadOnly;
     }
 

trunk/sources/HeuristicLab.Operators.Views/3.3/ValuesCollectorView.cs

@@ -77 +77 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      breakpointCheckBox.Enabled = Content != null && !Locked;
+      breakpointCheckBox.Enabled = Content != null && !ReadOnly;
       collectedValuesView.Enabled = Content != null;
       parameterCollectionView.Enabled = Content != null;

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

@@ -45 +45 @@
 
     public override bool ReadOnly {
-      get { return base.ReadOnly; }
+      get { return true; }
       set { /*not needed because results are always readonly */}
     }
@@ -54 +54 @@
     public ResultView() {
       InitializeComponent();
-      base.ReadOnly = true;
     }
 
@@ -91 +90 @@
       dataTypeTextBox.Enabled = Content != null;
       viewHost.Enabled = Content != null;
+      viewHost.ReadOnly = this.ReadOnly;
     }
 

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

@@ -86 +86 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      txtConstraintData.ReadOnly = Content == null || this.ReadOnly;
+      txtConstraintData.Enabled = Content != null;
+      txtConstraintData.ReadOnly = ReadOnly;
     }
 

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

@@ -83 +83 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      cmbConstraintColumn.Enabled = !this.ReadOnly && !this.Locked && Content != null;
-      cmbConstraintOperation.Enabled = !this.ReadOnly && !this.Locked && Content != null;
+      cmbConstraintColumn.Enabled = !this.ReadOnly && Content != null;
+      cmbConstraintOperation.Enabled = !this.ReadOnly && Content != null;
       chbActive.Enabled = !this.Locked && Content != null;
     }

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

@@ -45 +45 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      txtConstraintData.ReadOnly = Content == null || this.ReadOnly;
+      txtConstraintData.Enabled = Content != null;
+      txtConstraintData.ReadOnly = ReadOnly;
     }
 

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

@@ -35 +35 @@
     public RunCollectionTabularView() {
       InitializeComponent();
-      base.ReadOnly = true;
     }
 
     public override bool ReadOnly {
-      get { return base.ReadOnly; }
+      get { return true; }
       set { /*not needed because results are always readonly */}
     }

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -93 +93 @@
         else {
           ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
-          var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
-          views.ForEach(v => v.ReadOnly = true);
-          views.ForEach(v => v.Locked = true);
+          SetEnabledStateOfContentViews(content, false);
           ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted);
         }
@@ -120 +118 @@
         if (saveFileDialog.ShowDialog() == DialogResult.OK) {
           ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
-          var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
-          views.ForEach(v => v.ReadOnly = true);
-          views.ForEach(v => v.Locked = true);
+          SetEnabledStateOfContentViews(content, false);
           if (saveFileDialog.FilterIndex == 1) {
             ContentManager.SaveAsync(content, saveFileDialog.FileName, false, SavingCompleted);
@@ -133 +129 @@
     private static void SavingCompleted(IStorableContent content, Exception error) {
       try {
-        var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
-        views.ForEach(v => v.ReadOnly = false);
-        views.ForEach(v => v.Locked = false);
+        SetEnabledStateOfContentViews(content, true);
         if (error != null) throw error;
         MainFormManager.GetMainForm<OptimizerMainForm>().UpdateTitle();
@@ -146 +140 @@
       }
     }
+
+    private static void SetEnabledStateOfContentViews(IStorableContent content, bool enabled) {
+      OptimizerMainForm mainForm = MainFormManager.GetMainForm<OptimizerMainForm>();
+      if (mainForm.InvokeRequired)
+        mainForm.Invoke((Action<IStorableContent, bool>)SetEnabledStateOfContentViews, content, enabled);
+      else {
+        var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
+        views.ForEach(v => v.Enabled = enabled);
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/ConstantView.cs

@@ -58 +58 @@
       base.SetEnabledStateOfControls();
       minValueTextBox.Enabled = Content != null;
+      minValueTextBox.ReadOnly = ReadOnly;
       maxValueTextBox.Enabled = Content != null;
+      maxValueTextBox.ReadOnly = ReadOnly;
       valueChangeNuTextBox.Enabled = Content != null;
+      valueChangeNuTextBox.ReadOnly = ReadOnly;
       valueChangeSigmaTextBox.Enabled = Content != null;
+      valueChangeSigmaTextBox.ReadOnly = ReadOnly;
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/LaggedVariableView.cs

@@ -57 +57 @@
       base.SetEnabledStateOfControls();
       minTimeOffsetTextBox.Enabled = Content != null;
+      minTimeOffsetTextBox.ReadOnly = ReadOnly;
       maxTimeOffsetTextBox.Enabled = Content != null;
+      maxTimeOffsetTextBox.ReadOnly = ReadOnly;
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/VariableView.cs

@@ -58 +58 @@
       base.SetEnabledStateOfControls();
       weightNuTextBox.Enabled = Content != null;
+      weightNuTextBox.ReadOnly = ReadOnly;
       weightSigmaTextBox.Enabled = Content != null;
+      weightSigmaTextBox.ReadOnly = ReadOnly;
       weightChangeNuTextBox.Enabled = Content != null;
+      weightChangeNuTextBox.ReadOnly = ReadOnly;
       weightChangeSigmaTextBox.Enabled = Content != null;
+      weightChangeSigmaTextBox.ReadOnly = ReadOnly;
     }
 

trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/PathTSPTourView.cs

@@ -71 +71 @@
         tourViewHost.Content = Content.Permutation;
       }
-    }
-
-    protected override void OnReadOnlyChanged() {
-      base.OnReadOnlyChanged();
-      SetEnabledStateOfControls();
     }