Some small cleanup

Author: wcjohns

InterSpec/ShieldingSourceDisplay.h

@@ -26,24 +26,21 @@
 #include "InterSpec_config.h"
 
 #include <map>
-#include <tuple>
 #include <mutex>
 #include <utility>
 
 #if( INCLUDE_ANALYSIS_TEST_SUITE )
+#include <tuple>
+
 #include <boost/optional.hpp>
 #endif
 
-#include <Wt/WColor>
-#include <Wt/WRectF>
-#include <Wt/WPainter>
 #include <Wt/WModelIndex>
-#include <Wt/WGridLayout>
 #include <Wt/WContainerWidget>
 #include <Wt/WAbstractItemModel>
 
+#include "InterSpec/DetectorPeakResponse.h"
 #include "InterSpec/ShieldingSourceFitPlot.h"
-#include "InterSpec/DetectorPeakResponse.h" //DetectorPeakResponse::EffGeometryType
 #include "InterSpec/ShieldingSourceFitCalc.h"
 
 //Forward declarations
@@ -88,8 +85,6 @@ namespace Wt
 {
   class WText;
   class WLabel;
-  class WAnchor;
-  class WSvgImage;
   class WCheckBox;
   class WLineEdit;
   class WTreeView;
@@ -98,11 +93,6 @@ namespace Wt
   class WFileUpload;
   class WSelectionBox;
   class WSuggestionPopup;
-  class WStandardItemModel;
-//  namespace Chart
-//  {
-//    class WCartesianChart;
-//  }//namespace Chart
 }//namespace Wt
 
 
@@ -356,9 +346,6 @@ class ShieldingSourceDisplay : public Wt::WContainerWidget
 
   /** Returns <num values specified, num fit values, is valid> */
   std::tuple<int,int,bool> numTruthValuesForFitValues();
-  
-  /** Renders the Chi2Chart to a SVG image */
-  void renderChi2Chart( Wt::WSvgImage &image );
 
   /** Tests the current values, for all quantities being fit for, against truth-level values.
    

src/DetectionLimitTool.cpp

@@ -43,8 +43,6 @@
 #include <Wt/WApplication>
 #include <Wt/WRegExpValidator>
 #include <Wt/WSuggestionPopup>
-#include <Wt/WStandardItemModel>
-#include <Wt/Chart/WCartesianChart>
 
 #include <Wt/Json/Array>
 #include <Wt/Json/Value>

src/ShieldingSourceDisplay.cpp

@@ -41,44 +41,28 @@
 
 
 #include <Wt/WText>
-#include <Wt/WTime>
-#include <Wt/WImage>
+#if( INCLUDE_ANALYSIS_TEST_SUITE )
 #include <Wt/WTable>
+#endif
 #include <Wt/WLabel>
-#include <Wt/WAnchor>
-#include <Wt/WBorder>
 #include <Wt/WServer>
 #include <Wt/WPainter>
 #include <Wt/WGroupBox>
 #include <Wt/WTextArea>
-#include <Wt/WRectArea>
 #include <Wt/WResource>
-#include <Wt/WSvgImage>
-#include <Wt/WTableCell>
-#include <Wt/WTabWidget>
 #include <Wt/WIOService>
+#include <Wt/WTabWidget>
 #include <Wt/WGridLayout>
 #include <Wt/WPushButton>
 #include <Wt/WJavaScript>
 #include <Wt/WFileUpload>
-#include <Wt/WEnvironment>
 #include <Wt/Http/Response>
 #include <Wt/WSelectionBox>
-#include <Wt/WStandardItem>
 #include <Wt/WItemDelegate>
-#include <Wt/WDoubleSpinBox>
 #include <Wt/Dbo/QueryModel>
-#include <Wt/WMemoryResource>
 #include <Wt/WSuggestionPopup>
 #include <Wt/WRegExpValidator>
 #include <Wt/WDoubleValidator>
-#include <Wt/WStandardItemModel>
-#if( WT_VERSION >= 0x3030600 )
-#include <Wt/Chart/WStandardChartProxyModel>
-#endif
-#include <Wt/WCssDecorationStyle>
-#include <Wt/Chart/WChartPalette>
-#include <Wt/Chart/WCartesianChart>
 
 #include "SandiaDecay/SandiaDecay.h"
 
@@ -4121,15 +4105,6 @@ std::tuple<int,int,bool> ShieldingSourceDisplay::numTruthValuesForFitValues()
 }//bool haveTruthValuesForAllFitValues()
 
 
-void ShieldingSourceDisplay::renderChi2Chart( Wt::WSvgImage &image )
-{
-  // The Chi2 chart is now implemented in D3.js, so this function is no longer needed
-  // WPainter p( &image );
-  // m_chi2Plot->paint( p );
-  // p.end();
-}//void renderChi2Chart( Wt::WSvgImage &image );
-
-
 tuple<bool,int,int,vector<string>> ShieldingSourceDisplay::testCurrentFitAgainstTruth()
 {
   bool successful = true;

src/SpectrumViewerTester.cpp

@@ -1994,7 +1994,8 @@ SpectrumViewerTester::Score SpectrumViewerTester::testShieldSourceFit()
     note.m_title = "Fit Chi2 Graphic";
     note.m_originalImage = make_shared<Wt::WSvgImage>(m_picWidth, m_picHeight);
     disp->updateChi2ChartActual( nullptr );
-    disp->renderChi2Chart( *note.m_originalImage );
+    // TODO: 20251110 The Wt-based Chi2 chart was replaced by `ShieldingSourceFitPlot` - so should update to that...
+    //disp->renderChi2Chart( *note.m_originalImage );
 
     // Set all the quantities being fit for to some default values, so we wont be starting off in
     //  unfairly close to the real answer.
@@ -2006,7 +2007,8 @@ SpectrumViewerTester::Score SpectrumViewerTester::testShieldSourceFit()
     result = disp->doModelFit( false );
 
     note.m_testImage = make_shared<Wt::WSvgImage>(m_picWidth, m_picHeight);
-    disp->renderChi2Chart( *note.m_testImage );
+    // TODO: 20251110 The Wt-based Chi2 chart was replaced by `ShieldingSourceFitPlot` - so should update to that...
+    //disp->renderChi2Chart( *note.m_testImage );
     answer.m_notes.push_back( note );
 
     switch( result->successful )