导入图片的页码

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -31,6 +31,8 @@ namespace XHWK.WKTool
         public readonly BlackboardNew myblackboard;
         private System.Windows.Forms.DialogResult result;
         private System.Windows.Forms.OpenFileDialog ofd;
+        //声明一个 DrawingAttributes 类型的变量  
+        DrawingAttributes drawingAttributes;
         #endregion
 
         #region 初始化
@@ -231,8 +233,6 @@ namespace XHWK.WKTool
             //设置 DrawingAttributes 的 Color 属性设置颜色  
             drawingAttributes.Color = Colors.White;
         }
-        //声明一个 DrawingAttributes 类型的变量  
-        DrawingAttributes drawingAttributes;
         /// <summary>
         /// 画笔颜色事件 红色
         /// </summary>
@@ -281,7 +281,7 @@ namespace XHWK.WKTool
             drawingAttributes.Color = Colors.DeepSkyBlue;
         }
         /// <summary>
-        /// 画笔粗细 细
+        /// 画笔粗细事件 细
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -291,7 +291,7 @@ namespace XHWK.WKTool
             drawingAttributes.Height = 1;
         }
         /// <summary>
-        /// 画笔粗细 中
+        /// 画笔粗细事件 中
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -301,7 +301,7 @@ namespace XHWK.WKTool
             drawingAttributes.Height = 3;
         }
         /// <summary>
-        /// 画笔粗细 粗
+        /// 画笔粗细事件 粗
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -311,7 +311,7 @@ namespace XHWK.WKTool
             drawingAttributes.Height = 5;
         }
         /// <summary>
-        /// 登陆
+        /// 登陆事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -357,7 +357,7 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 导入
+        /// 导入事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -409,7 +409,14 @@ namespace XHWK.WKTool
                     string filepath = ofd.FileName;
                     string path = AppDomain.CurrentDomain.BaseDirectory+ "Temp\\";
                     APP.Paths = ConvertWordToImage(filepath, path, "", 0, 0, null, 0).ToArray();
-                    if(!string.IsNullOrWhiteSpace(txbCurrpage.Text)&& Convert.ToInt32(txbCurrpage.Text)< APP.Paths.Length)
+                   
+                    for(int i=0;i<APP.Paths.Length;i++)
+                    {
+                        APP.pageData.pagenum += 1;
+                        APP.pageData.currpage = APP.pageData.pagenum;
+                        myblackboard.changepage(APP.pageData.currpage - 1);
+                    }
+                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
                     {
                         imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[Convert.ToInt32(txbCurrpage.Text) - 1]));
                     }
@@ -417,7 +424,6 @@ namespace XHWK.WKTool
                     {
                         imgCanvas.Source = null;
                     }
-                    
                 }
             }
         }
@@ -448,7 +454,7 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 增加
+        /// 增加事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -461,7 +467,7 @@ namespace XHWK.WKTool
             }
         }
         /// <summary>
-        /// 打印
+        /// 打印事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -495,9 +501,9 @@ namespace XHWK.WKTool
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if(APP.Paths.Length>0)
                 {
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && Convert.ToInt32(txbCurrpage.Text) < APP.Paths.Length&& Convert.ToInt32(txbCurrpage.Text)>1)
+                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length&& APP.pageData.currpage > 0)
                     {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[Convert.ToInt32(txbCurrpage.Text) - 2]));
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
                     }
                     else
                     {
@@ -520,9 +526,9 @@ namespace XHWK.WKTool
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if (APP.Paths.Length > 0)
                 {
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && Convert.ToInt32(txbCurrpage.Text)+1 < APP.Paths.Length)
+                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length)
                     {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[Convert.ToInt32(txbCurrpage.Text) ]));
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage]));
                     }
                     else
                     {