Skip to content

Commit

Permalink
Miscellaneous improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
DlhSoftTeam committed Oct 18, 2019
1 parent ee14386 commit 7043279
Show file tree
Hide file tree
Showing 464 changed files with 8,138 additions and 173 deletions.
2 changes: 1 addition & 1 deletion GanttChartLightLibraryDemos/Demos/Demos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>13</ApplicationRevision>
<ApplicationRevision>14</ApplicationRevision>
<ApplicationVersion>1.1.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MainFeatures", "MainFeatures.csproj", "{31849200-1CD3-48BF-A864-34F4C91A156D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MainFeatures", "MainFeatures.csproj", "{CF16BA97-DABA-4161-BCC0-D1FC82667556}"
EndProject
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MainFeatures", "MainFeatures.vbproj", "{EB87F7A0-6D62-4CC3-8AA6-EEA459B2C163}"
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MainFeatures", "MainFeatures.vbproj", "{3D5ECB6A-ECFF-404A-A569-7D2F2384C8DD}"
EndProject
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssigningResources", "AssigningResources.csproj", "{BBC46C8B-87B9-4AFB-ADE7-A3D9F57007B1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssigningResources", "AssigningResources.csproj", "{47309AAD-9621-4B8F-8B06-D91F01993F2F}"
EndProject
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@
<DataTemplate x:Key="LocalAssignmentsTemplate">
<ContentControl Content="{Binding AssignmentsContent}" Foreground="#eeeeee" IsHitTestVisible="False" IsTabStop="False"/>
</DataTemplate>
<ControlTemplate x:Key="LocalExpanderTemplate" TargetType="ToggleButton">
<Border Background="Transparent" Height="16" Padding="5" Width="16">
<Path x:Name="ExpandPath" Data="M0,0 L0,6 6,0 z" Fill="Transparent" Stroke="#FF777777">
<Path.RenderTransform>
<RotateTransform Angle="135" CenterY="3" CenterX="3"/>
</Path.RenderTransform>
</Path>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF1BBBFA"/>
<Setter Property="Fill" TargetName="ExpandPath" Value="Transparent"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="RenderTransform" TargetName="ExpandPath">
<Setter.Value>
<RotateTransform Angle="180" CenterY="3" CenterX="3"/>
</Setter.Value>
</Setter>
<Setter Property="Fill" TargetName="ExpandPath" Value="#FF777777"/>
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF777777"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style TargetType="pdgcc:GanttChartView" BasedOn="{StaticResource GanttChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
<Setter Property="Foreground" Value="#eeeeee"/>
Expand Down Expand Up @@ -55,6 +79,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:ScheduleChartView" BasedOn="{StaticResource ScheduleChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand Down Expand Up @@ -84,6 +109,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:LoadChartView" BasedOn="{StaticResource LoadChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand All @@ -103,6 +129,7 @@
<Setter Property="NonworkingTimeBackground" Value="#333333"/>
<Setter Property="CurrentTimeLineStroke" Value="#289451"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdpcc:PertChartView" BasedOn="{StaticResource PertChartViewTemplates2}"/>
<Style TargetType="pdpcc:NetworkDiagramView" BasedOn="{StaticResource NetworkDiagramViewTemplates2}"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssignmentsTemplate", "AssignmentsTemplate.csproj", "{D1D38D37-632C-4895-888A-15FB729612AA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssignmentsTemplate", "AssignmentsTemplate.csproj", "{CCBC91A2-A34A-494F-A22B-17171D93F952}"
EndProject
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@
<DataTemplate x:Key="LocalAssignmentsTemplate">
<ContentControl Content="{Binding AssignmentsContent}" Foreground="#eeeeee" IsHitTestVisible="False" IsTabStop="False"/>
</DataTemplate>
<ControlTemplate x:Key="LocalExpanderTemplate" TargetType="ToggleButton">
<Border Background="Transparent" Height="16" Padding="5" Width="16">
<Path x:Name="ExpandPath" Data="M0,0 L0,6 6,0 z" Fill="Transparent" Stroke="#FF777777">
<Path.RenderTransform>
<RotateTransform Angle="135" CenterY="3" CenterX="3"/>
</Path.RenderTransform>
</Path>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF1BBBFA"/>
<Setter Property="Fill" TargetName="ExpandPath" Value="Transparent"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="RenderTransform" TargetName="ExpandPath">
<Setter.Value>
<RotateTransform Angle="180" CenterY="3" CenterX="3"/>
</Setter.Value>
</Setter>
<Setter Property="Fill" TargetName="ExpandPath" Value="#FF777777"/>
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF777777"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style TargetType="pdgcc:GanttChartView" BasedOn="{StaticResource GanttChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
<Setter Property="Foreground" Value="#eeeeee"/>
Expand Down Expand Up @@ -55,6 +79,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:ScheduleChartView" BasedOn="{StaticResource ScheduleChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand Down Expand Up @@ -84,6 +109,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:LoadChartView" BasedOn="{StaticResource LoadChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand All @@ -103,6 +129,7 @@
<Setter Property="NonworkingTimeBackground" Value="#333333"/>
<Setter Property="CurrentTimeLineStroke" Value="#289451"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdpcc:PertChartView" BasedOn="{StaticResource PertChartViewTemplates2}"/>
<Style TargetType="pdpcc:NetworkDiagramView" BasedOn="{StaticResource NetworkDiagramViewTemplates2}"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssignmentsTree", "AssignmentsTree.csproj", "{F585709B-3E38-441C-AE87-3C85392AF610}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssignmentsTree", "AssignmentsTree.csproj", "{8FCB153A-4C9F-4CCB-9060-0ECBBEAAF24C}"
EndProject
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@
<DataTemplate x:Key="LocalAssignmentsTemplate">
<ContentControl Content="{Binding AssignmentsContent}" Foreground="#eeeeee" IsHitTestVisible="False" IsTabStop="False"/>
</DataTemplate>
<ControlTemplate x:Key="LocalExpanderTemplate" TargetType="ToggleButton">
<Border Background="Transparent" Height="16" Padding="5" Width="16">
<Path x:Name="ExpandPath" Data="M0,0 L0,6 6,0 z" Fill="Transparent" Stroke="#FF777777">
<Path.RenderTransform>
<RotateTransform Angle="135" CenterY="3" CenterX="3"/>
</Path.RenderTransform>
</Path>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF1BBBFA"/>
<Setter Property="Fill" TargetName="ExpandPath" Value="Transparent"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="RenderTransform" TargetName="ExpandPath">
<Setter.Value>
<RotateTransform Angle="180" CenterY="3" CenterX="3"/>
</Setter.Value>
</Setter>
<Setter Property="Fill" TargetName="ExpandPath" Value="#FF777777"/>
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF777777"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style TargetType="pdgcc:GanttChartView" BasedOn="{StaticResource GanttChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
<Setter Property="Foreground" Value="#eeeeee"/>
Expand Down Expand Up @@ -55,6 +79,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:ScheduleChartView" BasedOn="{StaticResource ScheduleChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand Down Expand Up @@ -84,6 +109,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:LoadChartView" BasedOn="{StaticResource LoadChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand All @@ -103,6 +129,7 @@
<Setter Property="NonworkingTimeBackground" Value="#333333"/>
<Setter Property="CurrentTimeLineStroke" Value="#289451"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdpcc:PertChartView" BasedOn="{StaticResource PertChartViewTemplates2}"/>
<Style TargetType="pdpcc:NetworkDiagramView" BasedOn="{StaticResource NetworkDiagramViewTemplates2}"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomaticScheduling", "AutomaticScheduling.csproj", "{F20655BF-B403-4841-8CFB-5ADE0C2E24DE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomaticScheduling", "AutomaticScheduling.csproj", "{3EE4BC4B-812E-42DC-9CAB-F359822C2E75}"
EndProject
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@
<DataTemplate x:Key="LocalAssignmentsTemplate">
<ContentControl Content="{Binding AssignmentsContent}" Foreground="#eeeeee" IsHitTestVisible="False" IsTabStop="False"/>
</DataTemplate>
<ControlTemplate x:Key="LocalExpanderTemplate" TargetType="ToggleButton">
<Border Background="Transparent" Height="16" Padding="5" Width="16">
<Path x:Name="ExpandPath" Data="M0,0 L0,6 6,0 z" Fill="Transparent" Stroke="#FF777777">
<Path.RenderTransform>
<RotateTransform Angle="135" CenterY="3" CenterX="3"/>
</Path.RenderTransform>
</Path>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF1BBBFA"/>
<Setter Property="Fill" TargetName="ExpandPath" Value="Transparent"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="RenderTransform" TargetName="ExpandPath">
<Setter.Value>
<RotateTransform Angle="180" CenterY="3" CenterX="3"/>
</Setter.Value>
</Setter>
<Setter Property="Fill" TargetName="ExpandPath" Value="#FF777777"/>
<Setter Property="Stroke" TargetName="ExpandPath" Value="#FF777777"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<Style TargetType="pdgcc:GanttChartView" BasedOn="{StaticResource GanttChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
<Setter Property="Foreground" Value="#eeeeee"/>
Expand Down Expand Up @@ -55,6 +79,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:ScheduleChartView" BasedOn="{StaticResource ScheduleChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand Down Expand Up @@ -84,6 +109,7 @@
<Setter Property="MilestoneBarStroke" Value="Gray"/>
<Setter Property="MilestoneBarFill" Value="#ffbb00"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdgcc:LoadChartView" BasedOn="{StaticResource LoadChartViewTemplates2}">
<Setter Property="Background" Value="#222222"/>
Expand All @@ -103,6 +129,7 @@
<Setter Property="NonworkingTimeBackground" Value="#333333"/>
<Setter Property="CurrentTimeLineStroke" Value="#289451"/>
<Setter Property="AssignmentsTemplate" Value="{StaticResource LocalAssignmentsTemplate}"/>
<Setter Property="ExpanderTemplate" Value="{StaticResource LocalExpanderTemplate}"/>
</Style>
<Style TargetType="pdpcc:PertChartView" BasedOn="{StaticResource PertChartViewTemplates2}"/>
<Style TargetType="pdpcc:NetworkDiagramView" BasedOn="{StaticResource NetworkDiagramViewTemplates2}"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarTemplating", "BarTemplating.csproj", "{C463E653-BC02-4950-A509-070B917C1340}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarTemplating", "BarTemplating.csproj", "{1941D7BB-8DDF-4CF9-BA24-C488DC803350}"
EndProject
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<Canvas>
<Grid Canvas.Left="{Binding Left}" Width="{Binding Width}" Height="20">
<Grid Canvas.Left="{Binding Left}" Width="{Binding Width}" Height="21">
<!-- Corner radius values are set to a small value to generate less rounded rectangle corners. -->
<Rectangle Fill="{Binding Path=Item.(pdgcc:GanttChartView.StandardBarFill)}" Stroke="{Binding Path=Item.(pdgcc:GanttChartView.StandardBarStroke)}" StrokeThickness="{Binding GanttChartView.StandardBarStrokeThickness}" RadiusX="{Binding GanttChartView.StandardBarCornerRadius}" RadiusY="{Binding GanttChartView.StandardBarCornerRadius}"/>
<!-- Add a light cyan effect rectangle inside the task bar. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public MainWindow()

CustomGanttChartItem item6 = GanttChartDataGrid.Items[6] as CustomGanttChartItem;
item6.Start = DateTime.Today.Add(TimeSpan.Parse("08:00:00"));
item6.Finish = DateTime.Today.AddDays(6).Add(TimeSpan.Parse("12:00:00"));
item6.Finish = DateTime.Today.AddDays(8).Add(TimeSpan.Parse("12:00:00"));
item6.EstimatedStart = DateTime.Today.AddDays(+1).Add(TimeSpan.Parse("08:00:00"));
item6.EstimatedFinish = DateTime.Today.AddDays(8 - 1).Add(TimeSpan.Parse("12:00:00"));
item6.Interruptions.Add(new Interruption { Start = DateTime.Today.AddDays(5).Add(TimeSpan.Parse("14:00:00")), Finish = DateTime.Today.AddDays(6).Add(TimeSpan.Parse("10:00:00")) });
item6.Interruptions.Add(new Interruption { Start = DateTime.Today.AddDays(4).Add(TimeSpan.Parse("14:00:00")), Finish = DateTime.Today.AddDays(6).Add(TimeSpan.Parse("10:00:00")) });

CustomGanttChartItem item7 = GanttChartDataGrid.Items[7] as CustomGanttChartItem;
item7.Start = DateTime.Today.AddDays(5);
Expand Down
Loading

0 comments on commit 7043279

Please sign in to comment.