Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3
- Timestamp:
- 06/22/12 11:11:38 (12 years ago)
- Location:
- branches/ScatterSearch (trunk integration)
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ScatterSearch (trunk integration)
- Property svn:ignore
-
old new 20 20 bin 21 21 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3
- Property svn:ignore
-
old new 2 2 bin 3 3 obj 4 *.user
-
- Property svn:ignore
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.csproj
r7650 r8086 144 144 <Private>False</Private> 145 145 </ProjectReference> 146 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">147 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>148 <Name>HeuristicLab.Core-3.3</Name>149 <Private>False</Private>150 </ProjectReference>151 146 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 152 147 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> … … 164 159 <Private>False</Private> 165 160 </ProjectReference> 166 <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">167 <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>168 <Name>HeuristicLab.Optimization.Views-3.3</Name>169 <Private>False</Private>170 </ProjectReference>171 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">172 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>173 <Name>HeuristicLab.Optimization-3.3</Name>174 <Private>False</Private>175 </ProjectReference>176 161 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 177 162 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> … … 182 167 <Project>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</Project> 183 168 <Name>HeuristicLab.Problems.Instances.TSPLIB-3.3</Name> 169 <Private>False</Private> 170 </ProjectReference> 171 <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.3\HeuristicLab.Problems.Instances.Views-3.3.csproj"> 172 <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project> 173 <Name>HeuristicLab.Problems.Instances.Views-3.3</Name> 184 174 <Private>False</Private> 185 175 </ProjectReference> -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Plugin.cs.frame
r7558 r8086 28 28 [PluginDependency("HeuristicLab.Data", "3.3")] 29 29 [PluginDependency("HeuristicLab.MainForm", "3.3")] 30 [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]31 30 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 32 31 [PluginDependency("HeuristicLab.Problems.Instances.TSPLIB", "3.3")] 32 [PluginDependency("HeuristicLab.Problems.Instances.Views", "3.3")] 33 33 public class HeuristicLabProblemsInstancesTSPLIBViewsPlugin : PluginBase { 34 34 } -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBImportDialog.Designer.cs
r7558 r8086 204 204 this.AcceptButton = this.okButton; 205 205 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 206 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;206 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 207 207 this.CancelButton = this.cancelButton; 208 208 this.ClientSize = new System.Drawing.Size(586, 132); -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.Designer.cs
r7558 r8086 25 25 private void InitializeComponent() { 26 26 components = new System.ComponentModel.Container(); 27 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode. Font;27 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 28 28 } 29 29 -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.cs
r7558 r8086 21 21 22 22 using System; 23 using System.IO; 23 24 using System.Windows.Forms; 24 25 using HeuristicLab.MainForm; 25 26 using HeuristicLab.MainForm.WindowsForms; 26 using HeuristicLab. Optimization.Views;27 using HeuristicLab.Problems.Instances.Views; 27 28 28 29 namespace HeuristicLab.Problems.Instances.TSPLIB.Views { 29 30 [View("TSPLIB TSP InstanceProvider View")] 30 [Content(typeof( TSPLIBTSPInstanceProvider), IsDefaultView = true)]31 public partial class TSPLIBTSPInstanceProviderView : ProblemInstance ProviderView<TSPData> {32 public new TSPLIBTSPInstanceProviderContent {33 get { return ( TSPLIBTSPInstanceProvider)base.Content; }31 [Content(typeof(IProblemInstanceConsumer<TSPData>), IsDefaultView = true)] 32 public partial class TSPLIBTSPInstanceProviderView : ProblemInstanceConsumerViewGeneric<TSPData> { 33 public new IProblemInstanceConsumer<TSPData> Content { 34 get { return (IProblemInstanceConsumer<TSPData>)base.Content; } 34 35 set { base.Content = value; } 35 36 } … … 40 41 41 42 protected override void importButton_Click(object sender, EventArgs e) { 42 using (var dialog = new TSPLIBImportDialog()) { 43 if (dialog.ShowDialog() == DialogResult.OK) { 44 var instance = Content.LoadData(dialog.TSPFileName, dialog.TourFileName, dialog.Quality); 45 Content.Consumer.Load(instance); 43 TSPLIBTSPInstanceProvider provider = SelectedProvider as TSPLIBTSPInstanceProvider; 44 if (provider != null) { 45 using (var dialog = new TSPLIBImportDialog()) { 46 if (dialog.ShowDialog() == DialogResult.OK) { 47 var instance = provider.LoadData(dialog.TSPFileName, dialog.TourFileName, dialog.Quality); 48 try { 49 GenericConsumer.Load(instance); 50 } 51 catch (Exception ex) { 52 MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", Path.GetFileName(openFileDialog.FileName), Environment.NewLine + ex.Message), "Cannot load instance"); 53 } 54 } 46 55 } 56 } else { 57 base.importButton_Click(sender, e); 47 58 } 48 59 }
Note: See TracChangeset
for help on using the changeset viewer.