diff --git a/ControlUse/Timeline/Timeline.Designer.cs b/ControlUse/Timeline/TimelineChart.Designer.cs similarity index 97% rename from ControlUse/Timeline/Timeline.Designer.cs rename to ControlUse/Timeline/TimelineChart.Designer.cs index 751a5db..9e9636b 100644 --- a/ControlUse/Timeline/Timeline.Designer.cs +++ b/ControlUse/Timeline/TimelineChart.Designer.cs @@ -1,6 +1,6 @@ namespace Timeline { - partial class Timeline + partial class TimelineChart { /// /// Required designer variable. diff --git a/ControlUse/Timeline/Timeline.cs b/ControlUse/Timeline/TimelineChart.cs similarity index 99% rename from ControlUse/Timeline/Timeline.cs rename to ControlUse/Timeline/TimelineChart.cs index 7c4a884..632f9f1 100644 --- a/ControlUse/Timeline/Timeline.cs +++ b/ControlUse/Timeline/TimelineChart.cs @@ -17,7 +17,7 @@ using Timeline.Processor; namespace Timeline { - public partial class Timeline : UserControl + public partial class TimelineChart : UserControl { #region public properties public SolidBrush HoverClickSolidBrush { get; set; } @@ -39,7 +39,7 @@ namespace Timeline private int DistinctItemCount { get; set; } private DateTime EndDate { get; set; } #endregion - public Timeline() + public TimelineChart() { InitializeComponent(); } diff --git a/ControlUse/Timeline/Timeline.resx b/ControlUse/Timeline/TimelineChart.resx similarity index 100% rename from ControlUse/Timeline/Timeline.resx rename to ControlUse/Timeline/TimelineChart.resx diff --git a/ControlUse/Timeline/Timeline.csproj b/ControlUse/Timeline/Timelines.csproj similarity index 91% rename from ControlUse/Timeline/Timeline.csproj rename to ControlUse/Timeline/Timelines.csproj index 17b2bbd..93a39fe 100644 --- a/ControlUse/Timeline/Timeline.csproj +++ b/ControlUse/Timeline/Timelines.csproj @@ -47,18 +47,18 @@ - + UserControl - - Timeline.cs + + TimelineChart.cs - - Timeline.cs + + TimelineChart.cs diff --git a/SunlightCentralizedControlManagement(SCCM).sln b/SunlightCentralizedControlManagement(SCCM).sln index 4bbc606..5833aca 100644 --- a/SunlightCentralizedControlManagement(SCCM).sln +++ b/SunlightCentralizedControlManagement(SCCM).sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.11.35312.102 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SunlightCentralizedControlManagement_SCCM_", "SunlightCentralizedControlManagement_SCCM_.csproj", "{2CFE8A79-C7DC-47AC-8D0C-2E03010E2458}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Timeline", "ControlUse\Timeline\Timeline.csproj", "{77D9FB0A-D628-4002-A118-B3D6E6601092}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Timelines", "ControlUse\Timeline\Timelines.csproj", "{77D9FB0A-D628-4002-A118-B3D6E6601092}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index 01f4ac6..af7960d 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -387,9 +387,9 @@ - + {77d9fb0a-d628-4002-a118-b3d6e6601092} - Timeline + Timelines diff --git a/View/ProductionPlanningView.xaml b/View/ProductionPlanningView.xaml index afafbfa..6a54523 100644 --- a/View/ProductionPlanningView.xaml +++ b/View/ProductionPlanningView.xaml @@ -26,8 +26,8 @@ - - + + diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs index 3cea0d2..50ddfca 100644 --- a/View/ProductionPlanningView.xaml.cs +++ b/View/ProductionPlanningView.xaml.cs @@ -79,6 +79,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View } } + + // var dfg = new TimelineChart(); + // qwe.Child = dfg.ShowBarChart(startDate, endDate, testList); // timeline1.ShowBarChart(startDate, endDate, testList); }