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

diff --git a/Parasitemia/Parasitemia/GUI/MainWindow.xaml b/Parasitemia/Parasitemia/GUI/MainWindow.xaml
index 9b710e5..9aecf1b 100644
--- a/Parasitemia/Parasitemia/GUI/MainWindow.xaml
+++ b/Parasitemia/Parasitemia/GUI/MainWindow.xaml
@@ -1,5 +1,9 @@
 <Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Name="MainWindow" Height="681.888" Width="787.61">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        x:Name="MainWindow" Height="681.888" Width="787.61" MinHeight="200" MinWidth="300" Title="Parasitemia" Icon="pack://application:,,,/Resources/logo_256.png">
    <DockPanel x:Name="dockPanelMain" LastChildFill="True">
       <Menu DockPanel.Dock="Top">
          <MenuItem Header="_File">
@@ -13,7 +17,6 @@
             <MenuItem x:Name="menuAddSourceImage" Header="_Add a source image" />
          </MenuItem>
       </Menu>
-
       <Grid x:Name="gridMain">
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -32,7 +35,7 @@
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Label x:Name="lblPatient" Margin="10, 3, 3, 3" Content="Patient"/>
+            <Label x:Name="lblPatient" Margin="10, 3, 3, 3" Content="Patient ID"/>
             <Label x:Name="lblGlobalParasitemia" Margin="10,3,3,3" Content="Global parasitemia" Grid.Row="1" />
             <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" />
@@ -55,11 +58,17 @@
                <RowDefinition/>
                <RowDefinition Height="60"/>
             </Grid.RowDefinitions>
-            <ScrollViewer x:Name="scrollViewCurrentImage" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" Background="Black" >
+            <ScrollViewer x:Name="scrollViewCurrentImage" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" Background="Black" MinHeight="100" MinWidth="100">
                <Border x:Name="borderCurrentImage" BorderBrush="Transparent">
                   <Canvas x:Name="canvasCurrentImage" Height="100" Width="100" />
                </Border>
             </ScrollViewer>
+            <Border Grid.RowSpan="1"  Margin="3" >
+               <ScrollViewer x:Name="scrollRBC" VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Visible">
+                  <StackPanel x:Name="stackRBC" Orientation="Horizontal" />
+               </ScrollViewer>
+            </Border>
+            <TextBlock x:Name="txtImageInformation" Grid.Row="2" TextWrapping="Wrap" />
          </Grid>
       </Grid>
    </DockPanel>