Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-09-07 1491846b4736bc2e79604086acfd8544aa3ba384

 src/Bro.Common.Device/DeviceBase/HDevEngineTool.cs

@@ -136,9 +136,15 @@
            catch (HDevEngineException ex)
            {
                IsSuccessful = false;
                errorMsg = $"HDevProgram {ex.ProcedureName} Run fail , Line number: {ex.LineNumber}, Halcon error number : {ex.HalconError},ex:{ex.Message}";
                return false;
            }
            catch (Exception ex)
            {
                IsSuccessful = false;
                //Trace.TraceInformation("HDevProgram {0} Run fail , Line number: {1}, Halcon error number : {2},ex:{3}", ex.ProcedureName, ex.LineNumber, ex.HalconError, ex.Message);
                //return;
                errorMsg = $"HDevProgram {ex.ProcedureName} Run fail , Line number: {ex.LineNumber}, Halcon error number : {ex.HalconError},ex:{ex.Message}";
                errorMsg = $"{ex.Message}";
                return false;
            }
        }
@@ -250,7 +256,7 @@

            for (int i = 0; i < tuple.Length; i++)
            {
                list.Add(tuple[i]);
                list.Add(tuple[i].D);
            }

            return list;