Fixup some formatting for Simple MDA.

sandialabs · Jun 15, 2024 · 1a01e22 · 1a01e22
1 parent 44cc7e7
commit 1a01e22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/InterSpec_resources/app_text/DetectionLimitSimple.xml b/InterSpec_resources/app_text/DetectionLimitSimple.xml
@@ -27,8 +27,8 @@
   <message id="dls-qr-tool-state-title">Simple MDA Tool State</message>
   <message id="dls-qr-tool-state-txt">Current state of the Simple MDA tool.</message>
 
-  <message id="dls-det-act-with-range">Detected activity of {1}, with range [{2}, {3}], @{4} CL</message>
-  <message id="dls-det-counts-with-range">Excess counts of {1}, with range [{2}, {3}], @{4} CL</message>
+  <message id="dls-det-act-with-range">Detected: {1}, range [{2}, {3}], @{4} CL</message>
+  <message id="dls-det-counts-with-range">Excess counts: {1}, range [{2}, {3}], @{4} CL</message>
   <message id="dls-det-act-less-zero">Activity &lt; 0 {1} (observed significantly fewer counts than expected).</message>
   <message id="dls-det-counts-less-zero">Excess counts &lt; 0 {2} (observed significantly fewer counts than expected).</message>
   <message id="dls-det-upper-bound">Less than {1} present @{2} CL.</message>
@@ -76,4 +76,4 @@
   <message id="dls-"></message>
   <message id="dls-"></message>
   <message id="dls-"></message>
-</messages>
+</messages>
diff --git 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 + "."
-          "<br/>"
-          "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
@@ -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 = "&lt; " + PhysicalUnits::printToBestActivityUnits( 0.0, 2, useCuries )
                         + DetectorPeakResponse::det_eff_geom_type_postfix( det_geom );
           }else
           {