Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

ControlUse/Timeline/Timeline.Designer.cs → ControlUse/Timeline/TimelineChart.Designer.cs

@@ -1,6 +1,6 @@
 namespace Timeline
 {
-    partial class Timeline
+    partial class TimelineChart
     {
         /// <summary>
         /// Required designer variable.

ControlUse/Timeline/Timeline.cs → 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();
         }

ControlUse/Timeline/Timeline.csproj → ControlUse/Timeline/Timelines.csproj

@@ -47,18 +47,18 @@
     <Compile Include="Model\HeaderModel.cs" />
     <Compile Include="Model\ItemModel.cs" />
     <Compile Include="Processor\BarChartProcessor.cs" />
-    <Compile Include="Timeline.cs">
+    <Compile Include="TimelineChart.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Timeline.Designer.cs">
-      <DependentUpon>Timeline.cs</DependentUpon>
+    <Compile Include="TimelineChart.Designer.cs">
+      <DependentUpon>TimelineChart.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Timeline.resx">
-      <DependentUpon>Timeline.cs</DependentUpon>
+    <EmbeddedResource Include="TimelineChart.resx">
+      <DependentUpon>TimelineChart.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup />

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

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -387,9 +387,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="ControlUse\Timeline\Timeline.csproj">
+    <ProjectReference Include="ControlUse\Timeline\Timelines.csproj">
       <Project>{77d9fb0a-d628-4002-a118-b3d6e6601092}</Project>
-      <Name>Timeline</Name>
+      <Name>Timelines</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View/ProductionPlanningView.xaml

@@ -26,8 +26,8 @@
         <Grid Grid.Row="0">
          <!-- <lvc:CartesianChart x:Name="ch" XAxes="{Binding XAxes}" YAxes="{Binding YAxes}" Series="{Binding Series}" />-->
 
-            <wfi:WindowsFormsHost>
-                <UserTimeline:Timeline Name="Q"/>
+            <wfi:WindowsFormsHost >
+                <UserTimeline:TimelineChart Name="Timeline"/>
             </wfi:WindowsFormsHost>
         </Grid>
         <StackPanel x:Name="scr" Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal">            

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);
         }