完善筛查评估图片展示

+新增筛查和评估起始位动作位的分别展示
-修复PDF28页模板
-修复部分字体

WpfTest1/MainWindow.xaml

@@ -13,7 +13,7 @@
         ShowIconOnTitleBar="True"
         PreviewKeyDown="processGrid_KeyDown"
         WindowStartupLocation="CenterScreen"
-        WindowState = "Normal"
+        WindowState = "Normal" FontFamily="Segoe UI Symbol"
         >
     <Controls:MetroWindow.Resources>
         <Style BasedOn="{StaticResource MetroTabItem}" TargetType="{x:Type TabItem}" x:Key="smallHeader" >
@@ -218,12 +218,15 @@
                             <Label x:Name="labelTi2" Content="题" HorizontalAlignment="Left" Margin="280,10,0,0" VerticalAlignment="Top" FontSize="18"/>
                             <Label x:Name="labelFilterQuestionTitle" Content="[问题的标题，大约需要30个汉字，所以空间需要够]" HorizontalAlignment="Left" Margin="90,36,0,0" VerticalAlignment="Top" FontSize="30"/>
                             <TextBlock x:Name="textBlockFilterQuetionContent" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="94,90,0,0" TextWrapping="Wrap" Text="Here is the question content." Height="240" Width="745" FontSize="18"/>
-                            <Image x:Name="imageFilterQuestion" HorizontalAlignment="Left" Width="348" Height="430" Margin="850,90,0,0" VerticalAlignment="Top" />
+                            <Image x:Name="imageFilterQuestion_start" HorizontalAlignment="Left" Width="460" Height="245" Margin="850,50,0,0" VerticalAlignment="Top" />
+                            <Image x:Name="imageFilterQuestion_active" HorizontalAlignment="Left" Width="460" Height="245" Margin="850,295,0,0" VerticalAlignment="Top" />
                             <Grid x:Name="gridFilterSelection" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="94,340,0,0" Width="745" Height="200" ></Grid>
+                            <Label x:Name="labelFilterStartPosition" Content="起始位" HorizontalAlignment="Left" Margin="1210,50,0,0" VerticalAlignment="Top" FontSize="30"/>
+                            <Label x:Name="labelFilterActivePosition" Content="动作位" HorizontalAlignment="Left" Margin="1210,295,0,0" VerticalAlignment="Top" FontSize="30"/>
                             <Button x:Name="buttonFilterPrevious" Content="上一题" HorizontalAlignment="Left" Margin="424,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" IsEnabled="False" Click="buttonFilterPrevious_Click" />
                             <Button x:Name="buttonFilterNext" Content="下一题" HorizontalAlignment="Left" Margin="784,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" IsEnabled="False" Click="buttonFilterNext_Click" />
                             <Button x:Name="buttonSubmitFilter" Content="提交" HorizontalAlignment="Left" Margin="604,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" Background="#FF317602" Foreground="White" IsEnabled="False" Click="buttonSubmitFilter_Click"/>
-                            <Button x:Name="buttonAbortFilter" Content="中止筛查" HorizontalAlignment="Left" Margin="1150,550,0,0" VerticalAlignment="Top" Width="132" Height="50" FontSize="18" Background="#FFB92424" Foreground="White" Click="buttonAbortFilter_Click"/>
+                            <Button x:Name="buttonAbortFilter" Content="中止筛查" HorizontalAlignment="Left" Margin="110,545,0,0" VerticalAlignment="Top" Width="132" Height="50" FontSize="18" Background="#FFB92424" Foreground="White" Click="buttonAbortFilter_Click"/>
                         </Grid>
                     </TabItem>
                     <TabItem  Header="筛查报告" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
@@ -256,12 +259,15 @@
                             <Label x:Name="labelTi2E" Content="题" HorizontalAlignment="Left" Margin="190,10,0,0" VerticalAlignment="Top" FontSize="18"/>
                             <Label x:Name="labelEvaluationQuestionTitle" Content="[问题的标题，大约需要30个汉字，所以空间需要够]" HorizontalAlignment="Left" Margin="90,36,0,0" VerticalAlignment="Top" FontSize="30"/>
                             <TextBlock x:Name="textBlockEvaluationQuetionContent" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="94,90,0,0" TextWrapping="Wrap" Text="Here is the question content." Height="310" Width="745" FontSize="18"/>
-                            <Image x:Name="imageEvaluationQuestion" HorizontalAlignment="Left" Width="348" Height="430" Margin="850,90,0,0" VerticalAlignment="Top" />
+                            <Image x:Name="imageEvaluationQuestion_start" HorizontalAlignment="Left" Width="460" Height="245" Margin="850,50,0,0" VerticalAlignment="Top" />
+                            <Image x:Name="imageEvaluationQuestion_active" HorizontalAlignment="Left" Width="460" Height="245" Margin="850,295,0,0" VerticalAlignment="Top" />
                             <Grid x:Name="gridEvaluationSelection" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="94,400,0,0" Width="745" Height="120" ></Grid>
-                            <Button x:Name="buttonEvaluationPrevious" Content="上一题" HorizontalAlignment="Left" Margin="424,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" IsEnabled="False" Click="buttonEvaluationPrevious_Click" />
+                            <Label x:Name="labelEvaluationStartPosition" Content="起始位" HorizontalAlignment="Left" Margin="1210,50,0,0" VerticalAlignment="Top" FontSize="30"/>
+                            <Label x:Name="labelEvaluationActivePosition" Content="动作位" HorizontalAlignment="Left" Margin="1210,295,0,0" VerticalAlignment="Top" FontSize="30"/>
+                            <Button x:Name="buttonEvaluationPrevious" Visibility="Hidden" Content="上一题" HorizontalAlignment="Left" Margin="424,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" IsEnabled="False" Click="buttonEvaluationPrevious_Click" />
                             <Button x:Name="buttonEvaluationNext" Content="下一题" HorizontalAlignment="Left" Margin="784,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" IsEnabled="False" Click="buttonEvaluationNext_Click" />
                             <Button x:Name="buttonSubmitEvaluation" Content="提交" HorizontalAlignment="Left" Margin="604,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" Background="#FF317602" Foreground="White" IsEnabled="False" Click="buttonSubmitEvaluation_Click"/>
-                            <Button x:Name="buttonAbortEvaluation" Content="中止评估" HorizontalAlignment="Left" Margin="1150,550,0,0" VerticalAlignment="Top" Width="132" Height="50" FontSize="18" Background="#FFB92424" Foreground="White" Click="buttonAbortEvaluation_Click"/>
+                            <Button x:Name="buttonAbortEvaluation" Content="中止评估" HorizontalAlignment="Left" Margin="406,550,0,0" VerticalAlignment="Top" Width="132" Height="50" FontSize="18" Background="#FFB92424" Foreground="White" Click="buttonAbortEvaluation_Click"/>
                         </Grid>
                     </TabItem>
                     <TabItem  Header="评估报告" Style="{StaticResource smallerHeader}"  IsEnabled="False" >

WpfTest1/MainWindow.xaml.cs

@@ -487,20 +487,33 @@ namespace WpfTest1
                     textBlockFilterQuetionContent.Inlines.Add(aRunTemp);
                 }
             }
-            string quetionPic = Constants.imgPath + "\\" + filterQuestionaire[currentIndex - 1].question.q_id.ToString() + ".jpg";
-            if (File.Exists(quetionPic))
+            string quetionPic_start = Constants.imgPath + "\\" + filterQuestionaire[currentIndex - 1].question.q_id.ToString() + "-起始位.png";
+            if (File.Exists(quetionPic_start))
             {
                 BitmapImage bi = new BitmapImage();
                 bi.BeginInit();
-                bi.UriSource = new Uri(quetionPic, UriKind.RelativeOrAbsolute);
+                bi.UriSource = new Uri(quetionPic_start, UriKind.RelativeOrAbsolute);
                 bi.EndInit();
-                imageFilterQuestion.Source = bi;
+                imageFilterQuestion_start.Source = bi;
             }
             else
             {
-                imageFilterQuestion.Source = null; 
+                imageFilterQuestion_start.Source = null; 
             }
-            
+            string quetionPic_active = Constants.imgPath + "\\" + filterQuestionaire[currentIndex - 1].question.q_id.ToString() + "-动作位.png";
+            if (File.Exists(quetionPic_active))
+            {
+                BitmapImage bi = new BitmapImage();
+                bi.BeginInit();
+                bi.UriSource = new Uri(quetionPic_active, UriKind.RelativeOrAbsolute);
+                bi.EndInit();
+                imageFilterQuestion_active.Source = bi;
+            }
+            else
+            {
+                imageFilterQuestion_active.Source = null;
+            }
+
             int countOptions = filterQuestionaire[currentIndex - 1].answers.Count;
             gridFilterSelection.Children.Clear();
             for (int i = 0; i< countOptions; ++i)
@@ -711,18 +724,31 @@ namespace WpfTest1
                     textBlockEvaluationQuetionContent.Inlines.Add(aRunTemp);
                 }
             }
-            string quetionPic = Constants.imgPath + "\\" + evaluationQuestionaire[currentIndex - 1].question.q_id.ToString() + ".jpg";
-            if (File.Exists(quetionPic))
+            string quetionPic_start = Constants.imgPath + "\\" + evaluationQuestionaire[currentIndex - 1].question.q_id.ToString() + "-起始位.png";
+            if (File.Exists(quetionPic_start))
+            {
+                BitmapImage bi = new BitmapImage();
+                bi.BeginInit();
+                bi.UriSource = new Uri(quetionPic_start, UriKind.RelativeOrAbsolute);
+                bi.EndInit();
+                imageEvaluationQuestion_start.Source = bi;
+            }
+            else
+            {
+                imageEvaluationQuestion_start.Source = null;
+            }
+            string quetionPic_active = Constants.imgPath + "\\" + evaluationQuestionaire[currentIndex - 1].question.q_id.ToString() + "-动作位.png";
+            if (File.Exists(quetionPic_active))
             {
                 BitmapImage bi = new BitmapImage();
                 bi.BeginInit();
-                bi.UriSource = new Uri(quetionPic, UriKind.RelativeOrAbsolute);
+                bi.UriSource = new Uri(quetionPic_active, UriKind.RelativeOrAbsolute);
                 bi.EndInit();
-                imageEvaluationQuestion.Source = bi;
+                imageEvaluationQuestion_active.Source = bi;
             }
             else
             {
-                imageEvaluationQuestion.Source = null;
+                imageEvaluationQuestion_active.Source = null;
             }
             int countOptions = evaluationQuestionaire[currentIndex - 1].answers.Count;
             gridEvaluationSelection.Children.Clear();

WpfTest1/SmallDialogs/LoginWindow.xaml

@@ -17,11 +17,9 @@
         </Grid.Background>
         <Label x:Name="labelSoftwareName" Content="欢迎使用劳拉" FontSize="32" HorizontalAlignment="Center" Margin="0,61,0,0" VerticalAlignment="Top" Foreground="White"/>
         <Label x:Name="labelHomepageCversion" Content="当前版本：V1.2.3.4" HorizontalAlignment="Center" Margin="0,550,0,0" VerticalAlignment="Top" Foreground="White"/>
-
-
         <TextBox x:Name="textBoxUsername" HorizontalAlignment="Left" Height="29" Margin="850,313,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="220" Background="#BDC7D3"/>
         <PasswordBox x:Name="textBoxPassword" Password="123" HorizontalAlignment="Left" Height="29" Margin="851,364,0,0" VerticalAlignment="Top" Width="220" Background="#BDC7D3"  KeyDown="textBoxPassword_KeyDown"/>
-        <Button x:Name="buttonLogin" Content="登陆" HorizontalAlignment="Left" Margin="813,420,0,0" VerticalAlignment="Top" Width="261" Height="33" BorderBrush="Black" FontFamily="Microsoft YaHei UI Light" Click="buttonLogin_Click" Foreground="White" Custom:ButtonHelper.CornerRadius="-2" >
+        <Button x:Name="buttonLogin" Content="登陆" HorizontalAlignment="Left" Margin="813,420,0,0" VerticalAlignment="Top" Width="261" Height="33" BorderBrush="Black" FontFamily="Segoe UI Symbol" Click="buttonLogin_Click" Foreground="White" Custom:ButtonHelper.CornerRadius="-2" >
             <Button.Background x:Uid="loginButtonColor">
                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                     <GradientStop Color="Black" Offset="1"/>