X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FXAML%2FMainWindow.xaml;h=9ce3f20c20a1ed358cca6e00e6ef0bad5f1c275f;hb=ecf48cdb4f085eb6f53b42f9d4eac67b44a92d70;hp=d8c1fc85951c60701f118c23eede49d33f0683c7;hpb=6c70577f0bcc17881c753f7a527d2ff4672bb6aa;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml b/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
index d8c1fc8..9ce3f20 100644
--- a/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
+++ b/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
@@ -3,7 +3,7 @@
         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="700" Width="1000" MinHeight="200" MinWidth="300" Title="Parasitemia" Icon="pack://application:,,,/Resources/icon.ico" ResizeMode="CanResizeWithGrip">
+        x:Name="MainWindow" Height="700" Width="1000" MinHeight="300" MinWidth="400" Title="Parasitemia" Icon="pack://application:,,,/Resources/icon.ico" ResizeMode="CanResizeWithGrip">
    <DockPanel x:Name="dockPanelMain" LastChildFill="True">
       <Menu DockPanel.Dock="Top">
          <MenuItem Header="_File">
@@ -12,16 +12,17 @@
             <MenuItem x:Name="menuSave" Header="_Save" InputGestureText="Ctrl+S" />
             <MenuItem x:Name="menuSaveAs" Header="Save _As..." InputGestureText="Ctrl+Shift+S" />
             <Separator />
+            <MenuItem x:Name="menuAddSourceImage" Header="_Import Images..." InputGestureText="Ctrl+A" />
+            <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>
          <MenuItem x:Name="menuAnalysis" Header="_Analysis">
-            <MenuItem x:Name="menuStartAnalysis" Header="_Show analysis window" />
+            <MenuItem x:Name="menuStartAnalysis" Header="_Show Analysis Window" InputGestureText="Ctrl+Y" />
          </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" InputGestureText="Ctrl+H" />
          </MenuItem>
          <MenuItem x:Name="menuHelp" Header="_Help">
             <MenuItem x:Name="menuAbout" Header="_About" />
@@ -41,7 +42,7 @@
             <RowDefinition/>
          </Grid.RowDefinitions>
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="180"/>
+            <ColumnDefinition Width="180" />
             <ColumnDefinition/>
          </Grid.ColumnDefinitions>
          <Grid x:Name="gridGlobalInfo" Grid.ColumnSpan="2" Margin="3,3,3,3" >
@@ -57,9 +58,11 @@
             <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="1"  Margin="3" Grid.Row="1" >
+         <Border BorderBrush="Black" BorderThickness="0"  Margin="3" Grid.Row="1" >
             <ScrollViewer x:Name="scrollPreviews" VerticalScrollBarVisibility="Auto" >
                <StackPanel x:Name="stackPreviews" />
             </ScrollViewer>
@@ -70,21 +73,45 @@
                <RowDefinition/>
                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <ScrollViewer x:Name="scrollViewCurrentImage" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" Background="Black" MinHeight="100" MinWidth="100">
+            <ScrollViewer x:Name="scrollViewCurrentImage" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" MinHeight="100" MinWidth="100" Background="#FF3E3E3E">
                <Border x:Name="borderCurrentImage" BorderBrush="Transparent">
                   <Canvas x:Name="canvasCurrentImage" Height="100" Width="100" />
                </Border>
             </ScrollViewer>
+            <Border Grid.Row="1" x:Name="imgLogos">
+               <Grid>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+                  <Image Grid.Row="1" Source="pack://application:,,,/Resources/chuv_logo.png" Stretch="None" Panel.ZIndex="1" Margin="0,0,0,10" />
+                  <Image Grid.Row="2" Source="pack://application:,,,/Resources/hes-so_logo.png" Stretch="None" Panel.ZIndex="1" Margin="0,10,0,0" />
+               </Grid>
+            </Border>
             <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>