X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FXAML%2FMainWindow.xaml;h=2b43c862d609153e04c9d246b6b84989a0f8a905;hb=074d6b0377f51e868deb1c427891c722d0270deb;hp=37ea0c01643870fb38f02af03e427775b764ea58;hpb=4bfa3cbdc6145e6944f02e24829ab2ef3a851ac1;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml b/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
index 37ea0c0..2b43c86 100644
--- a/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
+++ b/Parasitemia/ParasitemiaUI/XAML/MainWindow.xaml
@@ -3,13 +3,14 @@
         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/icon.ico">
+        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">
-            <MenuItem x:Name="menuNew" Header="_New"  />
-            <MenuItem x:Name="menuOpen" Header="_Open" />
-            <MenuItem x:Name="menuSave" Header="_Save" />
+            <MenuItem x:Name="menuNew" Header="_New" InputGestureText="Ctrl+N" />
+            <MenuItem x:Name="menuOpen" Header="_Open" InputGestureText="Ctrl+O" />
+            <MenuItem x:Name="menuSave" Header="_Save" InputGestureText="Ctrl+S" />
+            <MenuItem x:Name="menuSaveAs" Header="Save _As..." InputGestureText="Ctrl+Shift+S" />
             <Separator />
             <MenuItem x:Name="menuExit" Header="_Exit" />
          </MenuItem>
@@ -20,19 +21,27 @@
             <MenuItem x:Name="menuStartAnalysis" Header="_Show analysis window" />
          </MenuItem>
          <MenuItem x:Name="menuView" Header="_View">
-            <MenuItem x:Name="menuHightlightRBC" Header="_Highlight healthy erytrocytes" IsCheckable="True" />
+            <MenuItem x:Name="menuHightlightRBC" Header="_Highlight all erytrocytes" IsCheckable="True" />
          </MenuItem>
          <MenuItem x:Name="menuHelp" Header="_Help">
             <MenuItem x:Name="menuAbout" Header="_About" />
          </MenuItem>
       </Menu>
+      <StatusBar DockPanel.Dock="Bottom" >
+         <StatusBarItem>
+            <TextBlock Name="txtDocumentStatus" />
+         </StatusBarItem>
+         <StatusBarItem>
+            <TextBlock Name="txtMessageStatus" />
+         </StatusBarItem>
+      </StatusBar>
       <Grid x:Name="gridMain">
          <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <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" >
@@ -50,7 +59,7 @@
             <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" >
+         <Border BorderBrush="Black" BorderThickness="0"  Margin="3" Grid.Row="1" >
             <ScrollViewer x:Name="scrollPreviews" VerticalScrollBarVisibility="Auto" >
                <StackPanel x:Name="stackPreviews" />
             </ScrollViewer>
@@ -61,15 +70,34 @@
                <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" Background="#FF535353" MinHeight="100" MinWidth="100">
                <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>
-            <TextBlock x:Name="txtImageInformation" Grid.Row="2" TextWrapping="Wrap" Margin="3" />
+            <Grid 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>
          </Grid>
       </Grid>
    </DockPanel>