Changeset 13461 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3

Timestamp:

12/14/15 19:52:46 (8 years ago)

Author:

gkronber

Message:

#1966:

• used Items instead of NamedItems and adapted views (Names/Descriptions) were not set anyway
• fixed problems identified by Essential unit tests

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3

Files:

• HeuristicLab.Problems.BinPacking.Views-3.3.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Shapes/CuboidPackingItemView.Designer.cs (modified) (2 diffs)
• Shapes/CuboidPackingItemView.cs (modified) (1 diff)
• Shapes/CuboidPackingShapeView.Designer.cs (modified) (2 diffs)
• Shapes/CuboidPackingShapeView.cs (modified) (2 diffs)
• Shapes/RectangularPackingItemView.Designer.cs (modified) (2 diffs)
• Shapes/RectangularPackingItemView.cs (modified) (1 diff)
• Shapes/RectangularPackingShapeView.Designer.cs (modified) (2 diffs)
• Shapes/RectangularPackingShapeView.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj

@@ -120 +120 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -145 +142 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Problems.BinPacking.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginFile("PackingPlanVisualizations.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Common", "3.3")]
-  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
-  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.BinPacking", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.SharpDX", "2.6.3")]
   public class HeuristicLabProblemsBinPackingViewsPlugin : PluginBase {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/CuboidPackingItemView.Designer.cs

@@ -49 +49 @@
     private void InitializeComponent() {
       this.packingPlan3D1 = new PackingPlanVisualizations.PackingPlan3D();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
-      // 
-      // nameTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
       // 
       // packingPlan3D1
@@ -73 +67 @@
       this.Name = "CuboidPackingShapeView";
       this.Size = new System.Drawing.Size(351, 299);
-      this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.packingPlan3D1, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/CuboidPackingItemView.cs

@@ -27 +27 @@
   [View("View for a cuboid packing item.")]
   [Content(typeof(CuboidPackingItem), true)]
-  public partial class CuboidPackingItemView : NamedItemView {
+  public partial class CuboidPackingItemView : ItemView {
     public CuboidPackingItemView() {
       InitializeComponent();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/CuboidPackingShapeView.Designer.cs

@@ -49 +49 @@
     private void InitializeComponent() {
       this.packingPlan3D1 = new PackingPlanVisualizations.PackingPlan3D();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
-      // 
-      // nameTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
       // 
       // packingPlan3D1
@@ -73 +67 @@
       this.Name = "CuboidPackingShapeView";
       this.Size = new System.Drawing.Size(351, 299);
-      this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.packingPlan3D1, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/CuboidPackingShapeView.cs

@@ -27 +27 @@
   [View("View for a cuboid shape.")]
   [Content(typeof(CuboidPackingShape), true)]
-  public partial class CuboidPackingShapeView : NamedItemView {
+  public partial class CuboidPackingShapeView : ItemView {
     public CuboidPackingShapeView() {
       InitializeComponent();
@@ -45 +45 @@
       } else {
         Redraw(Content);
-        Content.Name = "XX";
         packingPlan3D1.StartRendering();
       }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/RectangularPackingItemView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.packingPlan2D = new PackingPlanVisualizations.PackingPlan2D();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
-      // 
-      // nameTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
       // 
       // packingPlan2D
@@ -70 +64 @@
       this.Name = "PackingPlanView";
       this.Size = new System.Drawing.Size(351, 299);
-      this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.packingPlan2D, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/RectangularPackingItemView.cs

@@ -27 +27 @@
   [View("View for a rectangular packing item.")]
   [Content(typeof(RectangularPackingItem), true)]
-  public partial class RectangularPackingItemView : NamedItemView {
+  public partial class RectangularPackingItemView : ItemView {
     public RectangularPackingItemView() {
       InitializeComponent();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/RectangularPackingShapeView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.packingPlan2D = new PackingPlanVisualizations.PackingPlan2D();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
-      // 
-      // nameTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
       // 
       // packingPlan2D
@@ -70 +64 @@
       this.Name = "PackingPlanView";
       this.Size = new System.Drawing.Size(351, 299);
-      this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.packingPlan2D, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Shapes/RectangularPackingShapeView.cs

@@ -27 +27 @@
   [View("View for a rectangular shape.")]
   [Content(typeof(RectangularPackingShape), true)]
-  public partial class RectangularPackingShapeView : NamedItemView {
+  public partial class RectangularPackingShapeView : ItemView {
     public RectangularPackingShapeView() {
       InitializeComponent();