Context Navigation

HeuristicLab.Clients.Hive.Views

Timestamp:

02/06/12 17:50:17 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7266:7459 from the trunk into the time series prognosis branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

Property svn:ignore

-                      old
+                      new
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

Property svn:mergeinfo changed

-                      r7268
+                      r7460
       <DependentUpon>StateLogGanttChartListView.cs</DependentUpon>
     </Compile>
-    <Compile Include="GanttChart\GanttChart.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GanttChart\GanttChart.Designer.cs">
-      <DependentUpon>GanttChart.cs</DependentUpon>
-    </Compile>
     <Compile Include="StateLog\StateLogGanttChartView.cs">
       <SubType>UserControl</SubType>

r7268	r7460
25	25	using HeuristicLab.Core.Views;
26	26	using HeuristicLab.MainForm;
	27	using HeuristicLab.Visualization.ChartControlsExtensions;
27	28
28	29	namespace HeuristicLab.Clients.Hive.Views {

-                      r6976
+                      r7460
     /// </summary>
     private void InitializeComponent() {
       this.ganttChart = new HeuristicLab.Clients.Hive.Views.GanttChart();
+      this.ganttChart = new HeuristicLab.Visualization.ChartControlsExtensions.GanttChart();
       this.SuspendLayout();
       //
 …
     #endregion
     private GanttChart ganttChart;
+    private HeuristicLab.Visualization.ChartControlsExtensions.GanttChart ganttChart;
+  }

-                      r6976
+                      r7460
     /// </summary>
     private void InitializeComponent() {
       this.ganttChart = new HeuristicLab.Clients.Hive.Views.GanttChart();
+      this.ganttChart = new HeuristicLab.Visualization.ChartControlsExtensions.GanttChart();
       this.SuspendLayout();
       //
 …
     #endregion
     private GanttChart ganttChart;
+    private HeuristicLab.Visualization.ChartControlsExtensions.GanttChart ganttChart;
+  }

Note: See TracChangeset for help on using the changeset viewer.