1

CodeLibraryProject/CodeLibrary/FrmCodeDecode.cs

@@ -89,7 +89,7 @@ namespace CodeLibrary
         {
         {
             System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog();
             System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog();
             openDialog.Title = selImage;
             openDialog.Title = selImage;
-            openDialog.Filter = "(*.jpg;*.png;*.bmp)|*.jpg;*.png;*.bmp";
+            openDialog.Filter = "(*.jpg;*.png;*.bmp;*.hobj)|*.jpg;*.png;*.bmp;*.hobj";
             //    openDialog.Filter = "All Supported Images (*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png)|*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png|Bitmaps (*.bmp;*.dib;*.rle)|*.bmp;*.dib;*.rle|Graphics Interchange Format (*.gif)|*.gif|Joint Photographic Experts (*.jpg)|*.jpg|Portable Network Graphics (*.png)|*.png|All Files (*.*)|*.*";
             //    openDialog.Filter = "All Supported Images (*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png)|*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png|Bitmaps (*.bmp;*.dib;*.rle)|*.bmp;*.dib;*.rle|Graphics Interchange Format (*.gif)|*.gif|Joint Photographic Experts (*.jpg)|*.jpg|Portable Network Graphics (*.png)|*.png|All Files (*.*)|*.*";
             //openDialog.DefaultExt = "png";
             //openDialog.DefaultExt = "png";
             System.Windows.Forms.DialogResult result = openDialog.ShowDialog();
             System.Windows.Forms.DialogResult result = openDialog.ShowDialog();
@@ -104,13 +104,32 @@ namespace CodeLibrary
                 MessageBox.Show(imageIsNull);
                 MessageBox.Show(imageIsNull);
             }
             }
             ClearPicImg();
             ClearPicImg();
-            //读取图片内容
-            Image img = (Image)Image.FromFile(filename).Clone();
-            pictureBox1.Image = img;
-            Bitmap bitmap = new Bitmap(pictureBox1.Image);
-            HObject hoimg = HDCodeHelper.Bitmap2HObjectBpp24(bitmap);
-            HDCodeLearnHelper.DefaultImage = hoimg;
-            ShowImage(hoimg);
+            if (openDialog.FileName.EndsWith(".hobj"))
+            {
+                HObject hObject = null;
+                HOperatorSet.GenEmptyObj(out hObject);
+                hObject.ReadObject(openDialog.FileName);
+                if (hObject != null)
+                {
+                    HDCodeLearnHelper.DefaultImage = hObject;
+                    ShowImage(hObject);
+                }
+                else
+                {
+                    MessageBox.Show("读取文件失败：" + openDialog.FileName);
+                }
+            }
+            else
+            {
+              
+                //读取图片内容
+                Image img = (Image)Image.FromFile(filename).Clone();
+                pictureBox1.Image = img;
+                Bitmap bitmap = new Bitmap(pictureBox1.Image);
+                HObject hoimg = HDCodeHelper.Bitmap2HObjectBpp24(bitmap);
+                HDCodeLearnHelper.DefaultImage = hoimg;
+                ShowImage(hoimg);
+            }
         }
         }
 
 
         private void btnErZhi_Click(object sender, EventArgs e)
         private void btnErZhi_Click(object sender, EventArgs e)