X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FGUI%2FMainWindow.xaml;h=9b710e589b25d9c82ad615e0d882866db56f7395;hp=28923308530f4295e7ba9ac63104c0fcc0e4e8a0;hb=0af5da4bffad8333c8e57851e067218c0e21d7bb;hpb=da6b1ee15d0368ef9f2d9734b0d72996cbc227d8

diff --git a/Parasitemia/Parasitemia/GUI/MainWindow.xaml b/Parasitemia/Parasitemia/GUI/MainWindow.xaml
index 2892330..9b710e5 100644
--- a/Parasitemia/Parasitemia/GUI/MainWindow.xaml
+++ b/Parasitemia/Parasitemia/GUI/MainWindow.xaml
@@ -37,18 +37,30 @@
             <TextBox x:Name="txtPatient" Grid.Column="1" Margin="3, 3, 10, 3" TextWrapping="Wrap" VerticalAlignment="Center" />
             <TextBox x:Name="txtGlobalParasitemia" Grid.Column="1" Grid.Row="2" Margin="3, 3, 10, 3" TextWrapping="Wrap" VerticalAlignment="Center" IsReadOnly="True" />
          </Grid>
-         <Border BorderBrush="Black" BorderThickness="1"  Grid.Row="1" Margin="3">
-            <Grid>
-               <Grid.RowDefinitions>
-                  <RowDefinition/>
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <ScrollViewer x:Name="scrollPreviews" VerticalScrollBarVisibility="Auto" Margin="0,0,0,1" Grid.Row="1" >
+         <Grid Grid.Row="1">
+            <Grid.RowDefinitions>
+               <RowDefinition/>
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Border BorderBrush="Black" BorderThickness="1"  Margin="3" Grid.Row="0" >
+               <ScrollViewer x:Name="scrollPreviews" VerticalScrollBarVisibility="Auto" >
                   <StackPanel x:Name="stackPreviews" />
                </ScrollViewer>
-               <Button x:Name="butStartAnalysis" Content="Start analysis" Grid.Row="1"/>
-            </Grid>
-         </Border>
+            </Border>
+            <Button x:Name="butStartAnalysis" Content="Start analysis" Grid.Row="1" Margin="3"/>
+         </Grid>
+         <Grid Grid.Column="2" Grid.Row="2">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="100"/>
+               <RowDefinition/>
+               <RowDefinition Height="60"/>
+            </Grid.RowDefinitions>
+            <ScrollViewer x:Name="scrollViewCurrentImage" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" Background="Black" >
+               <Border x:Name="borderCurrentImage" BorderBrush="Transparent">
+                  <Canvas x:Name="canvasCurrentImage" Height="100" Width="100" />
+               </Border>
+            </ScrollViewer>
+         </Grid>
       </Grid>
    </DockPanel>
 </Window>
\ No newline at end of file