From: Ron F. <ro...@us...> - 2006-10-18 11:46:31
|
Update of /cvsroot/nsclspectcl/SpecTcl/Sorter In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30320/Sorter Modified Files: Histogrammer.cpp Histogrammer.h Log Message: Added fit tracking to histogrammer Index: Histogrammer.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Sorter/Histogrammer.cpp,v retrieving revision 5.7 retrieving revision 5.8 diff -C2 -d -r5.7 -r5.8 *** Histogrammer.cpp 18 Oct 2006 10:16:52 -0000 5.7 --- Histogrammer.cpp 18 Oct 2006 11:46:29 -0000 5.8 *************** *** 49,52 **** --- 49,54 ---- #include <Gamma2DW.h> #include <CSpectrumFit.h> + #include "CHistogrammerFitObserver.h" + #include <Iostream.h> *************** *** 159,162 **** --- 161,165 ---- m_pDisplayer = new CXamine(nSpecbytes); m_pDisplayer->Start(); + m_pFitObserver = new CHistogrammerFitObserver(*this); // Follow changes to fits. } *************** *** 175,178 **** --- 178,182 ---- if(!m_pDisplayer->isAlive()) m_pDisplayer->Start(); + m_pFitObserver = new CHistogrammerFitObserver(*this); // Follow changes to fits. } *************** *** 189,192 **** --- 193,197 ---- delete m_pDisplayer; + delete m_pFitObserver; } Index: Histogrammer.h =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Sorter/Histogrammer.h,v retrieving revision 5.5 retrieving revision 5.6 diff -C2 -d -r5.5 -r5.6 *** Histogrammer.h 18 Oct 2006 10:16:52 -0000 5.5 --- Histogrammer.h 18 Oct 2006 11:46:29 -0000 5.6 *************** *** 93,96 **** --- 93,97 ---- class CSpectrumFit; + class CHistogrammerFitObserver; // Typedefs for some of instances of templated classes: *************** *** 120,126 **** --- 121,129 ---- SpectrumDictionary m_SpectrumDictionary; // Dictionary of Spectra. CGateDictionary m_GateDictionary; // Dictionary of Gates. + CHistogrammerFitObserver* m_pFitObserver; // Monitor for fit changes. static int m_nextFitlineId; // Next Xamine fitline id. + public: // Constructors. |