X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FXAML%2FMainWindow.xaml;h=a330fa397bf069fec26768e5143898d34ad8bf34;hb=e588f9c954a54cb259b2c1f6f9e8d9dbd4639269;hp=e763beadfeabaf97c676df6699e45dd9316ebdb0;hpb=cb90b01c85183b2c75ee6d22b378b3ca99df6bf3;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml b/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
index e763bea..a330fa3 100644
--- a/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
+++ b/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
@@ -12,16 +12,18 @@
             <MenuItem x:Name="menuSave" Header="_Save" InputGestureText="Ctrl+S" />
             <MenuItem x:Name="menuSaveAs" Header="Save _As..." InputGestureText="Ctrl+Shift+S" />
             <Separator />
+            <MenuItem x:Name="menuExportResults" Header="E_xport Results As Text..." InputGestureText="Ctrl+E" />
+            <Separator />
             <MenuItem x:Name="menuExit" Header="_Exit" />
          </MenuItem>
          <MenuItem Header="_Images">
-            <MenuItem x:Name="menuAddSourceImage" Header="_Add a source image" />
+            <MenuItem x:Name="menuAddSourceImage" Header="_Add a Source Image" />
          </MenuItem>
          <MenuItem x:Name="menuAnalysis" Header="_Analysis">
-            <MenuItem x:Name="menuStartAnalysis" Header="_Show analysis window" />
+            <MenuItem x:Name="menuStartAnalysis" Header="_Show Analysis Window" />
          </MenuItem>
          <MenuItem x:Name="menuView" Header="_View">
-            <MenuItem x:Name="menuHightlightRBC" Header="_Highlight all erytrocytes" IsCheckable="True" />
+            <MenuItem x:Name="menuHightlightRBC" Header="_Highlight All Erythrocytes" IsCheckable="True" />
          </MenuItem>
          <MenuItem x:Name="menuHelp" Header="_Help">
             <MenuItem x:Name="menuAbout" Header="_About" />
@@ -57,7 +59,9 @@
             <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" />
+            <Border BorderThickness="1" VerticalAlignment="Center" Margin="3,4,10,4" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Grid.Column="2" Grid.Row="1" >
+               <TextBlock x:Name="txtGlobalParasitemia" Margin="1" TextWrapping="Wrap"  />
+            </Border>
          </Grid>
          <Border BorderBrush="Black" BorderThickness="0"  Margin="3" Grid.Row="1" >
             <ScrollViewer x:Name="scrollPreviews" VerticalScrollBarVisibility="Auto" >
@@ -90,13 +94,25 @@
             <ScrollViewer x:Name="scrollRBC" VerticalScrollBarVisibility="Hidden" HorizontalScrollBarVisibility="Visible" Grid.RowSpan="1"  Margin="3">
                <StackPanel x:Name="stackRBC" Orientation="Horizontal" />
             </ScrollViewer>
-            <Grid Grid.Row="2">
+            <Grid x:Name="gridImageInformation" Grid.Row="2">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>
-               <TextBlock x:Name="txtImageInformation1" TextWrapping="Wrap" Margin="3" Grid.Column="0" />
-               <TextBlock x:Name="txtImageInformation2" TextWrapping="Wrap" Margin="3" Grid.Column="1" />
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="1*" />
+               </Grid.RowDefinitions>
+               <Grid Grid.ColumnSpan="2" Grid.Row="0" Margin="0,3,3,0">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="Auto"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Label Content="Image name" Grid.Column="0"></Label>
+                  <TextBox x:Name="txtImageName" Grid.Column="1" VerticalAlignment="Center"> </TextBox>
+               </Grid>
+               <TextBlock x:Name="txtImageInformation1" TextWrapping="Wrap" Margin="3" Grid.Column="0" Grid.Row="1" />
+               <TextBlock x:Name="txtImageInformation2" TextWrapping="Wrap" Margin="3" Grid.Column="1" Grid.Row="1" />
             </Grid>
          </Grid>
       </Grid>