From 704a7f0330d0c10821481a0c79434cf7775fc5e2 Mon Sep 17 00:00:00 2001 From: Paul-Winpenny <92634321+Paul-Winpenny@users.noreply.github.com> Date: Wed, 18 Dec 2024 13:06:52 +0000 Subject: [PATCH] Default graph not loaded anymore, to make it clearer to the user (hopefully) that they need to click "Get Graph" --- .../Platforms/Windows/Package.appxmanifest | 2 +- App/RobobinApp/RobobinApp.csproj | 2 +- App/RobobinApp/RobobinApp.csproj.user | 4 +-- .../ViewModels/MainPageViewModel.cs | 34 ++----------------- 4 files changed, 7 insertions(+), 35 deletions(-) diff --git a/App/RobobinApp/Platforms/Windows/Package.appxmanifest b/App/RobobinApp/Platforms/Windows/Package.appxmanifest index d3040b9d..04beb1a6 100644 --- a/App/RobobinApp/Platforms/Windows/Package.appxmanifest +++ b/App/RobobinApp/Platforms/Windows/Package.appxmanifest @@ -6,7 +6,7 @@ xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap"> - <Identity Name="maui-package-name-placeholder" Publisher="CN=paulw" Version="0.0.6.0" /> + <Identity Name="maui-package-name-placeholder" Publisher="CN=paulw" Version="0.0.7.0" /> <mp:PhoneIdentity PhoneProductId="8646FF59-A3E1-4276-A8EA-36FBC95CCEAD" PhonePublisherId="00000000-0000-0000-0000-000000000000"/> diff --git a/App/RobobinApp/RobobinApp.csproj b/App/RobobinApp/RobobinApp.csproj index 3cd2d928..a8e008bc 100644 --- a/App/RobobinApp/RobobinApp.csproj +++ b/App/RobobinApp/RobobinApp.csproj @@ -17,7 +17,7 @@ <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion> <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> - <GenerateAppInstallerFile>True</GenerateAppInstallerFile> + <GenerateAppInstallerFile>False</GenerateAppInstallerFile> <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled> <PackageCertificateKeyFile>RobobinApp_TemporaryKey.pfx</PackageCertificateKeyFile> <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm> diff --git a/App/RobobinApp/RobobinApp.csproj.user b/App/RobobinApp/RobobinApp.csproj.user index 5d36e5b9..feea143f 100644 --- a/App/RobobinApp/RobobinApp.csproj.user +++ b/App/RobobinApp/RobobinApp.csproj.user @@ -2,8 +2,8 @@ <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen> - <ActiveDebugFramework>net8.0-android</ActiveDebugFramework> - <ActiveDebugProfile>Pixel 5 - API 34 (Android 14.0 - API 34)</ActiveDebugProfile> + <ActiveDebugFramework>net8.0-windows10.0.19041.0</ActiveDebugFramework> + <ActiveDebugProfile>Windows Machine</ActiveDebugProfile> <SelectedPlatformGroup>Emulator</SelectedPlatformGroup> <DefaultDevice>pixel_5_-_api_34</DefaultDevice> <UapAppxPackageBuildMode>SideloadOnly</UapAppxPackageBuildMode> diff --git a/App/RobobinApp/ViewModels/MainPageViewModel.cs b/App/RobobinApp/ViewModels/MainPageViewModel.cs index 7b06e166..a3477a1d 100644 --- a/App/RobobinApp/ViewModels/MainPageViewModel.cs +++ b/App/RobobinApp/ViewModels/MainPageViewModel.cs @@ -60,41 +60,13 @@ namespace RobobinApp.ViewModels var graphNodes1 = new List<Node> { - new Node("A", 50, 50), - new Node("B", 150, 50), - new Node("C", 250, 50), - new Node("Home", 350, 50), - new Node("E", 50, 150), - new Node("F", 150, 150), - new Node("G", 250, 150), - new Node("H", 350, 150), - new Node("I", 50, 250), - new Node("J", 150, 250), - new Node("K", 250, 250), - new Node("L", 350, 250), - new Node("M", 50, 350), - new Node("N", 150, 350), - new Node("O", 350, 350) + new Node("No graph loaded", 50, 50), + }; var graphMatrix1 = CalculatePolarConnections(graphNodes1, new bool[,] { - { false, true, false, false, true, false, false, false, false, false, false, false, false, false, false }, - { true, false, true, false, false, true, false, false, false, false, false, false, false, false, false }, - { false, true, false, true, false, false, true, false, false, false, false, false, false, false, false }, - { false, false, true, false, false, false, false, true, false, false, false, false, false, false, true }, - { true, false, false, false, false, true, false, false, true, false, false, false, false, false, false }, - { false, true, false, false, true, false, true, false, false, true, false, false, false, false, false }, - { false, false, true, false, false, true, false, true, false, false, true, false, false, false, false }, - { false, false, false, true, false, false, true, false, false, false, false, true, false, false, false }, - { false, false, false, false, true, false, false, false, false, true, false, false, true, false, false }, - { false, false, false, false, false, true, false, false, true, false, true, false, false, true, false }, - { false, false, false, false, false, false, true, false, false, true, false, true, false, false, false }, - { false, false, false, false, false, false, false, true, false, false, true, false, false, false, true }, - { false, false, false, false, false, false, false, false, true, false, false, false, false, true, false }, - { false, false, false, false, false, false, false, false, false, true, false, false, true, false, true }, - { false, false, false, true, false, false, false, false, false, false, false, true, false, true, false } - }); + { false } }); var mapdata = App.WifiManager.MapData; Debug.WriteLine($"Mapdata : { mapdata}"); var graphNodes = graphNodes1; -- GitLab