From 7899ec88ed616b34b93fbcd505f55dd8e3123d7c Mon Sep 17 00:00:00 2001 From: NinjaPug <36635276+programmingPug@users.noreply.github.com> Date: Tue, 15 Apr 2025 14:42:29 -0400 Subject: [PATCH] V2 rebuild - with bugs -_- --- .gitignore | 4 + PCPal/Configurator/App.xaml | 69 + PCPal/Configurator/App.xaml.cs | 22 + PCPal/Configurator/AppShell.xaml | 72 + PCPal/Configurator/AppShell.xaml.cs | 130 ++ PCPal/Configurator/Configurator.csproj | 99 ++ PCPal/Configurator/Configurator.csproj.user | 31 + .../Controls/OledPreviewCanvas.cs | 606 ++++++++ PCPal/Configurator/MainPage.xaml | 36 + PCPal/Configurator/MainPage.xaml.cs | 25 + PCPal/Configurator/MauiProgram.cs | 61 + .../Platforms/Android/AndroidManifest.xml | 6 + .../Platforms/Android/MainActivity.cs | 10 + .../Platforms/Android/MainApplication.cs | 16 + .../Android/Resources/values/colors.xml | 6 + .../Platforms/MacCatalyst/AppDelegate.cs | 10 + .../Platforms/MacCatalyst/Entitlements.plist | 14 + .../Platforms/MacCatalyst/Info.plist | 38 + .../Platforms/MacCatalyst/Program.cs | 15 + PCPal/Configurator/Platforms/Tizen/Main.cs | 16 + .../Platforms/Tizen/tizen-manifest.xml | 15 + PCPal/Configurator/Platforms/Windows/App.xaml | 8 + .../Platforms/Windows/App.xaml.cs | 25 + .../Platforms/Windows/Package.appxmanifest | 46 + .../Platforms/Windows/app.manifest | 15 + .../Configurator/Platforms/iOS/AppDelegate.cs | 10 + PCPal/Configurator/Platforms/iOS/Info.plist | 32 + PCPal/Configurator/Platforms/iOS/Program.cs | 15 + .../iOS/Resources/PrivacyInfo.xcprivacy | 51 + .../Properties/launchSettings.json | 8 + .../Resources/AppIcon/appicon.svg | 4 + .../Resources/AppIcon/appiconfg.svg | 8 + .../Resources/Fonts/OpenSans-Regular.ttf | Bin 0 -> 107276 bytes .../Resources/Fonts/OpenSans-Semibold.ttf | Bin 0 -> 111184 bytes .../Resources/Images/dotnet_bot.png | Bin 0 -> 69811 bytes .../Resources/Raw/AboutAssets.txt | 15 + .../Configurator/Resources/Splash/splash.svg | 8 + .../Configurator/Resources/Styles/Colors.xaml | 45 + .../Resources/Styles/Converters.xaml | 18 + .../Resources/Styles/Converters.xaml.cs | 299 ++++ .../Configurator/Resources/Styles/Styles.xaml | 119 ++ .../Configurator/ViewModels/BaseViewModel.cs | 42 + .../Configurator/ViewModels/HelpViewModel.cs | 49 + .../ViewModels/LcdConfigViewModel.cs | 383 +++++ .../ViewModels/OledConfigViewModel.cs | 1252 +++++++++++++++++ .../ViewModels/SettingsViewModel.cs | 445 ++++++ .../ViewModels/TftConfigViewModel.cs | 39 + .../Configurator/Views/HelpView/HelpView.xaml | 213 +++ .../Views/HelpView/HelpView.xaml.cs | 12 + .../Configurator/Views/LCD/LcdConfigView.xaml | 174 +++ .../Views/LCD/LcdConfigView.xaml.cs | 15 + .../Views/OLED/OledConfigView.xaml | 87 ++ .../Views/OLED/OledConfigView.xaml.cs | 15 + .../Views/OLED/OledMarkupEditorView.xaml | 115 ++ .../Views/OLED/OledMarkupEditorView.xaml.cs | 28 + .../Views/OLED/OledTemplatesView.xaml | 132 ++ .../Views/OLED/OledTemplatesView.xaml.cs | 9 + .../Views/OLED/OledVisualEditorView.xaml | 290 ++++ .../Views/OLED/OledVisualEditorView.xaml.cs | 9 + .../Views/Settings/SettingsView.xaml | 252 ++++ .../Views/Settings/SettingsView.xaml.cs | 15 + .../Configurator/Views/TFT/TftConfigView.xaml | 85 ++ .../Views/TFT/TftConfigView.xaml.cs | 12 + PCPal/Core/Core.csproj | 15 + PCPal/Core/Models/DisplayConfig.cs | 119 ++ PCPal/Core/Models/PreviewElement.cs | 180 +++ PCPal/Core/Services/ConfigurationService.cs | 100 ++ PCPal/Core/Services/SensorService.cs | 294 ++++ PCPal/Core/Services/SerialPortService.cs | 239 ++++ PCPal/PCPal.csproj | 9 + PCPal/PCPal.sln | 33 + PCPal/Program.cs | 6 + PCPal/Properties/launchSettings.json | 29 + PCPal/appsettings.Development.json | 8 + PCPal/appsettings.json | 9 + PCPalConfigurator/Configurator/MauiProgram.cs | 61 + ...{PCPalConfigurator.csproj => PCPal.csproj} | 0 ...igurator.csproj.user => PCPal.csproj.user} | 0 .../{PCPalConfigurator.sln => PCPal.sln} | 0 .../Properties/Settings.Designer.cs | 2 +- PCPalConfigurator/Service/Worker.cs | 12 + 81 files changed, 6815 insertions(+), 1 deletion(-) create mode 100644 PCPal/Configurator/App.xaml create mode 100644 PCPal/Configurator/App.xaml.cs create mode 100644 PCPal/Configurator/AppShell.xaml create mode 100644 PCPal/Configurator/AppShell.xaml.cs create mode 100644 PCPal/Configurator/Configurator.csproj create mode 100644 PCPal/Configurator/Configurator.csproj.user create mode 100644 PCPal/Configurator/Controls/OledPreviewCanvas.cs create mode 100644 PCPal/Configurator/MainPage.xaml create mode 100644 PCPal/Configurator/MainPage.xaml.cs create mode 100644 PCPal/Configurator/MauiProgram.cs create mode 100644 PCPal/Configurator/Platforms/Android/AndroidManifest.xml create mode 100644 PCPal/Configurator/Platforms/Android/MainActivity.cs create mode 100644 PCPal/Configurator/Platforms/Android/MainApplication.cs create mode 100644 PCPal/Configurator/Platforms/Android/Resources/values/colors.xml create mode 100644 PCPal/Configurator/Platforms/MacCatalyst/AppDelegate.cs create mode 100644 PCPal/Configurator/Platforms/MacCatalyst/Entitlements.plist create mode 100644 PCPal/Configurator/Platforms/MacCatalyst/Info.plist create mode 100644 PCPal/Configurator/Platforms/MacCatalyst/Program.cs create mode 100644 PCPal/Configurator/Platforms/Tizen/Main.cs create mode 100644 PCPal/Configurator/Platforms/Tizen/tizen-manifest.xml create mode 100644 PCPal/Configurator/Platforms/Windows/App.xaml create mode 100644 PCPal/Configurator/Platforms/Windows/App.xaml.cs create mode 100644 PCPal/Configurator/Platforms/Windows/Package.appxmanifest create mode 100644 PCPal/Configurator/Platforms/Windows/app.manifest create mode 100644 PCPal/Configurator/Platforms/iOS/AppDelegate.cs create mode 100644 PCPal/Configurator/Platforms/iOS/Info.plist create mode 100644 PCPal/Configurator/Platforms/iOS/Program.cs create mode 100644 PCPal/Configurator/Platforms/iOS/Resources/PrivacyInfo.xcprivacy create mode 100644 PCPal/Configurator/Properties/launchSettings.json create mode 100644 PCPal/Configurator/Resources/AppIcon/appicon.svg create mode 100644 PCPal/Configurator/Resources/AppIcon/appiconfg.svg create mode 100644 PCPal/Configurator/Resources/Fonts/OpenSans-Regular.ttf create mode 100644 PCPal/Configurator/Resources/Fonts/OpenSans-Semibold.ttf create mode 100644 PCPal/Configurator/Resources/Images/dotnet_bot.png create mode 100644 PCPal/Configurator/Resources/Raw/AboutAssets.txt create mode 100644 PCPal/Configurator/Resources/Splash/splash.svg create mode 100644 PCPal/Configurator/Resources/Styles/Colors.xaml create mode 100644 PCPal/Configurator/Resources/Styles/Converters.xaml create mode 100644 PCPal/Configurator/Resources/Styles/Converters.xaml.cs create mode 100644 PCPal/Configurator/Resources/Styles/Styles.xaml create mode 100644 PCPal/Configurator/ViewModels/BaseViewModel.cs create mode 100644 PCPal/Configurator/ViewModels/HelpViewModel.cs create mode 100644 PCPal/Configurator/ViewModels/LcdConfigViewModel.cs create mode 100644 PCPal/Configurator/ViewModels/OledConfigViewModel.cs create mode 100644 PCPal/Configurator/ViewModels/SettingsViewModel.cs create mode 100644 PCPal/Configurator/ViewModels/TftConfigViewModel.cs create mode 100644 PCPal/Configurator/Views/HelpView/HelpView.xaml create mode 100644 PCPal/Configurator/Views/HelpView/HelpView.xaml.cs create mode 100644 PCPal/Configurator/Views/LCD/LcdConfigView.xaml create mode 100644 PCPal/Configurator/Views/LCD/LcdConfigView.xaml.cs create mode 100644 PCPal/Configurator/Views/OLED/OledConfigView.xaml create mode 100644 PCPal/Configurator/Views/OLED/OledConfigView.xaml.cs create mode 100644 PCPal/Configurator/Views/OLED/OledMarkupEditorView.xaml create mode 100644 PCPal/Configurator/Views/OLED/OledMarkupEditorView.xaml.cs create mode 100644 PCPal/Configurator/Views/OLED/OledTemplatesView.xaml create mode 100644 PCPal/Configurator/Views/OLED/OledTemplatesView.xaml.cs create mode 100644 PCPal/Configurator/Views/OLED/OledVisualEditorView.xaml create mode 100644 PCPal/Configurator/Views/OLED/OledVisualEditorView.xaml.cs create mode 100644 PCPal/Configurator/Views/Settings/SettingsView.xaml create mode 100644 PCPal/Configurator/Views/Settings/SettingsView.xaml.cs create mode 100644 PCPal/Configurator/Views/TFT/TftConfigView.xaml create mode 100644 PCPal/Configurator/Views/TFT/TftConfigView.xaml.cs create mode 100644 PCPal/Core/Core.csproj create mode 100644 PCPal/Core/Models/DisplayConfig.cs create mode 100644 PCPal/Core/Models/PreviewElement.cs create mode 100644 PCPal/Core/Services/ConfigurationService.cs create mode 100644 PCPal/Core/Services/SensorService.cs create mode 100644 PCPal/Core/Services/SerialPortService.cs create mode 100644 PCPal/PCPal.csproj create mode 100644 PCPal/PCPal.sln create mode 100644 PCPal/Program.cs create mode 100644 PCPal/Properties/launchSettings.json create mode 100644 PCPal/appsettings.Development.json create mode 100644 PCPal/appsettings.json create mode 100644 PCPalConfigurator/Configurator/MauiProgram.cs rename PCPalConfigurator/{PCPalConfigurator.csproj => PCPal.csproj} (100%) rename PCPalConfigurator/{PCPalConfigurator.csproj.user => PCPal.csproj.user} (100%) rename PCPalConfigurator/{PCPalConfigurator.sln => PCPal.sln} (100%) create mode 100644 PCPalConfigurator/Service/Worker.cs diff --git a/.gitignore b/.gitignore index 33e8a66..20af7cd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ /PCPalService/bin /PCPalService/obj PCPalService/service_log.txt +/PCPal/.vs +/PCPal/Configurator/obj +/PCPal/Core/bin +/PCPal/Core/obj diff --git a/PCPal/Configurator/App.xaml b/PCPal/Configurator/App.xaml new file mode 100644 index 0000000..c7dcc46 --- /dev/null +++ b/PCPal/Configurator/App.xaml @@ -0,0 +1,69 @@ + + + + + + + + + + + + #1E88E5 + #1565C0 + #E3F2FD + #CFD8DC + #03A9F4 + #F4F6F8 + #FFFFFF + #333333 + #555555 + #E1E4E8 + #4CAF50 + #F44336 + #FF9800 + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCPal/Configurator/App.xaml.cs b/PCPal/Configurator/App.xaml.cs new file mode 100644 index 0000000..c91c800 --- /dev/null +++ b/PCPal/Configurator/App.xaml.cs @@ -0,0 +1,22 @@ +namespace PCPal.Configurator; + +public partial class App : Application +{ + public App() + { + InitializeComponent(); + MainPage = new AppShell(); + } + + protected override Window CreateWindow(IActivationState activationState) + { + Window window = base.CreateWindow(activationState); + + // Configure window properties + window.Title = "PCPal Configurator"; + window.MinimumWidth = 1000; + window.MinimumHeight = 700; + + return window; + } +} \ No newline at end of file diff --git a/PCPal/Configurator/AppShell.xaml b/PCPal/Configurator/AppShell.xaml new file mode 100644 index 0000000..ebb1483 --- /dev/null +++ b/PCPal/Configurator/AppShell.xaml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + 1602 LCD Display + 4.6" TFT Display + OLED Display + Settings + Help + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PCPal/Configurator/AppShell.xaml.cs b/PCPal/Configurator/AppShell.xaml.cs new file mode 100644 index 0000000..a39d112 --- /dev/null +++ b/PCPal/Configurator/AppShell.xaml.cs @@ -0,0 +1,130 @@ +using PCPal.Core.Services; +using PCPal.Configurator.ViewModels; +using PCPal.Configurator.Views; +using PCPal.Configurator.Views.LCD; +using PCPal.Configurator.Views.OLED; +using PCPal.Configurator.Views.TFT; +using System.ComponentModel; +//using UIKit; + +namespace PCPal.Configurator; + +public partial class AppShell : Shell, INotifyPropertyChanged +{ + private bool _isConnected; + private string _connectionStatus; + private DateTime _lastUpdateTime; + + private readonly IServiceProvider _serviceProvider; + + public bool IsConnected + { + get => _isConnected; + set + { + if (_isConnected != value) + { + _isConnected = value; + OnPropertyChanged(); + } + } + } + + public string ConnectionStatus + { + get => _connectionStatus; + set + { + if (_connectionStatus != value) + { + _connectionStatus = value; + OnPropertyChanged(); + } + } + } + + public DateTime LastUpdateTime + { + get => _lastUpdateTime; + set + { + if (_lastUpdateTime != value) + { + _lastUpdateTime = value; + OnPropertyChanged(); + } + } + } + + public AppShell() + { + InitializeComponent(); + + _serviceProvider = IPlatformApplication.Current.Services; + + // Set initial connection status + IsConnected = false; + ConnectionStatus = "Not connected"; + LastUpdateTime = DateTime.Now; + + // Start with LCD view + NavMenu.SelectedItem = "1602 LCD Display"; + + // Start connection monitoring in the background + StartConnectivityMonitoring(); + } + + private void OnNavMenuSelectionChanged(object sender, SelectionChangedEventArgs e) + { + if (e.CurrentSelection.FirstOrDefault() is string selection) + { + ContentView view = selection switch + { + "1602 LCD Display" => _serviceProvider.GetService(), + "4.6 TFT Display" => _serviceProvider.GetService(), + "OLED Display" => _serviceProvider.GetService(), + "Settings" => _serviceProvider.GetService(), + "Help" => _serviceProvider.GetService(), + _ => null + }; + + if (view != null) + { + ContentContainer.Content = view; + } + } + } + + private async void StartConnectivityMonitoring() + { + var serialPortService = _serviceProvider.GetService(); + if (serialPortService != null) + { + // Subscribe to connection status changes + serialPortService.ConnectionStatusChanged += (sender, isConnected) => + { + MainThread.BeginInvokeOnMainThread(() => + { + IsConnected = isConnected; + ConnectionStatus = isConnected ? "Connected to " + serialPortService.CurrentPort : "Not connected"; + LastUpdateTime = DateTime.Now; + }); + }; + + // Start periodic connection check + while (true) + { + await Task.Delay(5000); + try + { + await serialPortService.CheckConnectionAsync(); + } + catch (Exception ex) + { + // Log error but don't crash the app + System.Diagnostics.Debug.WriteLine($"Connection check error: {ex.Message}"); + } + } + } + } +} \ No newline at end of file diff --git a/PCPal/Configurator/Configurator.csproj b/PCPal/Configurator/Configurator.csproj new file mode 100644 index 0000000..edfffad --- /dev/null +++ b/PCPal/Configurator/Configurator.csproj @@ -0,0 +1,99 @@ + + + + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + + + + + Exe + Configurator + true + true + enable + enable + + + Configurator + + + com.companyname.configurator + + + 1.0 + 1 + + 11.0 + 13.1 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + + + + + + diff --git a/PCPal/Configurator/Configurator.csproj.user b/PCPal/Configurator/Configurator.csproj.user new file mode 100644 index 0000000..891593c --- /dev/null +++ b/PCPal/Configurator/Configurator.csproj.user @@ -0,0 +1,31 @@ + + + + False + net8.0-windows10.0.19041.0 + Windows Machine + + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + Designer + + + \ No newline at end of file diff --git a/PCPal/Configurator/Controls/OledPreviewCanvas.cs b/PCPal/Configurator/Controls/OledPreviewCanvas.cs new file mode 100644 index 0000000..c86455e --- /dev/null +++ b/PCPal/Configurator/Controls/OledPreviewCanvas.cs @@ -0,0 +1,606 @@ +//using Android.Sax; +using Microsoft.Maui.Controls.Shapes; +using PCPal.Configurator.ViewModels; +using PCPal.Core.Models; +using System.Collections.ObjectModel; +using System.Collections.Specialized; + +namespace PCPal.Configurator.Controls; + +public class OledPreviewCanvas : GraphicsView +{ + // Bindable properties for the control + public static readonly BindableProperty ElementsProperty = BindableProperty.Create( + nameof(Elements), + typeof(IList), + typeof(OledPreviewCanvas), + null, + propertyChanged: OnElementsChanged); + + public static readonly BindableProperty SelectedElementProperty = BindableProperty.Create( + nameof(SelectedElement), + typeof(OledElement), + typeof(OledPreviewCanvas), + null, + BindingMode.TwoWay, + propertyChanged: OnSelectedElementChanged); + + public static readonly BindableProperty IsEditableProperty = BindableProperty.Create( + nameof(IsEditable), + typeof(bool), + typeof(OledPreviewCanvas), + false); + + public static readonly BindableProperty ScaleProperty = BindableProperty.Create( + nameof(Scale), + typeof(float), + typeof(OledPreviewCanvas), + 1.0f, + propertyChanged: OnScaleChanged); + + public static readonly BindableProperty WidthProperty = BindableProperty.Create( + nameof(Width), + typeof(int), + typeof(OledPreviewCanvas), + 256); + + public static readonly BindableProperty HeightProperty = BindableProperty.Create( + nameof(Height), + typeof(int), + typeof(OledPreviewCanvas), + 64); + + // Property accessors + public IList Elements + { + get => (IList)GetValue(ElementsProperty); + set => SetValue(ElementsProperty, value); + } + + public OledElement SelectedElement + { + get => (OledElement)GetValue(SelectedElementProperty); + set => SetValue(SelectedElementProperty, value); + } + + public bool IsEditable + { + get => (bool)GetValue(IsEditableProperty); + set => SetValue(IsEditableProperty, value); + } + + public float Scale + { + get => (float)GetValue(ScaleProperty); + set => SetValue(ScaleProperty, value); + } + + public new int Width + { + get => (int)GetValue(WidthProperty); + set => SetValue(WidthProperty, value); + } + + public new int Height + { + get => (int)GetValue(HeightProperty); + set => SetValue(HeightProperty, value); + } + + // Constructor + public OledPreviewCanvas() + { + // Set default drawing + Drawable = new OledCanvasDrawable(this); + + // Set up interaction handlers if editable + StartInteraction += OnStartInteraction; + DragInteraction += OnDragInteraction; + EndInteraction += OnEndInteraction; + + // Set up initial size + WidthRequest = 256 * Scale; + HeightRequest = 64 * Scale; + } + + // Element collection change handler + private static void OnElementsChanged(BindableObject bindable, object oldValue, object newValue) + { + var canvas = (OledPreviewCanvas)bindable; + + // If old value is INotifyCollectionChanged, unsubscribe + if (oldValue is INotifyCollectionChanged oldCollection) + { + oldCollection.CollectionChanged -= canvas.OnCollectionChanged; + } + + // If new value is INotifyCollectionChanged, subscribe + if (newValue is INotifyCollectionChanged newCollection) + { + newCollection.CollectionChanged += canvas.OnCollectionChanged; + } + + // Invalidate the canvas to redraw + canvas.Invalidate(); + } + + // Selected element change handler + private static void OnSelectedElementChanged(BindableObject bindable, object oldValue, object newValue) + { + var canvas = (OledPreviewCanvas)bindable; + canvas.Invalidate(); + } + + // Scale change handler + private static void OnScaleChanged(BindableObject bindable, object oldValue, object newValue) + { + var canvas = (OledPreviewCanvas)bindable; + float scale = (float)newValue; + + // Update the size of the canvas based on the scale + canvas.WidthRequest = canvas.Width * scale; + canvas.HeightRequest = canvas.Height * scale; + + canvas.Invalidate(); + } + + // Collection changed event handler + private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) + { + Invalidate(); + } + + // Interaction handlers for element selection and manipulation + private OledElement draggedElement; + private Point dragStartPoint; + + private void OnStartInteraction(object sender, TouchEventArgs e) + { + if (!IsEditable) return; + + var point = e.Touches[0]; + dragStartPoint = point; + + // Check if an element was clicked + if (Elements != null) + { + // Need to adjust for scale + float x = (float)point.X / Scale; + float y = (float)point.Y / Scale; + + foreach (var element in Elements) + { + if (element is TextElement textElement) + { + // Simple bounding box check + if (x >= textElement.X && x <= textElement.X + 100 && + y >= textElement.Y - 20 && y <= textElement.Y) + { + // Find the OledElement that corresponds to this PreviewElement + var oledElement = FindOledElementForPreviewElement(textElement); + if (oledElement != null) + { + draggedElement = oledElement; + SelectedElement = oledElement; + return; + } + } + } + else if (element is BarElement barElement) + { + if (x >= barElement.X && x <= barElement.X + barElement.Width && + y >= barElement.Y && y <= barElement.Y + barElement.Height) + { + var oledElement = FindOledElementForPreviewElement(barElement); + if (oledElement != null) + { + draggedElement = oledElement; + SelectedElement = oledElement; + return; + } + } + } + else if (element is RectElement rectElement) + { + if (x >= rectElement.X && x <= rectElement.X + rectElement.Width && + y >= rectElement.Y && y <= rectElement.Y + rectElement.Height) + { + var oledElement = FindOledElementForPreviewElement(rectElement); + if (oledElement != null) + { + draggedElement = oledElement; + SelectedElement = oledElement; + return; + } + } + } + else if (element is LineElement lineElement) + { + // Simplified line hit detection + float lineLength = (float)Math.Sqrt( + Math.Pow(lineElement.X2 - lineElement.X1, 2) + + Math.Pow(lineElement.Y2 - lineElement.Y1, 2)); + + // Check if point is close to the line + float distance = DistancePointToLine( + x, y, + lineElement.X1, lineElement.Y1, + lineElement.X2, lineElement.Y2); + + if (distance < 10) // 10 pixel tolerance + { + var oledElement = FindOledElementForPreviewElement(lineElement); + if (oledElement != null) + { + draggedElement = oledElement; + SelectedElement = oledElement; + return; + } + } + } + else if (element is IconElement iconElement) + { + if (x >= iconElement.X && x <= iconElement.X + 24 && + y >= iconElement.Y && y <= iconElement.Y + 24) + { + var oledElement = FindOledElementForPreviewElement(iconElement); + if (oledElement != null) + { + draggedElement = oledElement; + SelectedElement = oledElement; + return; + } + } + } + } + + // No element was clicked, deselect + SelectedElement = null; + } + } + + private void OnDragInteraction(object sender, TouchEventArgs e) + { + if (!IsEditable || draggedElement == null) return; + + var point = e.Touches[0]; + + // Calculate the delta from the start point + float deltaX = (float)(point.X - dragStartPoint.X) / Scale; + float deltaY = (float)(point.Y - dragStartPoint.Y) / Scale; + + // Update the position of the dragged element + draggedElement.X += (int)deltaX; + draggedElement.Y += (int)deltaY; + + // Keep element within bounds + draggedElement.X = Math.Max(0, Math.Min(Width - 10, draggedElement.X)); + draggedElement.Y = Math.Max(0, Math.Min(Height - 10, draggedElement.Y)); + + // Update the start point for the next move + dragStartPoint = point; + + // Notify property changes + var viewModel = BindingContext as OledConfigViewModel; + if (viewModel != null) + { + // Update the view model properties to reflect the new position + viewModel.OnPropertyChanged(nameof(viewModel.SelectedElementX)); + viewModel.OnPropertyChanged(nameof(viewModel.SelectedElementY)); + + // Update the markup + viewModel.UpdateMarkupFromElements(); + } + + // Invalidate the canvas to redraw + Invalidate(); + } + + private void OnEndInteraction(object sender, TouchEventArgs e) + { + draggedElement = null; + } + + // Helper methods + private OledElement FindOledElementForPreviewElement(PreviewElement previewElement) + { + var viewModel = BindingContext as OledConfigViewModel; + if (viewModel == null || viewModel.OledElements == null) return null; + + foreach (var oledElement in viewModel.OledElements) + { + // Match based on position and type + if (previewElement is TextElement textElement && oledElement.Type == "text") + { + if (oledElement.X == textElement.X && oledElement.Y == textElement.Y) + { + return oledElement; + } + } + else if (previewElement is BarElement barElement && oledElement.Type == "bar") + { + if (oledElement.X == barElement.X && oledElement.Y == barElement.Y) + { + return oledElement; + } + } + else if (previewElement is RectElement rectElement) + { + if ((oledElement.Type == "rect" || oledElement.Type == "box") && + oledElement.X == rectElement.X && oledElement.Y == rectElement.Y) + { + return oledElement; + } + } + else if (previewElement is LineElement lineElement && oledElement.Type == "line") + { + if (oledElement.X == lineElement.X1 && oledElement.Y == lineElement.Y1) + { + return oledElement; + } + } + else if (previewElement is IconElement iconElement && oledElement.Type == "icon") + { + if (oledElement.X == iconElement.X && oledElement.Y == iconElement.Y) + { + return oledElement; + } + } + } + + return null; + } + + private float DistancePointToLine(float px, float py, float x1, float y1, float x2, float y2) + { + float lineLength = (float)Math.Sqrt(Math.Pow(x2 - x1, 2) + Math.Pow(y2 - y1, 2)); + if (lineLength == 0) return (float)Math.Sqrt(Math.Pow(px - x1, 2) + Math.Pow(py - y1, 2)); + + float t = ((px - x1) * (x2 - x1) + (py - y1) * (y2 - y1)) / (lineLength * lineLength); + t = Math.Max(0, Math.Min(1, t)); + + float projX = x1 + t * (x2 - x1); + float projY = y1 + t * (y2 - y1); + + return (float)Math.Sqrt(Math.Pow(px - projX, 2) + Math.Pow(py - projY, 2)); + } +} + +// The drawable that renders the OLED canvas +public class OledCanvasDrawable : IDrawable +{ + private readonly OledPreviewCanvas _canvas; + + public OledCanvasDrawable(OledPreviewCanvas canvas) + { + _canvas = canvas; + } + + public void Draw(ICanvas canvas, RectF dirtyRect) + { + float scale = _canvas.Scale; + + // Clear background + canvas.FillColor = Colors.Black; + canvas.FillRectangle(0, 0, dirtyRect.Width, dirtyRect.Height); + + // Draw grid if requested + if (_canvas.IsEditable && _canvas.Parent?.BindingContext is OledConfigViewModel viewModel && viewModel.ShowGridLines) + { + canvas.StrokeColor = new Color(64, 64, 64, 64); // Semi-transparent gray + canvas.StrokeSize = 1; + + // Draw vertical grid lines + for (int x = 0; x <= _canvas.Width; x += 10) + { + canvas.DrawLine(x * scale, 0, x * scale, _canvas.Height * scale); + } + + // Draw horizontal grid lines + for (int y = 0; y <= _canvas.Height; y += 10) + { + canvas.DrawLine(0, y * scale, _canvas.Width * scale, y * scale); + } + } + + // Draw elements + if (_canvas.Elements != null) + { + foreach (var element in _canvas.Elements) + { + // Check if this element is selected + bool isSelected = false; + if (_canvas.SelectedElement != null && _canvas.IsEditable) + { + if (element is TextElement textElement && _canvas.SelectedElement.Type == "text") + { + isSelected = _canvas.SelectedElement.X == textElement.X && _canvas.SelectedElement.Y == textElement.Y; + } + else if (element is BarElement barElement && _canvas.SelectedElement.Type == "bar") + { + isSelected = _canvas.SelectedElement.X == barElement.X && _canvas.SelectedElement.Y == barElement.Y; + } + else if (element is RectElement rectElement && + (_canvas.SelectedElement.Type == "rect" || _canvas.SelectedElement.Type == "box")) + { + isSelected = _canvas.SelectedElement.X == rectElement.X && _canvas.SelectedElement.Y == rectElement.Y; + } + else if (element is LineElement lineElement && _canvas.SelectedElement.Type == "line") + { + isSelected = _canvas.SelectedElement.X == lineElement.X1 && _canvas.SelectedElement.Y == lineElement.Y1; + } + else if (element is IconElement iconElement && _canvas.SelectedElement.Type == "icon") + { + isSelected = _canvas.SelectedElement.X == iconElement.X && _canvas.SelectedElement.Y == iconElement.Y; + } + } + + // Draw the element with appropriate styling + DrawElement(canvas, element, scale, isSelected); + } + } + } + + private void DrawElement(ICanvas canvas, PreviewElement element, float scale, bool isSelected) + { + // Set selection highlighting if needed + if (isSelected) + { + canvas.StrokeColor = Colors.Cyan; + canvas.StrokeSize = 2; + } + else + { + canvas.StrokeColor = Colors.White; + canvas.StrokeSize = 1; + } + + canvas.FillColor = Colors.White; + + if (element is TextElement textElement) + { + float fontSize; + switch (textElement.Size) + { + case 1: fontSize = 8 * scale; break; + case 2: fontSize = 12 * scale; break; + case 3: fontSize = 16 * scale; break; + default: fontSize = 8 * scale; break; + } + + canvas.FontSize = fontSize; + canvas.FontColor = Colors.White; + canvas.DrawString( + textElement.Text, + textElement.X * scale, + textElement.Y * scale, + HorizontalAlignment.Left); + + // Draw selection indicator for text elements + if (isSelected) + { + var metrics = canvas.GetStringSize(textElement.Text, Microsoft.Maui.Graphics.Font.Default, fontSize); + canvas.DrawRectangle( + textElement.X * scale - 2, + textElement.Y * scale - metrics.Height - 2, + metrics.Width + 4, + metrics.Height + 4); + } + } + else if (element is BarElement barElement) + { + // Draw outline + canvas.DrawRectangle( + barElement.X * scale, + barElement.Y * scale, + barElement.Width * scale, + barElement.Height * scale); + + // Draw fill based on value + int fillWidth = (int)(barElement.Width * (barElement.Value / 100.0)); + if (fillWidth > 0) + { + canvas.FillRectangle( + (barElement.X + 1) * scale, + (barElement.Y + 1) * scale, + (fillWidth - 1) * scale, + (barElement.Height - 2) * scale); + } + + // Draw selection indicator + if (isSelected) + { + canvas.StrokeColor = Colors.Cyan; + canvas.DrawRectangle( + (barElement.X - 2) * scale, + (barElement.Y - 2) * scale, + (barElement.Width + 4) * scale, + (barElement.Height + 4) * scale); + } + } + else if (element is RectElement rectElement) + { + if (rectElement.Filled) + { + // Filled box + canvas.FillRectangle( + rectElement.X * scale, + rectElement.Y * scale, + rectElement.Width * scale, + rectElement.Height * scale); + } + else + { + // Outline rectangle + canvas.DrawRectangle( + rectElement.X * scale, + rectElement.Y * scale, + rectElement.Width * scale, + rectElement.Height * scale); + } + + // Draw selection indicator + if (isSelected) + { + canvas.StrokeColor = Colors.Cyan; + canvas.DrawRectangle( + (rectElement.X - 2) * scale, + (rectElement.Y - 2) * scale, + (rectElement.Width + 4) * scale, + (rectElement.Height + 4) * scale); + } + } + else if (element is LineElement lineElement) + { + canvas.DrawLine( + lineElement.X1 * scale, + lineElement.Y1 * scale, + lineElement.X2 * scale, + lineElement.Y2 * scale); + + // Draw selection indicator + if (isSelected) + { + canvas.StrokeColor = Colors.Cyan; + canvas.StrokeSize = 3; + canvas.DrawLine( + lineElement.X1 * scale, + lineElement.Y1 * scale, + lineElement.X2 * scale, + lineElement.Y2 * scale); + + // Draw endpoints + canvas.FillCircle(lineElement.X1 * scale, lineElement.Y1 * scale, 4); + canvas.FillCircle(lineElement.X2 * scale, lineElement.Y2 * scale, 4); + } + } + else if (element is IconElement iconElement) + { + // Draw a placeholder for the icon + canvas.DrawRectangle( + iconElement.X * scale, + iconElement.Y * scale, + 24 * scale, + 24 * scale); + + // Draw icon name as text + canvas.FontSize = 8 * scale; + canvas.DrawString( + iconElement.Name, + (iconElement.X + 2) * scale, + (iconElement.Y + 12) * scale, + HorizontalAlignment.Left); + + // Draw selection indicator + if (isSelected) + { + canvas.StrokeColor = Colors.Cyan; + canvas.DrawRectangle( + (iconElement.X - 2) * scale, + (iconElement.Y - 2) * scale, + (24 + 4) * scale, + (24 + 4) * scale); + } + } + } +} \ No newline at end of file diff --git a/PCPal/Configurator/MainPage.xaml b/PCPal/Configurator/MainPage.xaml new file mode 100644 index 0000000..7e93f88 --- /dev/null +++ b/PCPal/Configurator/MainPage.xaml @@ -0,0 +1,36 @@ + + + + + + + +