Changeset 17146 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

07/22/19 13:39:09 (5 years ago)

Author:

mkommend

Message:

#2971: Renamed views and updated error messages in constraint parser.

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• ProblemDataConstraintView.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.cs) (5 diffs)
• ProblemDataConstraintView.designer.cs (moved) (moved from branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ParsedConstraintView.designer.cs) (6 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -325 +325 @@
       <DependentUpon>ModifiableDatasetView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ParsedConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ParsedConstraintView.designer.cs">
-      <DependentUpon>ParsedConstraintView.cs</DependentUpon>
+    <Compile Include="ProblemDataConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ProblemDataConstraintView.designer.cs">
+      <DependentUpon>ProblemDataConstraintView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.cs

@@ -29 +29 @@
   [View("ParsedConstraint View")]
   [Content(typeof(ProblemDataConstraint), true)]
-  public partial class ParsedConstraintView : AsynchronousContentView {
-    private CheckedItemList<IntervalConstraint> intervalConstraints;
+  public partial class ProblemDataConstraintView : AsynchronousContentView {
+    private readonly CheckedItemList<IntervalConstraint> intervalConstraints = new CheckedItemList<IntervalConstraint>();
     public new ProblemDataConstraint Content {
       get => (ProblemDataConstraint)base.Content;
@@ -36 +36 @@
     }
 
-    public ParsedConstraintView() {
+    public ProblemDataConstraintView() {
       InitializeComponent();
       errorOutput.Text = "";
-      intervalConstraints = new CheckedItemList<IntervalConstraint>();
     }
 
@@ -88 +87 @@
       if (Content == null) {
         intervalConstraints.Clear();
-        constraintsOutput.Content = intervalConstraints;
+        intervalConstraintsView.Content = intervalConstraints;
       } else {
         intervalConstraints.Clear();
@@ -96 +95 @@
         }
 
-        constraintsOutput.Content = intervalConstraints;
+        intervalConstraintsView.Content = intervalConstraints;
       }
     }
 
     private void constraint_Changed(object sender, EventArgs e) {
-      var constraint = (IntervalConstraint) sender;
+      var constraint = (IntervalConstraint)sender;
       intervalConstraints.SetItemCheckedState(constraint, constraint.Enabled);
     }
@@ -119 +118 @@
     private void constraint_CheckedItemChanged(object sender,
       CollectionItemsChangedEventArgs<IndexedItem<IntervalConstraint>> e) {
-      ICheckedItemList<IntervalConstraint> checkedItemList = (ICheckedItemList<IntervalConstraint>) sender;
+      ICheckedItemList<IntervalConstraint> checkedItemList = (ICheckedItemList<IntervalConstraint>)sender;
       foreach (var indexedItem in e.Items) {
         indexedItem.Value.Enabled = checkedItemList.ItemChecked(indexedItem.Value);

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataConstraintView.designer.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  partial class ParsedConstraintView {
+  partial class ProblemDataConstraintView {
     /// <summary> 
     /// Required designer variable.
@@ -46 +46 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ParsedConstraintView));
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProblemDataConstraintView));
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
@@ -52 +52 @@
       this.parseBtn = new System.Windows.Forms.Button();
       this.label1 = new System.Windows.Forms.Label();
-      //this.constraintsOutput = new System.Windows.Forms.Label();
-      this.constraintsOutput = new HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint>();
+      this.intervalConstraintsView = new HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint>();
       this.errorOutput = new System.Windows.Forms.Label();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -74 +73 @@
       // splitContainer1.Panel2
       // 
-      this.splitContainer1.Panel2.Controls.Add(this.constraintsOutput);
+      this.splitContainer1.Panel2.Controls.Add(this.intervalConstraintsView);
       this.splitContainer1.Size = new System.Drawing.Size(888, 629);
       this.splitContainer1.SplitterDistance = 296;
@@ -136 +135 @@
                          "5. Follow the steps 3-5 from above";
       // 
-      // constraintsOutput
+      // intervalConstraintsView
       // 
-      this.constraintsOutput.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.constraintsOutput.Location = new System.Drawing.Point(3, 16);
-      this.constraintsOutput.Name = "constraintsOutput";
-      this.constraintsOutput.Size = new System.Drawing.Size(582, 587);
-      this.constraintsOutput.TabIndex = 2;
+      this.intervalConstraintsView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.intervalConstraintsView.Location = new System.Drawing.Point(3, 16);
+      this.intervalConstraintsView.Name = "intervalConstraintsView";
+      this.intervalConstraintsView.Size = new System.Drawing.Size(582, 587);
+      this.intervalConstraintsView.TabIndex = 2;
       // 
       // errorOutput
@@ -178 +177 @@
     private System.Windows.Forms.Button parseBtn;
     private System.Windows.Forms.Label label1;
+    private HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint> intervalConstraintsView;
     private System.Windows.Forms.TextBox constraintsInput;
     private System.Windows.Forms.Label errorOutput;
 
-    //private System.Windows.Forms.Label constraintsOutput;
-    private HeuristicLab.Core.Views.CheckedItemListView<IntervalConstraint> constraintsOutput;
   }
 }