sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

login working

Browse Source 
uuuuggglyyyyyyyyyyyyyy :(
This commit is contained in:
shinichi
2020-10-07 19:45:20 +02:00
parent 7bf5bdb1ce
commit a23b268dc9
6 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ClientApp/Views/MainView.xaml
View File

@@ -21,17 +21,17 @@
<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal" Margin="10">
<Label Content="Connected to server:"/>
<Label Content="{Binding Path=infoModel.ConnectedToServer}"/>
<Label Content="{Binding Path=MainWindowViewModel.infoModel.ConnectToServer}"/>
</StackPanel>
<StackPanel Grid.Column="1" Grid.Row="0" Orientation="Horizontal" Margin="10">
<Label Content="Connected to VR-Engine:"/>
<Label Content="{Binding Path=infoModel.ConnectedToVREngine}"/>
<Label Content="{Binding Path=MainWindowViewModel.infoModel.ConnectedToVREngine}"/>
</StackPanel>
<StackPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal" Margin="10">
<Label Content="Doctor connected:"/>
<Label Content="{Binding Path=infoModel.DoctorConnected}"/>
<Label Content="{Binding Path=MainWindowViewModel.infoModel.DoctorConnected}"/>
</StackPanel>
<Button Grid.Column="0" Grid.Row="1" Command="{Binding RetryServerCommand}" Width="50" Height="20">

13
ClientApp/Views/MainWindow.xaml.cs
View File

@@ -25,17 +25,12 @@ namespace ClientApp
public partial class MainWindow : Window
{
public MainWindow()
{
System.Diagnostics.Debug.WriteLine("derp1");
Client client = new Client();
System.Diagnostics.Debug.WriteLine("derp2");
InitializeComponent();
DataContext = new MainWindowViewModel();
System.Diagnostics.Debug.WriteLine("derp3");
DataContext = new MainWindowViewModel(client);
//BLEHandler bLEHandler = new BLEHandler(client);
@@ -46,16 +41,12 @@ namespace ClientApp
BikeSimulator bikeSimulator = new BikeSimulator(client);
System.Diagnostics.Debug.WriteLine("derp4");
Thread newThread = new Thread(new ThreadStart(bikeSimulator.StartSimulation));
newThread.Start();
//bikeSimulator.StartSimulation();
System.Diagnostics.Debug.WriteLine("derp5");
client.setHandler(bikeSimulator);
System.Diagnostics.Debug.WriteLine("derp6");
client.SetHandler(bikeSimulator);
}