Ver Fonte

Optimize the code

cxs há 2 meses atrás
pai
commit
d7a89cc81f

+ 4 - 11
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -517,15 +517,6 @@ namespace OTSMeasureApp
                 GetTriangleExcenterRadius(otsfir, otssec, otsthi, out r, out Centerpoint);
 
                 RectangleF rectangleThree = new RectangleF(new PointF(Centerpoint.X - r, Centerpoint.Y - r), new SizeF(r * 2, r * 2));
-                //if (m_visualStage.CheckMeasureAreaIsBeyondStageArea(rectangleThree))
-                //{
-                //    m_IsDrawMeasure = true;
-                //}
-                //else
-                //{
-                //    m_IsDrawMeasure = false;
-                //    return;
-                //}
                 Color MeasureColor = Color.Red;
                 CMeasureArea newGDI = new CMeasureArea(rectangleThree, ShapeType.CIRCLE, "", sam.GetSampleName(), MeasureColor);
 
@@ -538,8 +529,10 @@ namespace OTSMeasureApp
                 var para = m_visualStage.GetSampleMeasurePara(sam.GetMeasureGDIObject());
 
                 SetWorkSampleMeasureArea(para);
-                if (frmInput.IsInclinedPlaneFocus) m_MeasureAppForm.m_ProjParam.GetWorkSample().GetMsrParams().SlopParam = frmInput.GetCSlopFocusParam();
-                CSEMFieldData semdata = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample().GetSEMDataMsr();
+                if (frmInput.IsInclinedPlaneFocus) {
+                    m_MeasureAppForm.m_ProjParam.GetWorkSample().GetMsrParams().SlopParam = frmInput.GetCSlopFocusParam();
+                }
+                CSEMFieldData semdata = m_MeasureAppForm.m_ProjParam.GetWorkSample().GetSEMDataMsr();
                 semdata.SetMagnification(frmInput.GetMagnification());
                 PrepareVisualMeasureField(GetWorkingVisualSample());
             }