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

diff --git a/Parasitemia/Parasitemia/GUI/MainWindow.xaml b/Parasitemia/Parasitemia/GUI/MainWindow.xaml
index 9aecf1b..9fa8316 100644
--- a/Parasitemia/Parasitemia/GUI/MainWindow.xaml
+++ b/Parasitemia/Parasitemia/GUI/MainWindow.xaml
@@ -16,6 +16,12 @@
          <MenuItem Header="_Images">
             <MenuItem x:Name="menuAddSourceImage" Header="_Add a source image" />
          </MenuItem>
+         <MenuItem Header="_Analysis">
+            <MenuItem x:Name="menuStartAnalysis" Header="_Show analysis window" />
+         </MenuItem>
+         <MenuItem Header="_View">
+            <MenuItem x:Name="menuHightlightRBC" Header="_Highlight healthy erytrocytes" IsCheckable="True" />
+         </MenuItem>
       </Menu>
       <Grid x:Name="gridMain">
          <Grid.RowDefinitions>
@@ -23,52 +29,44 @@
             <RowDefinition/>
          </Grid.RowDefinitions>
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="130"/>
+            <ColumnDefinition Width="180"/>
             <ColumnDefinition/>
          </Grid.ColumnDefinitions>
          <Grid x:Name="gridGlobalInfo" Grid.ColumnSpan="2" Margin="3,3,3,3" >
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="101"/>
+               <ColumnDefinition Width="21"/>
                <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <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" />
-         </Grid>
-         <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>
-            </Border>
-            <Button x:Name="butStartAnalysis" Content="Start analysis" Grid.Row="1" Margin="3"/>
+            <Label x:Name="lblPatient" Margin="10,0,3,0 " Content="Patient ID" Grid.ColumnSpan="2"/>
+            <Label x:Name="lblGlobalParasitemia" Margin="10,0,3,0" Content="Global parasitemia" Grid.Row="1" Grid.ColumnSpan="2" />
+            <TextBox x:Name="txtPatient" Grid.Column="2" Margin="3,4,10,4" TextWrapping="Wrap" VerticalAlignment="Center" />
+            <TextBox x:Name="txtGlobalParasitemia" Grid.Column="2" Grid.Row="1" Margin="3,4,10,4" TextWrapping="Wrap" VerticalAlignment="Center" IsReadOnly="True" />
          </Grid>
+         <Border BorderBrush="Black" BorderThickness="1"  Margin="3" Grid.Row="1" >
+            <ScrollViewer x:Name="scrollPreviews" VerticalScrollBarVisibility="Auto" >
+               <StackPanel x:Name="stackPreviews" />
+            </ScrollViewer>
+         </Border>
          <Grid Grid.Column="2" Grid.Row="2">
             <Grid.RowDefinitions>
                <RowDefinition Height="100"/>
                <RowDefinition/>
-               <RowDefinition Height="60"/>
+               <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <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" />
+            <ScrollViewer x:Name="scrollRBC" VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Visible" Grid.RowSpan="1"  Margin="3">
+               <StackPanel x:Name="stackRBC" Orientation="Horizontal" />
+            </ScrollViewer>
+            <TextBlock x:Name="txtImageInformation" Grid.Row="2" TextWrapping="Wrap" Margin="3" />
          </Grid>
       </Grid>
    </DockPanel>