浏览代码

fix a bug when take the image of the sample hole

gsp 8 月之前
父节点
当前提交
db4ddfccac

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="4">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />

+ 1 - 0
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.Designer.cs

@@ -210,6 +210,7 @@ namespace OTSMeasureApp
             this.Load += new System.EventHandler(this.OTSSamplespaceWindow_Load);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OTSSamplespaceWindow_KeyDown);
             this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.OTSSamplespaceWindow_KeyUp);
+            this.Resize += new System.EventHandler(this.OTSSamplespaceWindow_Resize);
             this.CMStrip.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);

+ 7 - 1
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -2160,6 +2160,7 @@ namespace OTSMeasureApp
             {
                 Image thumbnail = img.BSEImage.GetThumbnailImage((int)m_RegionF.Width + 2, (int)m_RegionF.Height + 2, null, IntPtr.Zero);
                 var g = Graphics.FromImage(sampleHoleImageBuffer.BSEImage);
+                log.Warn(startPointF);
                 g.DrawImage(thumbnail, startPointF);
             }
 
@@ -2175,7 +2176,7 @@ namespace OTSMeasureApp
 
             if (IsShowSampleHoleImage)
             {
-
+                //e.Graphics.DrawImage(sampleHoleImageBuffer.BSEImage, sampleHoleImageBuffer.GetOrigionalDrawRegionF());
                 e.Graphics.DrawImage(sampleHoleImageBuffer.BSEImage, sampleHoleImageBuffer.GetZoomedRegionF());
 
             }
@@ -3289,5 +3290,10 @@ namespace OTSMeasureApp
             this.OnMouseMove(e);
         }
 
+        private void OTSSamplespaceWindow_Resize(object sender, EventArgs e)
+        {
+            sampleHoleImageBuffer = new CDisplayGDIObject(new RectangleF(0, 0, this.Width, this.Height), GDIType.SampleHoleImageBuffer); ;
+            sampleHoleImageBuffer.BSEImage = new Bitmap(this.Width, this.Height);
+        }
     }
 }