Changeset 7558 for trunk/sources/HeuristicLab.Optimization.Views/3.3
- Timestamp:
- 03/06/12 01:43:06 (13 years ago)
- Location:
- trunk/sources/HeuristicLab.Optimization.Views/3.3
- Files:
-
- 2 added
- 2 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj
r7469 r7558 99 99 </PropertyGroup> 100 100 <ItemGroup> 101 <Reference Include="Microsoft.CSharp" /> 101 102 <Reference Include="System" /> 102 103 <Reference Include="System.Core"> … … 137 138 </Compile> 138 139 <Compile Include="Plugin.cs" /> 140 <Compile Include="ProblemInstanceProviderView.cs"> 141 <SubType>UserControl</SubType> 142 </Compile> 143 <Compile Include="ProblemInstanceProviderView.Designer.cs"> 144 <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon> 145 </Compile> 146 <Compile Include="ProblemView.cs"> 147 <SubType>UserControl</SubType> 148 </Compile> 149 <Compile Include="ProblemView.designer.cs"> 150 <DependentUpon>ProblemView.cs</DependentUpon> 151 </Compile> 139 152 <Compile Include="RunCollectionModifierListView.cs"> 140 153 <SubType>UserControl</SubType> … … 251 264 <DependentUpon>EngineAlgorithmView.cs</DependentUpon> 252 265 </Compile> 253 <Compile Include=" ProblemView.cs">254 <SubType>UserControl</SubType> 255 </Compile> 256 <Compile Include=" ProblemView.Designer.cs">257 <DependentUpon> ProblemView.cs</DependentUpon>266 <Compile Include="HeuristicOptimizationProblemView.cs"> 267 <SubType>UserControl</SubType> 268 </Compile> 269 <Compile Include="HeuristicOptimizationProblemView.Designer.cs"> 270 <DependentUpon>HeuristicOptimizationProblemView.cs</DependentUpon> 258 271 </Compile> 259 272 <Compile Include="Properties\AssemblyInfo.cs" /> … … 335 348 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 336 349 <Private>False</Private> 350 </ProjectReference> 351 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj"> 352 <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project> 353 <Name>HeuristicLab.Problems.Instances-3.3</Name> 337 354 </ProjectReference> 338 355 <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj"> -
trunk/sources/HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame
r7259 r7558 38 38 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 39 39 [PluginDependency("HeuristicLab.Optimization", "3.3")] 40 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 40 41 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions","3.3")] 41 42 public class HeuristicLabOptimizationViewsPlugin : PluginBase { -
trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.Designer.cs
r7551 r7558 20 20 #endregion 21 21 22 namespace HeuristicLab. Problems.GeneralizedQuadraticAssignment.Views {22 namespace HeuristicLab.Optimization.Views { 23 23 partial class ProblemInstanceProviderView<T> { 24 24 /// <summary> … … 47 47 this.components = new System.ComponentModel.Container(); 48 48 this.loadButton = new System.Windows.Forms.Button(); 49 this. label2= new System.Windows.Forms.Label();49 this.instanceLabel = new System.Windows.Forms.Label(); 50 50 this.instancesComboBox = new System.Windows.Forms.ComboBox(); 51 51 this.importButton = new System.Windows.Forms.Button(); … … 65 65 this.loadButton.Click += new System.EventHandler(this.loadButton_Click); 66 66 // 67 // label267 // instanceLabel 68 68 // 69 this. label2.AutoSize = true;70 this. label2.Location = new System.Drawing.Point(-3, 3);71 this. label2.Name = "label2";72 this. label2.Size = new System.Drawing.Size(51, 13);73 this. label2.TabIndex = 4;74 this. label2.Text = "Instance:";69 this.instanceLabel.AutoSize = true; 70 this.instanceLabel.Location = new System.Drawing.Point(-3, 3); 71 this.instanceLabel.Name = "instanceLabel"; 72 this.instanceLabel.Size = new System.Drawing.Size(51, 13); 73 this.instanceLabel.TabIndex = 4; 74 this.instanceLabel.Text = "Instance:"; 75 75 // 76 76 // instancesComboBox … … 109 109 this.Controls.Add(this.importButton); 110 110 this.Controls.Add(this.loadButton); 111 this.Controls.Add(this. label2);111 this.Controls.Add(this.instanceLabel); 112 112 this.Name = "ProblemInstanceProviderView"; 113 113 this.Size = new System.Drawing.Size(610, 21); … … 119 119 #endregion 120 120 121 private System.Windows.Forms.Button loadButton;122 private System.Windows.Forms.Label label2;123 private System.Windows.Forms.ComboBox instancesComboBox;124 private System.Windows.Forms.Button importButton;125 121 private System.Windows.Forms.OpenFileDialog openFileDialog; 126 122 private System.Windows.Forms.ToolTip toolTip; 123 protected System.Windows.Forms.Button loadButton; 124 protected System.Windows.Forms.Label instanceLabel; 125 protected System.Windows.Forms.ComboBox instancesComboBox; 126 protected System.Windows.Forms.Button importButton; 127 127 128 128 } -
trunk/sources/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs
r7551 r7558 29 29 using HeuristicLab.Problems.Instances; 30 30 31 namespace HeuristicLab. Problems.GeneralizedQuadraticAssignment.Views {31 namespace HeuristicLab.Optimization.Views { 32 32 [View("ProblemInstanceProviderView")] 33 33 [Content(typeof(IProblemInstanceProvider<>), IsDefaultView = true)] … … 65 65 } 66 66 67 pr ivatevoid loadButton_Click(object sender, EventArgs e) {67 protected virtual void loadButton_Click(object sender, EventArgs e) { 68 68 var descriptor = (IDataDescriptor)instancesComboBox.SelectedItem; 69 69 var instance = Content.LoadData(descriptor); … … 75 75 } 76 76 77 pr ivatevoid importButton_Click(object sender, EventArgs e) {77 protected virtual void importButton_Click(object sender, EventArgs e) { 78 78 openFileDialog.FileName = GetProblemType() + " instance"; 79 79 if (openFileDialog.ShowDialog() == DialogResult.OK) { … … 99 99 } 100 100 101 pr ivatestring GetProblemType() {101 protected virtual string GetProblemType() { 102 102 string dataTypeName = typeof(T).Name.Split(new char[] { '.' }, StringSplitOptions.RemoveEmptyEntries).Last(); 103 103 if (dataTypeName.EndsWith("Data"))
Note: See TracChangeset
for help on using the changeset viewer.