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-29 13:11:23 +08:00
2 parents a8c7fd9272 6750031e36
commit 11f0ffd0ea
13 files changed
+489 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/ProductionPlanningView.xaml
+4 -5
View File
@@ -10,7 +10,7 @@
xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel"
xmlns:wf="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:UserTimeline="clr-namespace:Timeline;assembly=Timeline"
xmlns:UserTimeline="clr-namespace:Timelines;assembly=Timelines"
xmlns:wfi ="clr-namespace:System.Windows.Forms.Integration;assembly=WindowsFormsIntegration"
d:DataContext="{d:DesignInstance Type=viewmodel:ProductionPlanningModel}"
mc:Ignorable="d" Loaded="UserControl_Loaded"
@@ -24,10 +24,9 @@
<RowDefinition Height="60"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<!-- <lvc:CartesianChart x:Name="ch" XAxes="{Binding XAxes}" YAxes="{Binding YAxes}" Series="{Binding Series}" />-->
<wfi:WindowsFormsHost >
<UserTimeline:TimelineChart Name="Timeline"/>
<!-- <lvc:CartesianChart x:Name="ch" XAxes="{Binding XAxes}" YAxes="{Binding YAxes}" Series="{Binding Series}" />-->
<wfi:WindowsFormsHost>
<UserTimeline:Timeline x:Name="qwe"/>
</wfi:WindowsFormsHost>
</Grid>
<StackPanel x:Name="scr" Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal">
View/ProductionPlanningView.xaml.cs
+3 -3
View File
@@ -33,8 +33,8 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using SunlightCentralizedControlManagement_SCCM_.ViewModel;
using LiveChartsCore.SkiaSharpView.WPF;
using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
using Timeline.Model;
using Timeline;
using Timelines.Model;
using Timelines;
namespace SunlightCentralizedControlManagement_SCCM_.View
{
@@ -79,7 +79,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
}
}
qwe.ShowBarChart(startDate,endDate,testList);
// var dfg = new TimelineChart();
// qwe.Child = dfg.ShowBarChart(startDate, endDate, testList);
// timeline1.ShowBarChart(startDate, endDate, testList);