修改报告按钮测量结束仍置灰的bug

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -458,9 +458,6 @@ namespace OTSMeasureApp
             SetMeasureResultInfo(SMsrData);
             MeasureResultMsrData = SMsrData;
             m_bgWorker.ReportProgress((int)ProgressState.MeasureCheckReport);
-            //激活跳转至报告程序按钮
-            m_MeasureApp.rbPReport.Enabled = true;
-            m_MeasureApp.rbReport.Enabled = true;
             //测量停止，更新Grid显示的测量信息
             //获取需显示的grid信息
             var sample = m_MeasureApp.m_ProjParam.GetWorkSample();

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -1003,6 +1003,10 @@ namespace OTSMeasureApp
             rbPause.Enabled = false;
             rbStop.Enabled = false;
             rbCheckParam.Enabled = true;
+            
+            //激活跳转至报告程序按钮
+            rbPReport.Enabled = true;
+            rbReport.Enabled = true;
         }
 
         public void SetPauseMeasureRibbonStatus()

OTSIncAMeasureApp/ServiceCenter/CImageHandler.cs

@@ -780,7 +780,7 @@ namespace OTSModelSharp.ServiceCenter
             ImageParam imageParam = Fun_Match(newImg2, mStitch);
             imageParam.im = newImg2;
 
-            Mat result = type == 2 ? Fun_Stitch(imageParam) : Fun_StitchRGB(imageParam);
+            Mat result = type == 3 ? Fun_Stitch(imageParam) : Fun_StitchRGB(imageParam);
 
             Cv2.Transpose(result, result);
             Cv2.Flip(result, result, FlipMode.Y);
@@ -805,7 +805,7 @@ namespace OTSModelSharp.ServiceCenter
             ImageParam imageParam = Fun_Match(newImg2, mStitch);
             imageParam.im = newImg2;
 
-            if (type == 2)
+            if (type == 3)
             {
                 return Fun_Stitch(imageParam);
             }