Changeset 3776 for trunk/sources

Timestamp:

05/11/10 19:00:47 (15 years ago)

Author:

mkommend

Message:

implemented check for MS ChartControls (ticket #893)

Location:

trunk/sources

Files:

• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Layout/StandardTreeLayout.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/ChartControlsWarning.Designer.cs (added)
• HeuristicLab.Optimizer/3.3/ChartControlsWarning.cs (added)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Layout/StandardTreeLayout.cs

@@ -157 +157 @@
             Graph.MakeSpanningTree(LayoutRoot as INode);
 
-            Trace.WriteLine((LayoutRoot as INode).ChildCount);
+            //Trace.WriteLine((LayoutRoot as INode).ChildCount);
 
             if (Graph.SpanningTree == null)
@@ -281 +281 @@
         private void firstWalk(INode n, int num, int depth)
         {
-            Trace.WriteLine("depthj: " + depth);
+            //Trace.WriteLine("depthj: " + depth);
             Params np = Pars[n.Uid.ToString()];
 

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -87 +87 @@
     <None Include="HeuristicLabOptimizerPlugin.cs.frame" />
     <Compile Include="FileManager.cs" />
+    <Compile Include="ChartControlsWarning.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ChartControlsWarning.Designer.cs">
+      <DependentUpon>ChartControlsWarning.cs</DependentUpon>
+    </Compile>
     <Compile Include="MenuItems\ClipboardMenuItem.cs" />
     <Compile Include="MenuItems\AboutMenuItem.cs" />

trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs

@@ -30 +30 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using System.IO;
 
 namespace HeuristicLab.Optimizer {
@@ -86 +87 @@
         StartPage startPage = new StartPage();
         startPage.Show();
+      }
+    }
+
+    private static string CHARTCONTROLASSEMBLY = "12System.Windows.Forsms.DataVisualization, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+    private bool CheckChartControls() {
+      try {
+        Assembly chartControlsAssembly = Assembly.Load(CHARTCONTROLASSEMBLY);
+        if (chartControlsAssembly != null)
+          return true;
+      }
+      catch (FileNotFoundException) {
+      }
+      catch (FileLoadException) {
+      }
+      catch (BadImageFormatException) {
+      }
+      return false;
+    }
+
+    protected override void OnShown(EventArgs e) {
+      base.OnShown(e);
+      if (!CheckChartControls()) {
+        ChartControlsWarning dlg = new ChartControlsWarning();
+        dlg.ShowDialog(this);
       }
     }