Changeset 5166


Ignore:
Timestamp:
12/23/10 00:29:42 (10 years ago)
Author:
swagner
Message:

Removed Microsoft Chart Controls 3.5 check (#1350)

Location:
trunk/sources/HeuristicLab.Optimizer/3.3
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r5163 r5166  
    1212    <AssemblyName>HeuristicLab.Optimizer-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile></TargetFrameworkProfile>
     14    <TargetFrameworkProfile>
     15    </TargetFrameworkProfile>
    1516    <FileAlignment>512</FileAlignment>
    1617    <SignAssembly>true</SignAssembly>
     
    121122    </Compile>
    122123    <Compile Include="FileManager.cs" />
    123     <Compile Include="ChartControlsWarning.cs">
    124       <SubType>Form</SubType>
    125     </Compile>
    126     <Compile Include="ChartControlsWarning.Designer.cs">
    127       <DependentUpon>ChartControlsWarning.cs</DependentUpon>
    128     </Compile>
    129124    <Compile Include="MenuItems\ClipboardMenuItem.cs" />
    130125    <Compile Include="MenuItems\AboutMenuItem.cs" />
  • trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs

    r4068 r5166  
    2222using System;
    2323using System.ComponentModel;
    24 using System.IO;
    2524using System.Linq;
    2625using System.Reflection;
     
    8887
    8988      WindowState = Properties.Settings.Default.ShowMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
    90     }
    91 
    92     private static string CHARTCONTROLASSEMBLY = "System.Windows.Forms.DataVisualization, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
    93     private bool CheckChartControls() {
    94       try {
    95         Assembly chartControlsAssembly = Assembly.Load(CHARTCONTROLASSEMBLY);
    96         if (chartControlsAssembly != null)
    97           return true;
    98       }
    99       catch (FileNotFoundException) {
    100       }
    101       catch (FileLoadException) {
    102       }
    103       catch (BadImageFormatException) {
    104       }
    105       return false;
    106     }
    107 
    108     protected override void OnShown(EventArgs e) {
    109       base.OnShown(e);
    110       if (!CheckChartControls()) {
    111         ChartControlsWarning dlg = new ChartControlsWarning();
    112         dlg.ShowDialog(this);
    113       }
    11489    }
    11590
Note: See TracChangeset for help on using the changeset viewer.