Maybe fix compile issue for auto build.

sandialabs · Sep 25, 2023 · a13271b · a13271b
1 parent e25ac20
commit a13271b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/DrfChart.cpp b/src/DrfChart.cpp
@@ -60,7 +60,7 @@ DrfChart::DrfChart( WContainerWidget *parent )
   if( viewer )
     viewer->colorThemeChanged().connect( this, &DrfChart::handleColorThemeChange );
 
-  auto theme = viewer ? viewer->getColorTheme() : nullptr;
+  shared_ptr<const ColorTheme> theme = viewer ? viewer->getColorTheme() : shared_ptr<const ColorTheme>();
   handleColorThemeChange( theme );
 
   const bool is_phone = (!viewer || viewer->isPhone() || (viewer->renderedHeight() < 500 ));

diff --git a/src/SpecMeasManager.cpp b/src/SpecMeasManager.cpp
@@ -2344,9 +2344,8 @@ bool SpecMeasManager::handleEccFile( std::istream &input, SimpleDialog *dialog )
   " overflow-x: hidden;"
   "\"";
 
-  string msg = "<p style=\"white-space: nowrap;\">"
-      "You can use this .ECC file as a DRF."
-    "</p>"
+  string msg =
+    //"<p style=\"white-space: nowrap;\">You can use this .ECC file as a DRF.</p>"
     "<p " + txt_css + ">"
       "Name: " + name +
   "</p>";
@@ -2383,9 +2382,10 @@ bool SpecMeasManager::handleEccFile( std::istream &input, SimpleDialog *dialog )
   WTableCell *cell = far_field_opt->elementAt( 0, 0 );
   WLabel *label = new WLabel( "Detector diam.", cell );
   cell = far_field_opt->elementAt( 0, 1 );
-  WLineEdit *diameter_edit = new WLineEdit( "2.54 cm", cell );
+  WLineEdit *diameter_edit = new WLineEdit( "", cell );
   label->setBuddy( diameter_edit );
   diameter_edit->setValidator( dist_validator );
+  diameter_edit->setEmptyText( "0 cm" );
 
   cell = far_field_opt->elementAt( 1, 0 );
   label = new WLabel( "Distance.", cell );

diff --git a/target/testing/test_ShieldingSourceFitCalc.cpp b/target/testing/test_ShieldingSourceFitCalc.cpp
@@ -415,7 +415,7 @@ BOOST_AUTO_TEST_CASE( SimpleSourceFit )
   // Create a 100% efficient detector at our test distance.
   auto detector = make_shared<DetectorPeakResponse>();
   detector->fromExpOfLogPowerSeriesAbsEff( {0.0f, 0.0f}, {}, distance,
-                                          5*PhysicalUnits::cm, PhysicalUnits::keV, 0, 3000*PhysicalUnits::keV );
+                                          5*PhysicalUnits::cm, PhysicalUnits::keV, 0, 3000*PhysicalUnits::keV, false );
 
   auto foreground = make_shared<SpecUtils::Measurement>();