linshitijiao

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.Designer.cs

@@ -151,7 +151,7 @@ namespace OTSMeasureApp
             this.DeleteBSEPicture.Name = "DeleteBSEPicture";
             this.DeleteBSEPicture.Size = new System.Drawing.Size(194, 30);
             this.DeleteBSEPicture.Text = "删除BSE照片";
-            this.DeleteBSEPicture.Click += new System.EventHandler(this.DeleteBSEPicture_Click);
+            //this.DeleteBSEPicture.Click += new System.EventHandler(this.DeleteBSEPicture_Click);
             // 
             // SlopFocusMenuItem
             // 

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -42,9 +42,9 @@ namespace OTSMeasureApp
 
 
         //BSE图像
-        public  List<CRectangleGDIObject> m_AllHoleImageGDIObjects;
+        //public  List<CRectangleGDIObject> m_AllHoleImageGDIObjects;
         ////BSE图像帧图 为了获取位置与尺寸
-        public  List<CRectangleGDIObject> m_AllHoleImageOfFieldGDIObjects;
+        //public  List<CRectangleGDIObject> m_AllHoleImageOfFieldGDIObjects;
         //手绘测量区域
         public static CRectangleGDIObject m_DrawMeasureGDIObject=new CRectangleGDIObject();
  
@@ -286,9 +286,9 @@ namespace OTSMeasureApp
                     //设置消息类型 拍摄样品孔
                     m_MeasureAppForm.SetRunType(MSR_RUN_TYPE.RUNSampleHoleImage);
 
-                    TransferBseImageToWindow();
+                    //TransferBseImageToWindow();
                     //清除原图片信息
-                    DeleteHoleBSEImageDataNoMessageBox();
+                    //DeleteHoleBSEImageDataNoMessageBox();
                   
                     PrepareMeasureField(GetWorkingVisualSample(), MSR_RUN_TYPE.RUNSampleHoleImage);
                   
@@ -826,9 +826,9 @@ namespace OTSMeasureApp
 
 
             //样品孔BSE图像
-            m_AllHoleImageGDIObjects = new List<CRectangleGDIObject>();
+            //m_AllHoleImageGDIObjects = new List<CRectangleGDIObject>();
             //BSE图像帧图为了获取位置与尺寸
-            m_AllHoleImageOfFieldGDIObjects = new List<CRectangleGDIObject>();
+            //m_AllHoleImageOfFieldGDIObjects = new List<CRectangleGDIObject>();
 
             this.ResizeRedraw = true;
                 control_Ruler2 = new Control_Ruler();
@@ -1441,7 +1441,7 @@ namespace OTSMeasureApp
                         }
                        
 
-                        MouseDownFunction(m_AllHoleImageGDIObjects, e);
+                        //MouseDownFunction(m_AllHoleImageGDIObjects, e);
 
                     }
 
@@ -1919,7 +1919,7 @@ namespace OTSMeasureApp
                     MouseMoveFucntion(GetWorkingVisualSample().m_ImageGDIObjects, e);
 
                 }
-                MouseMoveFucntion(m_AllHoleImageGDIObjects, e);
+                //MouseMoveFucntion(m_AllHoleImageGDIObjects, e);
 
 
             }
@@ -2019,7 +2019,7 @@ namespace OTSMeasureApp
                 MouseUpFucntion(GetWorkingVisualSample().m_ImageGDIObjects, e);
 
             }
-            MouseUpFucntion(m_AllHoleImageGDIObjects, e);
+            //MouseUpFucntion(m_AllHoleImageGDIObjects, e);
 
 
 
@@ -2043,11 +2043,11 @@ namespace OTSMeasureApp
                     }
 
                 }
-                if (m_AllHoleImageGDIObjects.Count > 0)
-                {
-                    OnPaint(e, m_AllHoleImageGDIObjects);
+                //if (m_AllHoleImageGDIObjects.Count > 0)
+                //{
+                //    OnPaint(e, m_AllHoleImageGDIObjects);
 
-                }
+                //}
                
             }
             OnPaint(e, GetAllVisualFieldGdiObject());
@@ -2155,10 +2155,10 @@ namespace OTSMeasureApp
 
                 MouseWheelFunction(GetWorkingVisualSample().m_ImageGDIObjects, e.Location, currentZoomNum);
             }
-            if (m_AllHoleImageGDIObjects.Count > 0)
-            {
-                MouseWheelFunction(m_AllHoleImageGDIObjects, e.Location, currentZoomNum);
-            }
+            //if (m_AllHoleImageGDIObjects.Count > 0)
+            //{
+            //    MouseWheelFunction(m_AllHoleImageGDIObjects, e.Location, currentZoomNum);
+            //}
          
 
             MouseWheelFunction(GetAllVisualSampleGDIObject(), e.Location, currentZoomNum);
@@ -2896,7 +2896,7 @@ namespace OTSMeasureApp
                  log.Error("OTSSamplespaceWindow_" + "SetSEMToCenterPoint" + ":" + ex.ToString() + "");
                 return false;
             }
-}
+        }
 
         #endregion
 
@@ -3034,12 +3034,7 @@ namespace OTSMeasureApp
             Invalidate();
 
         }
-        public void TransferBseImageToWindow()
-        {
-            m_AllHoleImageGDIObjects.AddRange(GetWorkingVisualSample().m_ImageGDIObjects);
-            m_AllHoleImageOfFieldGDIObjects.AddRange(GetWorkingVisualSample().m_ImageOfFieldGDIObjects);
-            Invalidate();
-        }
+       
         #endregion
 
         #region 获取样品孔图片
@@ -3124,9 +3119,6 @@ namespace OTSMeasureApp
         }
         #endregion
 
-        private void DeleteBSEPicture_Click(object sender, EventArgs e)
-        {
-
-        }
+     
     }
 }

OTSInclusionsTraceability/OTSInclusionsTraceability.csproj

@@ -35,7 +35,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>..\bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>