Browse Source

增加ppt img类型之前

tags/录制修改前
zhangxueyang 4 years ago
parent
commit
03d74a566f

+ 2
- 2
XHWK.WKTool/App.config View File

33
     <!--上传每片大小 Mb-->
33
     <!--上传每片大小 Mb-->
34
     <add key="UploadSliceLen" value="1" />
34
     <add key="UploadSliceLen" value="1" />
35
     <!--版本号-->
35
     <!--版本号-->
36
-    <add key="VersionCode" value="18" />
37
-    <add key="VersionName" value="1.1.7" />
36
+    <add key="VersionCode" value="19" />
37
+    <add key="VersionName" value="1.1.8" />
38
     <add key="ClientSettingsProvider.ServiceUri" value="" />
38
     <add key="ClientSettingsProvider.ServiceUri" value="" />
39
   </appSettings>
39
   </appSettings>
40
   <system.web>
40
   <system.web>

+ 2
- 2
XHWK.WKTool/Properties/AssemblyInfo.cs View File

49
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
49
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
50
 //通过使用 "*",如下所示:
50
 //通过使用 "*",如下所示:
51
 // [assembly: AssemblyVersion("1.0.*")]
51
 // [assembly: AssemblyVersion("1.0.*")]
52
-[assembly: AssemblyVersion("1.1.7.0")]
53
-[assembly: AssemblyFileVersion("1.1.7.0")]
52
+[assembly: AssemblyVersion("1.1.8.0")]
53
+[assembly: AssemblyFileVersion("1.1.8.0")]

+ 2
- 1
XHWK.WKTool/XHMicroLessonSystemWindow.xaml View File

330
                                 </Grid>
330
                                 </Grid>
331
                             </Border>
331
                             </Border>
332
                         </Grid>
332
                         </Grid>
333
-                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top"/>
333
+                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top" Stretch="Fill"/>
334
+                        <Image x:Name="imgPPT" Visibility="Collapsed" VerticalAlignment="Top"/>
334
                         <!--导入图片-->
335
                         <!--导入图片-->
335
                         <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
336
                         <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
336
                         <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>
337
                         <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>

+ 5
- 5
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs View File

3336
                 }
3336
                 }
3337
 
3337
 
3338
 
3338
 
3339
-                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
3339
+                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
3340
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
3340
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
3341
                 ////设置纸张横向
3341
                 ////设置纸张横向
3342
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
3342
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
3389
 
3389
 
3390
 
3390
 
3391
 
3391
 
3392
-                    if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
3392
+                    if (image.Height > iTextSharp.text.PageSize.A4.Height)
3393
                     {
3393
                     {
3394
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
3394
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
3395
                     }
3395
                     }
3396
-                    else if (image.Width > iTextSharp.text.PageSize.A4.Width - 25)
3396
+                    else if (image.Width > iTextSharp.text.PageSize.A4.Width)
3397
                     {
3397
                     {
3398
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
3398
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
3399
                     }
3399
                     }
3400
                     image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
3400
                     image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
3401
                     document.NewPage();
3401
                     document.NewPage();

Loading…
Cancel
Save