From 1a01e22656aa159756569b5827c4613a64534d72 Mon Sep 17 00:00:00 2001 From: William Johnson Date: Fri, 14 Jun 2024 23:29:29 -0700 Subject: [PATCH] Fixup some formatting for Simple MDA. --- InterSpec_resources/app_text/DetectionLimitSimple.xml | 6 +++--- src/DetectionLimitSimple.cpp | 6 ------ src/DetectionLimitTool.cpp | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/InterSpec_resources/app_text/DetectionLimitSimple.xml b/InterSpec_resources/app_text/DetectionLimitSimple.xml index bcca056e..99d3fbdf 100644 --- a/InterSpec_resources/app_text/DetectionLimitSimple.xml +++ b/InterSpec_resources/app_text/DetectionLimitSimple.xml @@ -27,8 +27,8 @@ Simple MDA Tool State Current state of the Simple MDA tool. - Detected activity of {1}, with range [{2}, {3}], @{4} CL - Excess counts of {1}, with range [{2}, {3}], @{4} CL + Detected: {1}, range [{2}, {3}], @{4} CL + Excess counts: {1}, range [{2}, {3}], @{4} CL Activity < 0 {1} (observed significantly fewer counts than expected). Excess counts < 0 {2} (observed significantly fewer counts than expected). Less than {1} present @{2} CL. @@ -76,4 +76,4 @@ - \ No newline at end of file + diff --git a/src/DetectionLimitSimple.cpp b/src/DetectionLimitSimple.cpp index b161276f..b20ca3f3 100644 --- a/src/DetectionLimitSimple.cpp +++ b/src/DetectionLimitSimple.cpp @@ -1415,12 +1415,6 @@ void DetectionLimitSimple::updateSpectrumDecorationsAndResultText() const string lowerstr = PhysicalUnits::printToBestActivityUnits(result.lowerLimit, 3, use_curie); const string upperstr = PhysicalUnits::printToBestActivityUnits(result.upperLimit, 3, use_curie); - const string cl_txt = "Estimated activity of " + nomstr + "."; - - const string sum_txt = "Detected activity of " + nomstr + "." - "
" - "Range: [" + lowerstr + ", " + upperstr + "] @" + cl_str + " CL"; - chart_title = WString::tr("dls-chart-title-estimated-act").arg(nomstr); result_txt = WString::tr("dls-results-txt-estimated-act").arg(nomstr).arg(lowerstr).arg(upperstr).arg(cl_str); }//if( !m_currentNuclide ) / else diff --git a/src/DetectionLimitTool.cpp b/src/DetectionLimitTool.cpp index c0a5b75d..64d855dc 100644 --- a/src/DetectionLimitTool.cpp +++ b/src/DetectionLimitTool.cpp @@ -2063,7 +2063,7 @@ SimpleDialog *DetectionLimitTool::createCurrieRoiMoreInfoWindow( const SandiaDec nomstr = PhysicalUnits::printToBestActivityUnits( nominal_act, 2, useCuries ) + DetectorPeakResponse::det_eff_geom_type_postfix( det_geom ); if( nominal_act < 0 ) - nomstr = "< " + PhysicalUnits::printToBestActivityUnits( 0.0, 2, useCuries ) + nomstr = "< " + PhysicalUnits::printToBestActivityUnits( 0.0, 2, useCuries ) + DetectorPeakResponse::det_eff_geom_type_postfix( det_geom ); }else {