From 5cbfb5447945a2d6b16deb51deaf9c3ad364be1a Mon Sep 17 00:00:00 2001 From: Joe Care Date: Sun, 12 May 2024 21:10:58 +0200 Subject: [PATCH 01/13] AboutEx --- .../{View => Views}/Converter/WindowPortToTileDisplay.cs | 0 .../MVVM_Converter_ImgGrid/{View => Views}/PlotFrame.xaml | 0 .../MVVM_Converter_ImgGrid/{View => Views}/PlotFrame.xaml.cs | 0 .../{View => Views}/Converter/WindowPortToTileDisplay.cs | 0 .../MVVM_Converter_ImgGrid2/{View => Views}/PlotFrame.xaml | 0 .../MVVM_Converter_ImgGrid2/{View => Views}/PlotFrame.xaml.cs | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename CSharpBible/Graphics/MVVM_Converter_ImgGrid/{View => Views}/Converter/WindowPortToTileDisplay.cs (100%) rename CSharpBible/Graphics/MVVM_Converter_ImgGrid/{View => Views}/PlotFrame.xaml (100%) rename CSharpBible/Graphics/MVVM_Converter_ImgGrid/{View => Views}/PlotFrame.xaml.cs (100%) rename CSharpBible/Graphics/MVVM_Converter_ImgGrid2/{View => Views}/Converter/WindowPortToTileDisplay.cs (100%) rename CSharpBible/Graphics/MVVM_Converter_ImgGrid2/{View => Views}/PlotFrame.xaml (100%) rename CSharpBible/Graphics/MVVM_Converter_ImgGrid2/{View => Views}/PlotFrame.xaml.cs (100%) diff --git a/CSharpBible/Graphics/MVVM_Converter_ImgGrid/View/Converter/WindowPortToTileDisplay.cs b/CSharpBible/Graphics/MVVM_Converter_ImgGrid/Views/Converter/WindowPortToTileDisplay.cs similarity index 100% rename from CSharpBible/Graphics/MVVM_Converter_ImgGrid/View/Converter/WindowPortToTileDisplay.cs rename to CSharpBible/Graphics/MVVM_Converter_ImgGrid/Views/Converter/WindowPortToTileDisplay.cs diff --git a/CSharpBible/Graphics/MVVM_Converter_ImgGrid/View/PlotFrame.xaml b/CSharpBible/Graphics/MVVM_Converter_ImgGrid/Views/PlotFrame.xaml similarity index 100% rename from CSharpBible/Graphics/MVVM_Converter_ImgGrid/View/PlotFrame.xaml rename to CSharpBible/Graphics/MVVM_Converter_ImgGrid/Views/PlotFrame.xaml diff --git a/CSharpBible/Graphics/MVVM_Converter_ImgGrid/View/PlotFrame.xaml.cs b/CSharpBible/Graphics/MVVM_Converter_ImgGrid/Views/PlotFrame.xaml.cs similarity index 100% rename from CSharpBible/Graphics/MVVM_Converter_ImgGrid/View/PlotFrame.xaml.cs rename to CSharpBible/Graphics/MVVM_Converter_ImgGrid/Views/PlotFrame.xaml.cs diff --git a/CSharpBible/Graphics/MVVM_Converter_ImgGrid2/View/Converter/WindowPortToTileDisplay.cs b/CSharpBible/Graphics/MVVM_Converter_ImgGrid2/Views/Converter/WindowPortToTileDisplay.cs similarity index 100% rename from CSharpBible/Graphics/MVVM_Converter_ImgGrid2/View/Converter/WindowPortToTileDisplay.cs rename to CSharpBible/Graphics/MVVM_Converter_ImgGrid2/Views/Converter/WindowPortToTileDisplay.cs diff --git a/CSharpBible/Graphics/MVVM_Converter_ImgGrid2/View/PlotFrame.xaml b/CSharpBible/Graphics/MVVM_Converter_ImgGrid2/Views/PlotFrame.xaml similarity index 100% rename from CSharpBible/Graphics/MVVM_Converter_ImgGrid2/View/PlotFrame.xaml rename to CSharpBible/Graphics/MVVM_Converter_ImgGrid2/Views/PlotFrame.xaml diff --git a/CSharpBible/Graphics/MVVM_Converter_ImgGrid2/View/PlotFrame.xaml.cs b/CSharpBible/Graphics/MVVM_Converter_ImgGrid2/Views/PlotFrame.xaml.cs similarity index 100% rename from CSharpBible/Graphics/MVVM_Converter_ImgGrid2/View/PlotFrame.xaml.cs rename to CSharpBible/Graphics/MVVM_Converter_ImgGrid2/Views/PlotFrame.xaml.cs From 9caa076d34a9c1b8613a5dcbf9c2791fbce4599a Mon Sep 17 00:00:00 2001 From: Joe Care Date: Sun, 12 May 2024 21:11:39 +0200 Subject: [PATCH 02/13] All_Graphics --- .../Graphics/All_Graphics/All_Graphics_net.csproj | 1 + .../All_Graphics/Models/AllExampleModel.cs | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj b/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj index 6efeeb555..deb6f110f 100644 --- a/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj +++ b/CSharpBible/Graphics/All_Graphics/All_Graphics_net.csproj @@ -25,6 +25,7 @@ + diff --git a/CSharpBible/Graphics/All_Graphics/Models/AllExampleModel.cs b/CSharpBible/Graphics/All_Graphics/Models/AllExampleModel.cs index e34e253d0..445f456ff 100644 --- a/CSharpBible/Graphics/All_Graphics/Models/AllExampleModel.cs +++ b/CSharpBible/Graphics/All_Graphics/Models/AllExampleModel.cs @@ -56,6 +56,20 @@ public partial class AllExampleModel : ObservableObject, ITemplateModel public List Examples { get; } = [ ("CanvasWPF", typeof(CanvasWPF.Views.CanvasWPFView), null), + ("CanvasWPF2", typeof(CanvasWPF_CT.Views.CanvasWPFView), null), + ("CanvasWPF3", typeof(CanvasWPF2_ItemTemplateSelector.Views.CanvasWPFView), null), + ("CanvasWPF4", typeof(CanvasWPF2_CTItemTemplateSelector.Views.CanvasWPFView), null), + ("DynamicShape", typeof(DynamicShapeWPF.Views.DynamicShapeView), null), + ("DrawGrid_CT", typeof(MVVM_Converter_CTDrawGrid.Views.PlotFrame), null), + ("DrawGrid2_CT", typeof(MVVM_Converter_CTDrawGrid2.Views.PlotFrame), null), + ("ImgGrid_CT", typeof(MVVM_Converter_CTImgGrid.Views.PlotFrame), null), + ("DrawGrid", typeof(MVVM_Converter_DrawGrid.Views.PlotFrame), null), + ("DrawGrid2", typeof(MVVM_Converter_DrawGrid2.View.PlotFrame), null), + ("ImgGrid", typeof(MVVM_Converter_ImgGrid.Views.ImgGridView), null), + ("ImgGrid2", typeof(MVVM_Converter_ImgGrid2.Views.ImgGridView), null), + ("ImageHandling", typeof(MVVM_ImageHandling.Views.TemplateView), null), + ("Lines_on_Grid", typeof(MVVM_Lines_on_Grid2.View.PlotFrame), null), + ("PolyLine", typeof(Polyline.Views.PolyLineView), null), From 4f3e8bae4d0ad35fb82ef384852e9385bc139048 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Sun, 12 May 2024 21:11:40 +0200 Subject: [PATCH 03/13] CanvasWPF2_CTItemTemplateSelector --- .../CanvasWPF2_CTItemTemplateSelector.csproj | 15 +++++++++++++++ .../Views/DataSelector/RessourceSelector.cs | 2 +- .../Views/MainWindow.xaml | 4 ++-- .../Views/MainWindow.xaml.cs | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj index adafe46ff..04a33b034 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/CanvasWPF2_CTItemTemplateSelector.csproj @@ -43,4 +43,19 @@ + + + Resources.resx + True + True + + + + + + Resources.Designer.cs + PublicResXFileCodeGenerator + + + diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/DataSelector/RessourceSelector.cs b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/DataSelector/RessourceSelector.cs index 636cfa989..35abdcbca 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/DataSelector/RessourceSelector.cs +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/DataSelector/RessourceSelector.cs @@ -8,7 +8,7 @@ using System.Windows.Controls; using System.Xml.Linq; -namespace CanvasWPF2_CTItemTemplateSelector.View.DataSelector +namespace CanvasWPF2_CTItemTemplateSelector.Views.DataSelector { /// /// Class ItemTemplateSelector. diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml index 23596ca7f..92e802da8 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml @@ -1,11 +1,11 @@ - diff --git a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml.cs b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml.cs index c3990a654..fdd3c34b8 100644 --- a/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml.cs +++ b/CSharpBible/Graphics/CanvasWPF2_CTItemTemplateSelector/Views/MainWindow.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; -namespace CanvasWPF2_CTItemTemplateSelector.View +namespace CanvasWPF2_CTItemTemplateSelector.Views { /// /// Interaction logic for MainWindow.xaml From 8625b5b14589659af3966b0c51596ad9aef9942e Mon Sep 17 00:00:00 2001 From: Joe Care Date: Sun, 12 May 2024 21:11:40 +0200 Subject: [PATCH 04/13] CanvasWPF2_ItemTemplateSelector --- .../CanvasWPF2_ItemTemplateSelector.csproj | 15 ++++++++++++++ .../ViewModel/MainWindowViewmodel.cs | 20 +++++++++---------- .../Views/DataSelector/RessourceSelector.cs | 2 +- .../Views/MainWindow.xaml | 4 ++-- .../Views/MainWindow.xaml.cs | 2 +- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj index 25d0b918a..bf95fe54d 100644 --- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj +++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/CanvasWPF2_ItemTemplateSelector.csproj @@ -39,4 +39,19 @@ + + + Resources.resx + True + True + + + + + + Resources.Designer.cs + PublicResXFileCodeGenerator + + + diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/ViewModel/MainWindowViewmodel.cs b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/ViewModel/MainWindowViewmodel.cs index 6f7d4b01d..25680d374 100644 --- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/ViewModel/MainWindowViewmodel.cs +++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/ViewModel/MainWindowViewmodel.cs @@ -42,28 +42,28 @@ private enum SelectedShape { None, Circle, Rectangle } /// Gets or sets the dc select shape. /// /// The dc select shape. - public DelegateCommand dcSelectShape { get; set; } + public DelegateCommand SelectShapeCommand { get; set; } /// /// Gets or sets the dc create shape. /// /// The dc create shape. - public DelegateCommand dcCreateShape { get; set; } + public DelegateCommand CreateShapeCommand { get; set; } /// /// Gets or sets the dc delete shape. /// /// The dc delete shape. - public DelegateCommand dcDeleteShape { get; set; } + public DelegateCommand DeleteShapeCommand { get; set; } /// /// Gets or sets the dc key down. /// /// The dc key down. - public DelegateCommand dcKeyDown { get; set; } + public DelegateCommand KeyDownCommand { get; set; } /// /// Gets or sets the dc key up. /// /// The dc key up. - public DelegateCommand dcKeyUp { get; set; } + public DelegateCommand KeyUpCommand { get; set; } #endregion #region Methods @@ -72,24 +72,24 @@ private enum SelectedShape { None, Circle, Rectangle } /// public MainWindowViewModel() { - dcCreateShape = new DelegateCommand( + CreateShapeCommand = new DelegateCommand( (o) => DoCreateShape(o), (o) => _editShape != null ); - dcSelectShape = new DelegateCommand( + SelectShapeCommand = new DelegateCommand( (o) => DoSelectShape(o), (o) => true ); - dcDeleteShape = new DelegateCommand( + DeleteShapeCommand = new DelegateCommand( (o) => DoDeleteShape(o), (o) => true ); - dcKeyDown = new DelegateCommand((o) => { DataText = $"Data: Down {o}"; }); + KeyDownCommand = new DelegateCommand((o) => { DataText = $"Data: Down {o}"; }); - dcKeyUp = new DelegateCommand((o) => { DataText = $"Data: Up {o}"; }); + KeyUpCommand = new DelegateCommand((o) => { DataText = $"Data: Up {o}"; }); for (int i = 0; i < 5; i++) { diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs index 9646684b1..876e942a9 100644 --- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs +++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/DataSelector/RessourceSelector.cs @@ -3,7 +3,7 @@ using System.Windows; using System.Windows.Controls; -namespace CanvasWPF2_ItemTemplateSelector.View.DataSelector +namespace CanvasWPF2_ItemTemplateSelector.Views.DataSelector { /// /// Class ItemTemplateSelector. diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml index 4103e9e0f..e6c5a3620 100644 --- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml +++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml @@ -1,11 +1,11 @@ - diff --git a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml.cs b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml.cs index 977f40cdc..8ac13d9b1 100644 --- a/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml.cs +++ b/CSharpBible/Graphics/CanvasWPF2_ItemTemplateSelector/Views/MainWindow.xaml.cs @@ -1,7 +1,7 @@ using CanvasWPF2_ItemTemplateSelector.ViewModel; using System.Windows; -namespace CanvasWPF2_ItemTemplateSelector.View +namespace CanvasWPF2_ItemTemplateSelector.Views { /// /// Interaction logic for MainWindow.xaml From 54601c8160fa62aeaeb56ed0b41267f4bd02de63 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Sun, 12 May 2024 21:11:41 +0200 Subject: [PATCH 05/13] CanvasWPF_CT --- CSharpBible/Graphics/CanvasWPF_CT/Views/CanvasWPFView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CSharpBible/Graphics/CanvasWPF_CT/Views/CanvasWPFView.xaml b/CSharpBible/Graphics/CanvasWPF_CT/Views/CanvasWPFView.xaml index b0e3881bb..2e91a52c1 100644 --- a/CSharpBible/Graphics/CanvasWPF_CT/Views/CanvasWPFView.xaml +++ b/CSharpBible/Graphics/CanvasWPF_CT/Views/CanvasWPFView.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:CanvasWPF_CT" xmlns:mvvm="clr-namespace:CanvasWPF_CT.ViewModel" mc:Ignorable="d" - Title="Dynamic Shapes" Height="450" Width="800"> + Title="Dynamic Shapes" d:Height="450" d:Width="800"> From 8cd1f967f79af96604eb6239b6344b1dbea91fa4 Mon Sep 17 00:00:00 2001 From: Joe Care Date: Sun, 12 May 2024 21:11:41 +0200 Subject: [PATCH 06/13] MVVM_Converter_CTDrawGrid --- .../Converter/WindowPortToTileDisplay.cs | 2 +- .../Views/PlotFrame.xaml | 22 +++++++++---------- .../Views/PlotFrame.xaml.cs | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/Converter/WindowPortToTileDisplay.cs b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/Converter/WindowPortToTileDisplay.cs index e1552ce97..aa0450a52 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/Converter/WindowPortToTileDisplay.cs +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/Converter/WindowPortToTileDisplay.cs @@ -7,7 +7,7 @@ using System.Collections.ObjectModel; using System.Windows; -namespace MVVM_Converter_CTDrawGrid.View.Converter +namespace MVVM_Converter_CTDrawGrid.Views.Converter { /// /// Class WindowPortToTileDisplay. diff --git a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/PlotFrame.xaml b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/PlotFrame.xaml index 651673f8f..f1fff6282 100644 --- a/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/PlotFrame.xaml +++ b/CSharpBible/Graphics/MVVM_Converter_CTDrawGrid/Views/PlotFrame.xaml @@ -1,10 +1,10 @@ - - + - + -