Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

C sharp bible #405

Merged
merged 7 commits into from
May 19, 2024
Merged

C sharp bible #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fc9930
AboutEx
joecare99 May 19, 2024
0b01a3c
CanvasWPF2_ItemTemplateSelector
joecare99 May 19, 2024
8b0c84f
DynamicShapeWPF
joecare99 May 19, 2024
44a5351
MVVM_Converter_DrawGrid3_NonLin
joecare99 May 19, 2024
fb37fe3
Polyline
joecare99 May 19, 2024
9d037f6
TitleGen
joecare99 May 19, 2024
3fd7b38
CSharpBible
joecare99 May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/CanvasWPFView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:CanvasWPF2_ItemTemplateSelector"
xmlns:mvvm="clr-namespace:CanvasWPF2_ItemTemplateSelector.ViewModel"
Expand Down Expand Up @@ -131,7 +132,7 @@
</DataTemplate>
<ds:RessourceSelector x:Key="dsResourceSelector">
<ds:RessourceSelector.ItemKeys>
<ds:KeyString Key="dtRectangle"/>
<s:String>dtRectangle</s:String>
<ds:KeyString Key="dtCircle"/>
<ds:KeyString Key="dtHexagon"/>
<ds:KeyString Key="dtTorus"/>
Expand Down Expand Up @@ -161,7 +162,6 @@
<Style TargetType="ContentPresenter">
<Setter Property="Canvas.Left" Value="{Binding X}"/>
<Setter Property="Canvas.Top" Value="{Binding Y}"/>

</Style>
</ItemsControl.ItemContainerStyle>
<ItemsControl.ItemsPanel>
Expand Down
5 changes: 3 additions & 2 deletions CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class KeyString
/// </summary>
/// <value>The key.</value>
public string Key { get; set; } = "";
override public string ToString() => Key;
}

/// <summary>
Expand All @@ -56,7 +57,7 @@ public class RessourceSelector : DataTemplateSelector
/// Gets or sets the item keys.
/// </summary>
/// <value>The item keys.</value>
public List<KeyString> ItemKeys { get; set; } = new List<KeyString>();
public List<object> ItemKeys { get; set; } = new List<object>();
/// <summary>
/// When overridden in a derived class, returns a <see cref="T:System.Windows.DataTemplate" /> based on custom logic.
/// </summary>
Expand All @@ -67,7 +68,7 @@ public class RessourceSelector : DataTemplateSelector
{
if (container is FrameworkElement element && item is IVisualObject op && op.sType < ItemKeys.Count)
{
return element.FindResource(ItemKeys[op.sType].Key) as DataTemplate;
return element.FindResource(ItemKeys[op.sType].ToString()) as DataTemplate;
}
else return null;
}
Expand Down
4 changes: 4 additions & 0 deletions CSharpBible/Graphics/DynamicShapeWPF/DynamicShapeWPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
</ItemGroup>

</Project>
56 changes: 55 additions & 1 deletion CSharpBible/Graphics/Graphics.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,32 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_ImageHandling_net", "M
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_ImgGrid2", "MVVM_Converter_ImgGrid2\MVVM_Converter_ImgGrid2.csproj", "{F2CA5A63-D15B-4DE8-96B9-2089E64E5571}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "All_Graphics_net", "All_Graphics\All_Graphics_net.csproj", "{D9D4BDBD-9473-40DD-804E-92A63643D5DF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "All_Graphics_net", "All_Graphics\All_Graphics_net.csproj", "{D9D4BDBD-9473-40DD-804E-92A63643D5DF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polyline", "Polyline\Polyline.csproj", "{26EC1A76-255A-42E5-9CF5-FC735660858D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Polyline2", "Polyline\Polyline2.csproj", "{070E91DD-75E9-4186-A773-A2FB576AD1AB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polyline_net", "Polyline\Polyline_net.csproj", "{F82089E3-517C-47E9-B56E-656EC4047C97}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlotgraphWPF", "PlotgraphWPF\PlotgraphWPF.csproj", "{023EEB88-190E-4F3D-A887-D3C39517DBCD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Lines_on_Grid", "MVVM_Lines_on_Grid\MVVM_Lines_on_Grid.csproj", "{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TitleGen", "TitleGen\TitleGen.csproj", "{3C1358B1-9405-4891-BF70-3E6C2116C356}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TitleGen2", "TitleGen2\TitleGen2.csproj", "{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_DrawGrid3_NonLin", "MVVM_Converter_DrawGrid3_NonLin\MVVM_Converter_DrawGrid3_NonLin.csproj", "{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_Converter_Grid3_NonLin", "MVVM_Converter_Grid3_NonLin\MVVM_Converter_Grid3_NonLin.csproj", "{90581608-341A-4117-A12F-096D92977548}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVVM_DynamicShape", "MVVM_DynamicShape\MVVM_DynamicShape.csproj", "{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolySpline", "PolySpline\PolySpline.csproj", "{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolySpline_net", "PolySpline\PolySpline_net.csproj", "{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -195,6 +213,42 @@ Global
{F82089E3-517C-47E9-B56E-656EC4047C97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F82089E3-517C-47E9-B56E-656EC4047C97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F82089E3-517C-47E9-B56E-656EC4047C97}.Release|Any CPU.Build.0 = Release|Any CPU
{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{023EEB88-190E-4F3D-A887-D3C39517DBCD}.Release|Any CPU.Build.0 = Release|Any CPU
{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F8B8B7E-0422-4CC5-8778-8D3F9F1AF6D1}.Release|Any CPU.Build.0 = Release|Any CPU
{3C1358B1-9405-4891-BF70-3E6C2116C356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C1358B1-9405-4891-BF70-3E6C2116C356}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C1358B1-9405-4891-BF70-3E6C2116C356}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C1358B1-9405-4891-BF70-3E6C2116C356}.Release|Any CPU.Build.0 = Release|Any CPU
{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1DCD9ABD-195F-4EA9-9CC0-15A517F10271}.Release|Any CPU.Build.0 = Release|Any CPU
{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD829CC4-E6B9-42CB-A197-D8C20BBEFC30}.Release|Any CPU.Build.0 = Release|Any CPU
{90581608-341A-4117-A12F-096D92977548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90581608-341A-4117-A12F-096D92977548}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90581608-341A-4117-A12F-096D92977548}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90581608-341A-4117-A12F-096D92977548}.Release|Any CPU.Build.0 = Release|Any CPU
{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A7BADAF-70BB-4A6B-89A2-60C44E7E9773}.Release|Any CPU.Build.0 = Release|Any CPU
{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA06B4EA-BCC9-490C-AE1F-8A41E9F9ED68}.Release|Any CPU.Build.0 = Release|Any CPU
{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF90C4A7-DB44-4672-A4A5-E7D9996587BC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
136 changes: 63 additions & 73 deletions ...rid3_NonLin/Properties/Images.Designer.cs → ..._CTDrawGrid/Properties/Images.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading