From a13271be39e878274e01028351fd6cf264585537 Mon Sep 17 00:00:00 2001 From: William Johnson Date: Mon, 25 Sep 2023 11:16:38 -0700 Subject: [PATCH] Maybe fix compile issue for auto build. --- src/DrfChart.cpp | 2 +- src/SpecMeasManager.cpp | 8 ++++---- target/testing/test_ShieldingSourceFitCalc.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DrfChart.cpp b/src/DrfChart.cpp index d756ef71..fa4d282f 100644 --- 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 theme = viewer ? viewer->getColorTheme() : shared_ptr(); handleColorThemeChange( theme ); const bool is_phone = (!viewer || viewer->isPhone() || (viewer->renderedHeight() < 500 )); diff --git a/src/SpecMeasManager.cpp b/src/SpecMeasManager.cpp index 402ac70f..7ce98bee 100644 --- 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 = "

" - "You can use this .ECC file as a DRF." - "

" + string msg = + //"

You can use this .ECC file as a DRF.

" "

" "Name: " + name + "

"; @@ -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 index 0ccdfbcf..5b8e7567 100644 --- 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(); 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();