Skip to content
Snippets Groups Projects
Commit ca5fd678 authored by Paul-Winpenny's avatar Paul-Winpenny
Browse files

Updated the gui.

parent 0c362b9a
No related branches found
No related tags found
No related merge requests found
App/RobobinApp/Resources/Images/lab_map.png

749 KiB

...@@ -60,21 +60,21 @@ namespace RobobinApp.ViewModels ...@@ -60,21 +60,21 @@ namespace RobobinApp.ViewModels
GetNewGraphCommand = new Command(async () => await GetNewGraph()); GetNewGraphCommand = new Command(async () => await GetNewGraph());
var graphNodes1 = new List<Node> var graphNodes1 = new List<Node>
{ {
new Node("1", 347, 276), new Node("1", 355, 276),
new Node("2", 321, 280), new Node("2", 321, 280),
new Node("3", 350, 318), new Node("3", 355, 318),
new Node("4", 326, 317), new Node("4", 326, 317),
new Node("5", 357, 360), new Node("5", 357, 355),
new Node("6", 328, 355), new Node("6", 328, 355),
new Node("7", 355, 404), new Node("7", 355, 387),
new Node("8", 332, 390), new Node("8", 332, 387),
new Node("9", 359, 455), new Node("9", 355, 425),
new Node("10", 334, 425), new Node("10", 334, 425),
new Node("11", 423, 443), new Node("11", 423, 386),
new Node("12", 417, 400), new Node("12", 417, 358),
new Node("13", 417, 355), new Node("13", 417, 328),
new Node("14", 416, 313), new Node("14", 416, 283),
new Node("15", 417, 269) new Node("15", 417, 258)
}; };
......
...@@ -45,7 +45,7 @@ namespace RobobinApp.Views ...@@ -45,7 +45,7 @@ namespace RobobinApp.Views
{ {
// Load the embedded image resource // Load the embedded image resource
var assembly = typeof(GraphicsDrawable).Assembly; 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) if (resourceStream != null)
{ {
...@@ -71,7 +71,7 @@ namespace RobobinApp.Views ...@@ -71,7 +71,7 @@ namespace RobobinApp.Views
{ {
// Calculate offsets to center the nodes // Calculate offsets to center the nodes
float canvasCenterX = storedDirtyRect.Width * 4.5f / 7; 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 // 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; float graphCenterX = (_graph.Nodes.Min(node => node.X) + _graph.Nodes.Max(node => node.X)) / 2;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" /> <!--ColumnDefinition Width="1*" /-->
<ColumnDefinition Width="2*" /> <ColumnDefinition Width="2*" />
<ColumnDefinition Width="1*" /> <ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/> <Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/>
</HorizontalStackLayout> </HorizontalStackLayout>
<sides:ModeBox /> <sides:ModeBox />
<sides:QueueBox/> <!--sides:QueueBox/-->
<!--sides:SideBox HeaderTitle="Status:" /--> <!--sides:SideBox HeaderTitle="Status:" /-->
</VerticalStackLayout> </VerticalStackLayout>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<Frame StyleClass="mainFrame" <Frame StyleClass="mainFrame"
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
Grid.Column="1" Grid.Row="0"> Grid.Column="0" Grid.Row="0">
<GraphicsView x:Name="GraphicsView" <GraphicsView x:Name="GraphicsView"
Drawable="{StaticResource drawable}"> Drawable="{StaticResource drawable}">
<GraphicsView.GestureRecognizers> <GraphicsView.GestureRecognizers>
...@@ -59,12 +59,12 @@ ...@@ -59,12 +59,12 @@
<VerticalStackLayout StyleClass="sideFrame" <VerticalStackLayout StyleClass="sideFrame"
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
Grid.Column="2" Grid.Row="0"> Grid.Column="1" Grid.Row="0">
<HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End"> <HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End">
<Button Text="Switch Mode (Follow/Call)" Command="{Binding ToggleModeCommand}"/> <Button Text="Switch Mode (Follow/Call)" Command="{Binding ToggleModeCommand}"/>
</HorizontalStackLayout> </HorizontalStackLayout>
<sides:ModeBox />
<sides:AdminBox HeaderTitle="Admin:" /> <sides:AdminBox HeaderTitle="Admin:" />
</VerticalStackLayout> </VerticalStackLayout>
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
VerticalOptions="Start"> VerticalOptions="Start">
<HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End"> <HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End">
<Button Text="Get Graph" Command="{Binding GetNewGraphCommand}"/> <!--Button Text="Get Graph" Command="{Binding GetNewGraphCommand}"/-->
<Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/> <!--Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/-->
<Button Text="Info" Command= "{Binding GoToHelpPage}"/> <!--Button Text="Info" Command= "{Binding GoToHelpPage}"/-->
<Button Text="Switch Mode (Follow/Call)" Command="{Binding ToggleModeCommand}"/> <Button Text="Switch Mode (Follow/Call)" Command="{Binding ToggleModeCommand}"/>
</HorizontalStackLayout> </HorizontalStackLayout>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
VerticalOptions="End"> VerticalOptions="End">
<sides:QueueBox/> <!--sides:QueueBox/-->
<sides:ModeBox /> <sides:ModeBox />
<sides:AdminBox HeaderTitle="Admin:" /> <sides:AdminBox HeaderTitle="Admin:" />
</VerticalStackLayout> </VerticalStackLayout>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment