diff --git a/App/RobobinApp/Resources/Images/lab_map.png b/App/RobobinApp/Resources/Images/lab_map.png new file mode 100644 index 0000000000000000000000000000000000000000..bace52f06634d8c2a56d491e05d27f6182e6cf55 Binary files /dev/null and b/App/RobobinApp/Resources/Images/lab_map.png differ diff --git a/App/RobobinApp/ViewModels/MainPageViewModel.cs b/App/RobobinApp/ViewModels/MainPageViewModel.cs index e6236440d9ac13e9024c6d690de1d7c83f07577d..4247a9458990d216cf67f0836554eace210746b6 100644 --- a/App/RobobinApp/ViewModels/MainPageViewModel.cs +++ b/App/RobobinApp/ViewModels/MainPageViewModel.cs @@ -60,21 +60,21 @@ namespace RobobinApp.ViewModels GetNewGraphCommand = new Command(async () => await GetNewGraph()); var graphNodes1 = new List<Node> { - new Node("1", 347, 276), + new Node("1", 355, 276), new Node("2", 321, 280), - new Node("3", 350, 318), + new Node("3", 355, 318), new Node("4", 326, 317), - new Node("5", 357, 360), + new Node("5", 357, 355), new Node("6", 328, 355), - new Node("7", 355, 404), - new Node("8", 332, 390), - new Node("9", 359, 455), + new Node("7", 355, 387), + new Node("8", 332, 387), + new Node("9", 355, 425), new Node("10", 334, 425), - new Node("11", 423, 443), - new Node("12", 417, 400), - new Node("13", 417, 355), - new Node("14", 416, 313), - new Node("15", 417, 269) + new Node("11", 423, 386), + new Node("12", 417, 358), + new Node("13", 417, 328), + new Node("14", 416, 283), + new Node("15", 417, 258) }; diff --git a/App/RobobinApp/Views/CentreGraph.xaml.cs b/App/RobobinApp/Views/CentreGraph.xaml.cs index 43cf7946362f3b3aad18e02f3d7ee389ab668b43..62ed74dffbe13e87725cee7301e7ef012d0010a4 100644 --- a/App/RobobinApp/Views/CentreGraph.xaml.cs +++ b/App/RobobinApp/Views/CentreGraph.xaml.cs @@ -45,7 +45,7 @@ namespace RobobinApp.Views { // Load the embedded image resource var assembly = typeof(GraphicsDrawable).Assembly; - var resourceStream = assembly.GetManifestResourceStream("Robobin.Resources.Images.lab_map.jpg"); + var resourceStream = assembly.GetManifestResourceStream("Robobin.Resources.Images.lab_map.png"); if (resourceStream != null) { @@ -71,7 +71,7 @@ namespace RobobinApp.Views { // Calculate offsets to center the nodes float canvasCenterX = storedDirtyRect.Width * 4.5f / 7; - float canvasCenterY = storedDirtyRect.Height / 2; + float canvasCenterY = storedDirtyRect.Height / 4.2f; // Calculate the center of the graph based on node coordinates float graphCenterX = (_graph.Nodes.Min(node => node.X) + _graph.Nodes.Max(node => node.X)) / 2; diff --git a/App/RobobinApp/Views/MainPage.xaml b/App/RobobinApp/Views/MainPage.xaml index 4665f20501fdb52cd69e6ab369b4dd40339bd712..f9e292bc6c3be95aee3e2784791b07adf76cddef 100644 --- a/App/RobobinApp/Views/MainPage.xaml +++ b/App/RobobinApp/Views/MainPage.xaml @@ -23,7 +23,7 @@ <RowDefinition Height="*"/> </Grid.RowDefinitions> <Grid.ColumnDefinitions> - <ColumnDefinition Width="1*" /> + <!--ColumnDefinition Width="1*" /--> <ColumnDefinition Width="2*" /> <ColumnDefinition Width="1*" /> </Grid.ColumnDefinitions> @@ -37,7 +37,7 @@ <Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/> </HorizontalStackLayout> <sides:ModeBox /> - <sides:QueueBox/> + <!--sides:QueueBox/--> <!--sides:SideBox HeaderTitle="Status:" /--> </VerticalStackLayout> @@ -45,7 +45,7 @@ <Frame StyleClass="mainFrame" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" - Grid.Column="1" Grid.Row="0"> + Grid.Column="0" Grid.Row="0"> <GraphicsView x:Name="GraphicsView" Drawable="{StaticResource drawable}"> <GraphicsView.GestureRecognizers> @@ -59,12 +59,12 @@ <VerticalStackLayout StyleClass="sideFrame" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" - Grid.Column="2" Grid.Row="0"> + Grid.Column="1" Grid.Row="0"> <HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End"> <Button Text="Switch Mode (Follow/Call)" Command="{Binding ToggleModeCommand}"/> </HorizontalStackLayout> - + <sides:ModeBox /> <sides:AdminBox HeaderTitle="Admin:" /> </VerticalStackLayout> diff --git a/App/RobobinApp/Views/MainPage_Android.xaml b/App/RobobinApp/Views/MainPage_Android.xaml index 2fa12d5e5271cceae78a61726d4489101d509751..a03d6dca125cf48a7a9bbd23bb1d5826e28e4000 100644 --- a/App/RobobinApp/Views/MainPage_Android.xaml +++ b/App/RobobinApp/Views/MainPage_Android.xaml @@ -28,9 +28,9 @@ HorizontalOptions="FillAndExpand" VerticalOptions="Start"> <HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End"> - <Button Text="Get Graph" Command="{Binding GetNewGraphCommand}"/> - <Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/> - <Button Text="Info" Command= "{Binding GoToHelpPage}"/> + <!--Button Text="Get Graph" Command="{Binding GetNewGraphCommand}"/--> + <!--Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/--> + <!--Button Text="Info" Command= "{Binding GoToHelpPage}"/--> <Button Text="Switch Mode (Follow/Call)" Command="{Binding ToggleModeCommand}"/> </HorizontalStackLayout> @@ -56,7 +56,7 @@ HorizontalOptions="FillAndExpand" VerticalOptions="End"> - <sides:QueueBox/> + <!--sides:QueueBox/--> <sides:ModeBox /> <sides:AdminBox HeaderTitle="Admin:" /> </VerticalStackLayout>