Changeset 17105 for stable/HeuristicLab.Problems.DataAnalysis.Views
- Timestamp:
- 07/08/19 00:23:12 (5 years ago)
- Location:
- stable
- Files:
-
- 1 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
-
stable/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis.Views merged: 16585,16625,16658
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4 merged: 16585,16625,16658
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r17097 r17105 103 103 <Private>False</Private> 104 104 </Reference> 105 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">106 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>107 </Reference>108 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">109 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>110 </Reference>111 105 <Reference Include="System" /> 112 106 <Reference Include="System.Core"> … … 114 108 </Reference> 115 109 <Reference Include="System.Drawing" /> 116 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">117 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>118 </Reference>119 110 <Reference Include="System.Windows.Forms" /> 120 111 <Reference Include="System.Windows.Forms.DataVisualization" /> … … 476 467 </Compile> 477 468 <None Include="HeuristicLab.snk" /> 478 <None Include="packages.config" />479 469 <None Include="Plugin.cs.frame" /> 480 470 <None Include="Properties\AssemblyInfo.cs.frame" /> … … 560 550 <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project> 561 551 <Name>HeuristicLab.Parameters.Views-3.3</Name> 562 <Private>False</Private>563 </ProjectReference>564 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">565 <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>566 <Name>HeuristicLab.Persistence-3.3</Name>567 552 <Private>False</Private> 568 553 </ProjectReference> … … 615 600 </EmbeddedResource> 616 601 </ItemGroup> 602 <ItemGroup> 603 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 604 <SpecificVersion>False</SpecificVersion> 605 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 606 <Private>False</Private> 607 </Reference> 608 </ItemGroup> 617 609 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 618 610 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame
r17097 r17105 31 31 [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")] 32 32 [PluginDependency("HeuristicLab.Analysis", "3.3")] 33 [PluginDependency("HeuristicLab.Attic", "1.0")] 33 34 [PluginDependency("HeuristicLab.Collections", "3.3")] 34 35 [PluginDependency("HeuristicLab.Common", "3.3")] … … 43 44 [PluginDependency("HeuristicLab.Optimization.Views","3.3")] 44 45 [PluginDependency("HeuristicLab.Optimizer", "3.3")] 45 [PluginDependency("HeuristicLab.Persistence", "3.3")]46 46 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")] 47 47 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")] -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.cs
r17097 r17105 25 25 using System.Linq; 26 26 using System.Windows.Forms; 27 using HEAL.Attic; 27 28 using HeuristicLab.Core; 28 29 using HeuristicLab.Core.Views; 29 30 using HeuristicLab.MainForm; 30 31 using HeuristicLab.Optimization; 31 using HeuristicLab.Persistence.Default.Xml;32 32 using HeuristicLab.PluginInfrastructure; 33 33 … … 126 126 if (loadProblemDataFileDialog.ShowDialog(this) != DialogResult.OK) return; 127 127 try { 128 object hlFile = XmlParser.Deserialize(loadProblemDataFileDialog.FileName); 128 var ser = new ProtoBufSerializer(); 129 object hlFile = ser.Deserialize(loadProblemDataFileDialog.FileName); 129 130 130 131 IDataAnalysisProblemData problemData = null; … … 145 146 solution.Name += " with loaded problemData"; 146 147 MainFormManager.MainForm.ShowContent(solution); 147 } 148 catch (InvalidOperationException invalidOperationException) { 148 } catch (InvalidOperationException invalidOperationException) { 149 149 ErrorHandling.ShowErrorDialog(this, invalidOperationException); 150 } 151 catch (ArgumentException argumentException) { 150 } catch (ArgumentException argumentException) { 152 151 ErrorHandling.ShowErrorDialog(this, argumentException); 153 152 } … … 235 234 Content.Filename = string.Empty; 236 235 MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().UpdateTitle(); 237 } 238 catch (InvalidOperationException invalidOperationException) { 236 } catch (InvalidOperationException invalidOperationException) { 239 237 ErrorHandling.ShowErrorDialog(this, invalidOperationException); 240 } 241 catch (ArgumentException argumentException) { 238 } catch (ArgumentException argumentException) { 242 239 ErrorHandling.ShowErrorDialog(this, argumentException); 243 240 }
Note: See TracChangeset
for help on using the changeset viewer.