sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sc committed 2024-12-25 23:52:30 +08:00
2 parents ac3d12b899 c1b32eae92
commit a8c7fd9272
8 files changed
+16 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ControlUse/Timeline/Timeline.Designer.cs → ControlUse/Timeline/TimelineChart.Designer.cs
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
namespace Timeline namespace Timeline
{ {
partial class Timeline partial class TimelineChart
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
ControlUse/Timeline/Timeline.cs → ControlUse/Timeline/TimelineChart.cs
+2 -2
View File
@@ -17,7 +17,7 @@ using Timeline.Processor;
namespace Timeline namespace Timeline
{ {
public partial class Timeline : UserControl public partial class TimelineChart : UserControl
{ {
#region public properties #region public properties
public SolidBrush HoverClickSolidBrush { get; set; } public SolidBrush HoverClickSolidBrush { get; set; }
@@ -39,7 +39,7 @@ namespace Timeline
private int DistinctItemCount { get; set; } private int DistinctItemCount { get; set; }
private DateTime EndDate { get; set; } private DateTime EndDate { get; set; }
#endregion #endregion
public Timeline() public TimelineChart()
{ {
InitializeComponent(); InitializeComponent();
} }
ControlUse/Timeline/Timeline.resx → ControlUse/Timeline/TimelineChart.resx
View File
File renamed without changes.
ControlUse/Timeline/Timeline.csproj → ControlUse/Timeline/Timelines.csproj
+5 -5
View File
@@ -47,18 +47,18 @@
<Compile Include="Model\HeaderModel.cs" /> <Compile Include="Model\HeaderModel.cs" />
<Compile Include="Model\ItemModel.cs" /> <Compile Include="Model\ItemModel.cs" />
<Compile Include="Processor\BarChartProcessor.cs" /> <Compile Include="Processor\BarChartProcessor.cs" />
<Compile Include="Timeline.cs"> <Compile Include="TimelineChart.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="Timeline.Designer.cs"> <Compile Include="TimelineChart.Designer.cs">
<DependentUpon>Timeline.cs</DependentUpon> <DependentUpon>TimelineChart.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" /> <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Timeline.resx"> <EmbeddedResource Include="TimelineChart.resx">
<DependentUpon>Timeline.cs</DependentUpon> <DependentUpon>TimelineChart.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
SunlightCentralizedControlManagement(SCCM).sln
+1 -1
View File
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.11.35312.102
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SunlightCentralizedControlManagement_SCCM_", "SunlightCentralizedControlManagement_SCCM_.csproj", "{2CFE8A79-C7DC-47AC-8D0C-2E03010E2458}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SunlightCentralizedControlManagement_SCCM_", "SunlightCentralizedControlManagement_SCCM_.csproj", "{2CFE8A79-C7DC-47AC-8D0C-2E03010E2458}"
EndProject 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
SunlightCentralizedControlManagement_SCCM_.csproj
+2 -2
View File
@@ -387,9 +387,9 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="ControlUse\Timeline\Timeline.csproj"> <ProjectReference Include="ControlUse\Timeline\Timelines.csproj">
<Project>{77d9fb0a-d628-4002-a118-b3d6e6601092}</Project> <Project>{77d9fb0a-d628-4002-a118-b3d6e6601092}</Project>
<Name>Timeline</Name> <Name>Timelines</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
View/ProductionPlanningView.xaml
+2 -2
View File
@@ -26,8 +26,8 @@
<Grid Grid.Row="0"> <Grid Grid.Row="0">
<!-- <lvc:CartesianChart x:Name="ch" XAxes="{Binding XAxes}" YAxes="{Binding YAxes}" Series="{Binding Series}" />--> <!-- <lvc:CartesianChart x:Name="ch" XAxes="{Binding XAxes}" YAxes="{Binding YAxes}" Series="{Binding Series}" />-->
<wfi:WindowsFormsHost> <wfi:WindowsFormsHost >
<UserTimeline:Timeline Name="Q"/> <UserTimeline:TimelineChart Name="Timeline"/>
</wfi:WindowsFormsHost> </wfi:WindowsFormsHost>
</Grid> </Grid>
<StackPanel x:Name="scr" Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal"> <StackPanel x:Name="scr" Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal">
View/ProductionPlanningView.xaml.cs
+3
View File
@@ -79,6 +79,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
} }
} }
// var dfg = new TimelineChart();
// qwe.Child = dfg.ShowBarChart(startDate, endDate, testList);
// timeline1.ShowBarChart(startDate, endDate, testList); // timeline1.ShowBarChart(startDate, endDate, testList);
} }