fix bugs when drawing rectangle measure area

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="BrightnessContrastRegulateParam" AutoRegulateType="EveryPeriod" BrightPhaseElement="Cu" BrightPhaseValue="209" DarkPhaseElement="C" DarkPhaseValue="40" InitialBrightness="44.44444446" InitialContrast="44.8769362" mag="100" Period="60" StdMaterialOTSPos="-10705,4713" ToRun="false" />
-  <Member RegName="GenParam" DefaultArea="1400" DefaultSampleName="Sample" DefaultShape="0" EngineType="0:InclustionEngine" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" />
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" EngineType="0:InclustionEngine" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="0" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="255" start="175" />
     <Member RegName="IncArea" end="10000" start="5" />
@@ -15,5 +15,5 @@
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>
-  <Member RegName="XrayParam" AnalyExpCount="3000" IfAutoId="false" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="300" QuantifyMinSize="5" ScanMode="0:PointMode" SmallPartAQTime="300" UseFilter="false" UsingXray="true" XrayLimit="200" />
+  <Member RegName="XrayParam" AnalyExpCount="3000" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="300" QuantifyMinSize="5" ScanMode="0:PointMode" SmallPartAQTime="300" UseFilter="false" UsingXray="true" XrayLimit="200" />
 </XMLData>

Bin/x64/Debug/Resources/XMLData/LanguageDefine.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" standalone="yes"?>
 <Language>
-  <DefaultLanguage>EN</DefaultLanguage>
+  <DefaultLanguage>ZH</DefaultLanguage>
 </Language>

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CBrightnessContrastAdjust.cs

@@ -257,12 +257,12 @@ namespace OTSMeasureApp._1_OTSMeasure.Measure._3_MeasureFlow
                 while (Math.Abs( dark-desiredark)>3 || Math.Abs(bright-desirebright)>3)
                 {
                    
-                    if (m_pMsrThread.IsMeasureStopped())
-                    {// measure stopped
-                        log.Trace("measure thread is stopped.");
+                    //if (m_pMsrThread.IsMeasureStopped())
+                    //{// measure stopped
+                    //    log.Trace("measure thread is stopped.");
                         
-                        return;
-                    }
+                    //    return;
+                    //}
                     double curbrightness = 0, curcontrast = 0; 
                    
                   

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -2105,7 +2105,7 @@ namespace OTSMeasureApp
 
                         m_MeasureAppForm.m_ProjParam.SetWorkSampleHoleAndMeasureArea(para);
                         m_MeasureAppForm.UpdatePropertyVal();
-                    }                        
+                    }
                     //-------------
                     m_DrawMeasureGDIObject = null;
 

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/VisualGDIObjects/CVisualSampleArea.cs

@@ -92,29 +92,30 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
         public RectangleF GetAllGDIObjectsRectangle()
         {
             double left, top, right, bottom;
-            var itm1 = m_MeasureGDIObject.SubItems()[0];
+            var items = m_MeasureGDIObject.SubItems();
+            var itm1 = items[0];
             var rec1 = itm1.GetZoomedRegionF();
             left = rec1.Left;   
             top = rec1.Top;
             right = rec1.Right;
             bottom = rec1.Bottom;
-            foreach (var itm in m_MeasureGDIObject.SubItems())
+            foreach (var itm in items)
             {
                 var rec = itm.GetZoomedRegionF();
-                if (rec.Left < rec1.Left)
+                if (rec.Left < left)
                 { 
                 left = rec.Left;
                 }
-                if (rec.Top < rec1.Top)
+                if (rec.Top < top)
                 {
                     top = rec.Top;
                 }
-                if (rec.Right > rec1.Right)
+                if (rec.Right > right)
                 {
                     right = rec.Right;
 
                 }
-                if(rec.Bottom > rec1.Bottom)
+                if(rec.Bottom > bottom)
                 {
                     bottom = rec.Bottom;
                 }