Changeset 14038 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views

Timestamp:

07/12/16 16:35:10 (8 years ago)

Author:

gkronber

Message:

#1966: fixed compile errors and reverted some changes from the last commit which prepared for refactoring to use new Encoding framework

Location:

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

Files:

• HeuristicLab.Problems.BinPacking.Views-3.3.csproj (modified) (1 diff)
• PackingPlan2DView.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

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

@@ -158 +158 @@
       <DependentUpon>Container2DView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PackingPlan2DView.cs" />
+    <Compile Include="PackingPlan2DView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="PackingPlan2DView.Designer.cs">
       <DependentUpon>PackingPlan2DView.cs</DependentUpon>
     </Compile>
-    <Compile Include="PackingPlan3DView.cs" />
+    <Compile Include="PackingPlan3DView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="PackingPlan3DView.Designer.cs">
       <DependentUpon>PackingPlan3DView.cs</DependentUpon>

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

@@ -24 +24 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
+using HeuristicLab.Problems.BinPacking.Dimensions;
+using HeuristicLab.Problems.BinPacking.PackingBin;
+using HeuristicLab.Problems.BinPacking.PackingItem;
 
 namespace HeuristicLab.Problems.BinPacking.Views {

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

@@ -36 +36 @@
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
-  [PluginDependency("HeuristicLab.SharpDX", "2.6.3")]
   public class HeuristicLabProblemsBinPackingViewsPlugin : PluginBase {
   }