diff --git a/src/libs/antares/study/area/area.h b/src/libs/antares/study/area/area.h index d49e3e0309..d65d840625 100644 --- a/src/libs/antares/study/area/area.h +++ b/src/libs/antares/study/area/area.h @@ -209,9 +209,9 @@ class Area final : private Yuni::NonCopyable /*! ** \brief Get the XCast data according a given time-series type */ - template + template XCast* xcastData(); - template + template const XCast* xcastData() const; public: diff --git a/src/libs/antares/study/area/area.hxx b/src/libs/antares/study/area/area.hxx index fc6bd885a5..e4e1655125 100644 --- a/src/libs/antares/study/area/area.hxx +++ b/src/libs/antares/study/area/area.hxx @@ -52,7 +52,7 @@ inline const Area* AreaList::operator[](uint i) const return byIndex[i]; } -template +template inline XCast* Area::xcastData() { switch (T) @@ -71,7 +71,7 @@ inline XCast* Area::xcastData() return nullptr; } -template +template inline const XCast* Area::xcastData() const { switch (T) @@ -167,4 +167,4 @@ inline AreaList::const_reverse_iterator AreaList::rend() const return areas.rend(); } -} // namespace Antares \ No newline at end of file +} // namespace Antares diff --git a/src/libs/antares/study/fwd.h b/src/libs/antares/study/fwd.h index 5c02e62655..6db7c2ee57 100644 --- a/src/libs/antares/study/fwd.h +++ b/src/libs/antares/study/fwd.h @@ -205,7 +205,7 @@ std::string styleToString(const StyleType& style); ** ** These values are mainly used for mask bits */ -enum TimeSeries : unsigned int +enum TimeSeriesType : unsigned int { //! TimeSeries : Load timeSeriesLoad = 1, diff --git a/src/libs/antares/study/parameters.cpp b/src/libs/antares/study/parameters.cpp index 04f3749109..c10519942f 100644 --- a/src/libs/antares/study/parameters.cpp +++ b/src/libs/antares/study/parameters.cpp @@ -345,7 +345,7 @@ void Parameters::reset() resetSeeds(); } -bool Parameters::isTSGeneratedByPrepro(const TimeSeries ts) const +bool Parameters::isTSGeneratedByPrepro(const TimeSeriesType ts) const { return (timeSeriesToGenerate & ts); } @@ -1090,7 +1090,7 @@ bool Parameters::loadFromINI(const IniFile& ini, uint version, const StudyLoadOp void Parameters::fixRefreshIntervals() { using T = std:: - tuple; + tuple; const std::list timeSeriesToCheck = {{refreshIntervalLoad, timeSeriesLoad, "load"}, {refreshIntervalSolar, timeSeriesSolar, "solar"}, {refreshIntervalHydro, timeSeriesHydro, "hydro"}, diff --git a/src/libs/antares/study/parameters.h b/src/libs/antares/study/parameters.h index 952d534764..ffb5f1d643 100644 --- a/src/libs/antares/study/parameters.h +++ b/src/libs/antares/study/parameters.h @@ -124,7 +124,7 @@ class Parameters final ** \param mask The time-serie to test ** \return True if the time-series must be generated by the preprocessor, false otherwise */ - bool isTSGeneratedByPrepro(const TimeSeries ts) const; + bool isTSGeneratedByPrepro(const TimeSeriesType ts) const; /*! ** \brief Reset to default all values in a structure for general data diff --git a/src/libs/antares/study/parts/common/series.h b/src/libs/antares/study/parts/common/series.h index 1be27e94cb..94ca55db35 100644 --- a/src/libs/antares/study/parts/common/series.h +++ b/src/libs/antares/study/parts/common/series.h @@ -28,6 +28,7 @@ #define __ANTARES_LIBS_STUDY_PARTS_COMMON_TIMESERIES_H__ #include +#include #include "../../fwd.h" namespace Antares::Data @@ -66,5 +67,6 @@ class DataSeriesCommon uint getSeriesIndex(unsigned int year) const; }; // class DataSeriesCommon + } // namespace Antares::Data #endif /* __ANTARES_LIBS_STUDY_PARTS_COMMON_TIMESERIES_H__ */ diff --git a/src/libs/antares/study/study.cpp b/src/libs/antares/study/study.cpp index 4069206dff..d46123f8dd 100644 --- a/src/libs/antares/study/study.cpp +++ b/src/libs/antares/study/study.cpp @@ -1148,7 +1148,7 @@ void Study::ensureDataAreLoadedForAllBindingConstraints() namespace // anonymous { -template +template struct TS final { static bool IsNeeded(const Study& s, const uint y) diff --git a/src/libs/antares/study/study.h b/src/libs/antares/study/study.h index fe12467e88..73698e6b1a 100644 --- a/src/libs/antares/study/study.h +++ b/src/libs/antares/study/study.h @@ -357,7 +357,7 @@ class Study: public Yuni::NonCopyable, public IObject, public LayerData /*! ** \brief Destroy all data of the TS generator '@TS' */ - template + template void destroyTSGeneratorData(); //! Destroy all data of the load TS generator diff --git a/src/libs/antares/study/study.hxx b/src/libs/antares/study/study.hxx index da25cfa808..0af64811b4 100644 --- a/src/libs/antares/study/study.hxx +++ b/src/libs/antares/study/study.hxx @@ -42,27 +42,27 @@ inline void Study::storeTimeSeriesNumbers(Solver::IResultWriter& resultWriter) c storeTimeseriesNumbers(resultWriter, areas); } -template +template inline void Study::destroyTSGeneratorData() { switch (TS) { - case TimeSeries::timeSeriesLoad: + case TimeSeriesType::timeSeriesLoad: destroyAllLoadTSGeneratorData(); break; - case TimeSeries::timeSeriesSolar: + case TimeSeriesType::timeSeriesSolar: destroyAllSolarTSGeneratorData(); break; - case TimeSeries::timeSeriesWind: + case TimeSeriesType::timeSeriesWind: destroyAllWindTSGeneratorData(); break; - case TimeSeries::timeSeriesHydro: + case TimeSeriesType::timeSeriesHydro: destroyAllHydroTSGeneratorData(); break; - case TimeSeries::timeSeriesThermal: + case TimeSeriesType::timeSeriesThermal: destroyAllThermalTSGeneratorData(); break; - case TimeSeries::timeSeriesCount: + case TimeSeriesType::timeSeriesCount: break; } } diff --git a/src/libs/antares/study/xcast/xcast.cpp b/src/libs/antares/study/xcast/xcast.cpp index c1bd7e0fb8..99978abe41 100644 --- a/src/libs/antares/study/xcast/xcast.cpp +++ b/src/libs/antares/study/xcast/xcast.cpp @@ -129,7 +129,7 @@ XCast::Distribution XCast::StringToDistribution(AnyString text) return dtNone; } -XCast::XCast(TimeSeries ts) : +XCast::XCast(TimeSeriesType ts) : useTranslation(tsTranslationNone), distribution(dtBeta), capacity(0), diff --git a/src/libs/antares/study/xcast/xcast.h b/src/libs/antares/study/xcast/xcast.h index 4124f06798..32abeeba46 100644 --- a/src/libs/antares/study/xcast/xcast.h +++ b/src/libs/antares/study/xcast/xcast.h @@ -123,7 +123,7 @@ class XCast final : private Yuni::NonCopyable /*! ** \brief Constructor */ - XCast(TimeSeries ts); + XCast(TimeSeriesType ts); /*! ** \brief Destructor */ @@ -208,7 +208,7 @@ class XCast final : private Yuni::NonCopyable Matrix conversion; //! The related time-series - const TimeSeries timeSeries; + const TimeSeriesType timeSeries; protected: void resetTransferFunction(); diff --git a/src/solver/application.cpp b/src/solver/application.cpp index f2a9d1028a..143d0fe240 100644 --- a/src/solver/application.cpp +++ b/src/solver/application.cpp @@ -154,7 +154,7 @@ void Application::prepare(int argc, char* argv[]) pParameters->include.hurdleCosts); bool tsGenThermal - = (0 != (pParameters->timeSeriesToGenerate & Antares::Data::TimeSeries::timeSeriesThermal)); + = (0 != (pParameters->timeSeriesToGenerate & Antares::Data::TimeSeriesType::timeSeriesThermal)); checkMinStablePower(tsGenThermal, pStudy->areas); diff --git a/src/solver/simulation/timeseries-numbers.cpp b/src/solver/simulation/timeseries-numbers.cpp index cd98ccfc75..ba8b00e5b5 100644 --- a/src/solver/simulation/timeseries-numbers.cpp +++ b/src/solver/simulation/timeseries-numbers.cpp @@ -43,7 +43,7 @@ using namespace Yuni; using namespace Antares::Data; using namespace std; -const map ts_to_tsIndex = {{timeSeriesLoad, 0}, +const map ts_to_tsIndex = {{timeSeriesLoad, 0}, {timeSeriesHydro, 1}, {timeSeriesWind, 2}, {timeSeriesThermal, 3}, @@ -51,7 +51,7 @@ const map ts_to_tsIndex = {{timeSeriesLoad, 0}, {timeSeriesRenewable, 5}, {timeSeriesTransmissionCapacities, 6}}; -const map ts_to_tsTitle +const map ts_to_tsTitle = {{timeSeriesLoad, "load"}, {timeSeriesHydro, "hydro"}, {timeSeriesWind, "wind"}, @@ -65,7 +65,7 @@ void addInterModalTimeSeriesToMessage(const array& isTSin { bool isFirstLogged = true; - map::const_iterator it = ts_to_tsIndex.begin(); + map::const_iterator it = ts_to_tsIndex.begin(); for (; it != ts_to_tsIndex.end(); ++it) { if (isTSintermodal[it->second]) @@ -263,7 +263,7 @@ class areaLinksTransCapaNumberOfTSretriever : public areaNumberOfTSretriever class IntraModalConsistencyChecker { public: - IntraModalConsistencyChecker(const TimeSeries ts, + IntraModalConsistencyChecker(const TimeSeriesType ts, const array& isTSintramodal, const array& isTSgenerated, areaNumberOfTSretriever* tsCounter, @@ -344,7 +344,7 @@ bool checkIntraModalConsistency(array& nbTimeseriesByMode { // Initialization of a map associating a time-series to an object that retrieves // the number of time series inside an area - using mapTStoRetriever = map>; + using mapTStoRetriever = map>; mapTStoRetriever ts_to_numberOfTSretrievers; ts_to_numberOfTSretrievers[timeSeriesLoad] = make_shared(study); ts_to_numberOfTSretrievers[timeSeriesHydro] = make_shared(study); @@ -361,7 +361,7 @@ bool checkIntraModalConsistency(array& nbTimeseriesByMode mapTStoRetriever::iterator it = ts_to_numberOfTSretrievers.begin(); for (; it != ts_to_numberOfTSretrievers.end(); ++it) { - const TimeSeries tsKind = it->first; + const TimeSeriesType tsKind = it->first; areaNumberOfTSretriever* tsRetriever = (it->second).get(); int indexTS = ts_to_tsIndex.at(it->first); IntraModalConsistencyChecker intraModalchecker( @@ -976,13 +976,13 @@ void TimeSeriesNumbers::StoreTimeSeriesNumbersIntoOuput(Data::Study& study, IRes if (study.parameters.storeTimeseriesNumbers) { fixTSNumbersWhenWidthIsOne(study); - study.storeTimeSeriesNumbers(resultWriter); - study.storeTimeSeriesNumbers(resultWriter); - study.storeTimeSeriesNumbers(resultWriter); - study.storeTimeSeriesNumbers(resultWriter); - study.storeTimeSeriesNumbers(resultWriter); - study.storeTimeSeriesNumbers(resultWriter); - study.storeTimeSeriesNumbers(resultWriter); + study.storeTimeSeriesNumbers(resultWriter); + study.storeTimeSeriesNumbers(resultWriter); + study.storeTimeSeriesNumbers(resultWriter); + study.storeTimeSeriesNumbers(resultWriter); + study.storeTimeSeriesNumbers(resultWriter); + study.storeTimeSeriesNumbers(resultWriter); + study.storeTimeSeriesNumbers(resultWriter); Simulation::BindingConstraintsTimeSeriesNumbersWriter ts_writer(resultWriter); ts_writer.write(study.bindingConstraintsGroups); diff --git a/src/solver/ts-generator/generator.h b/src/solver/ts-generator/generator.h index 26314c4ae4..1f3582fb2c 100644 --- a/src/solver/ts-generator/generator.h +++ b/src/solver/ts-generator/generator.h @@ -43,7 +43,7 @@ namespace TSGenerator /*! ** \brief Regenerate the time-series */ -template +template bool GenerateTimeSeries(Data::Study& study, uint year, IResultWriter& writer); bool GenerateThermalTimeSeries(Data::Study& study, @@ -60,7 +60,7 @@ void DestroyAll(Data::Study& study); /*! ** \brief Destroy a TS generator if it exists and no longer needed */ -template +template void Destroy(Data::Study& study, uint year); } // namespace TSGenerator diff --git a/src/solver/ts-generator/generator.hxx b/src/solver/ts-generator/generator.hxx index 4fa18562d3..acf699e4b7 100644 --- a/src/solver/ts-generator/generator.hxx +++ b/src/solver/ts-generator/generator.hxx @@ -49,7 +49,7 @@ inline bool GenerateTimeSeries(Data::Study& study, } // --- TS Generators using XCast --- -template +template bool GenerateTimeSeries(Data::Study& study, uint year, IResultWriter& writer) { auto* xcast = reinterpret_cast( @@ -91,7 +91,7 @@ bool GenerateTimeSeries(Data::Study& study, uint year, IResultWriter& writer) return r; } -template +template void Destroy(Data::Study& study, uint year) { auto* xcast = reinterpret_cast( diff --git a/src/solver/ts-generator/xcast/xcast.cpp b/src/solver/ts-generator/xcast/xcast.cpp index 2f3175d871..2cffb5235e 100644 --- a/src/solver/ts-generator/xcast/xcast.cpp +++ b/src/solver/ts-generator/xcast/xcast.cpp @@ -59,7 +59,7 @@ enum mu = Data::XCast::dataCoeffMu, }; -XCast::XCast(Data::Study& study, Data::TimeSeries ts, IResultWriter& writer) : +XCast::XCast(Data::Study& study, Data::TimeSeriesType ts, IResultWriter& writer) : study(study), timeSeriesType(ts), pNeverInitialized(true), diff --git a/src/solver/ts-generator/xcast/xcast.h b/src/solver/ts-generator/xcast/xcast.h index 0cf1bf0729..7c6efb6d25 100644 --- a/src/solver/ts-generator/xcast/xcast.h +++ b/src/solver/ts-generator/xcast/xcast.h @@ -74,7 +74,7 @@ class XCast final : private Yuni::NonCopyable /*! ** \brief Default constructor */ - XCast(Data::Study& study, Data::TimeSeries ts, IResultWriter& writer); + XCast(Data::Study& study, Data::TimeSeriesType ts, IResultWriter& writer); /*! ** \brief Destructor */ @@ -104,7 +104,7 @@ class XCast final : private Yuni::NonCopyable //! The current year uint year; //! The time-series type - const Data::TimeSeries timeSeriesType; + const Data::TimeSeriesType timeSeriesType; //! The random generator to use MersenneTwister* random; diff --git a/src/ui/action/handler/antares-study/area/correlation-post.cpp b/src/ui/action/handler/antares-study/area/correlation-post.cpp index 0f64d656b7..727a9c7a5f 100644 --- a/src/ui/action/handler/antares-study/area/correlation-post.cpp +++ b/src/ui/action/handler/antares-study/area/correlation-post.cpp @@ -35,7 +35,7 @@ namespace AntaresStudy { namespace Area { -CorrelationPost::CorrelationPost(IAction* parent, Data::TimeSeries ts, const AnyString& areaname) : +CorrelationPost::CorrelationPost(IAction* parent, Data::TimeSeriesType ts, const AnyString& areaname) : pAction(parent), pType(ts), pOriginalAreaName(areaname) { pInfos.caption << "Correlation for " << areaname << " (deferred)"; diff --git a/src/ui/action/handler/antares-study/area/correlation-post.h b/src/ui/action/handler/antares-study/area/correlation-post.h index f08965031d..ef832eade9 100644 --- a/src/ui/action/handler/antares-study/area/correlation-post.h +++ b/src/ui/action/handler/antares-study/area/correlation-post.h @@ -52,7 +52,7 @@ class CorrelationPost : public IAction /*! ** \brief Default constructor */ - explicit CorrelationPost(IAction* parent, Data::TimeSeries ts, const AnyString& areaname); + explicit CorrelationPost(IAction* parent, Data::TimeSeriesType ts, const AnyString& areaname); //! Destructor virtual ~CorrelationPost(); //@} @@ -66,7 +66,7 @@ class CorrelationPost : public IAction private: //! The attached action IAction::Ptr pAction; - Data::TimeSeries pType; + Data::TimeSeriesType pType; Data::AreaName pOriginalAreaName; }; // class IAction diff --git a/src/ui/action/handler/antares-study/area/correlation.cpp b/src/ui/action/handler/antares-study/area/correlation.cpp index 912f089be7..c6c685c81f 100644 --- a/src/ui/action/handler/antares-study/area/correlation.cpp +++ b/src/ui/action/handler/antares-study/area/correlation.cpp @@ -36,7 +36,7 @@ namespace AntaresStudy { namespace Area { -Correlation::Correlation(Data::TimeSeries ts, const AnyString& areaname) : +Correlation::Correlation(Data::TimeSeriesType ts, const AnyString& areaname) : pType(ts), pOriginalAreaName(areaname) { switch (ts) diff --git a/src/ui/action/handler/antares-study/area/correlation.h b/src/ui/action/handler/antares-study/area/correlation.h index 2ee15083fe..08a6b77caa 100644 --- a/src/ui/action/handler/antares-study/area/correlation.h +++ b/src/ui/action/handler/antares-study/area/correlation.h @@ -52,7 +52,7 @@ class Correlation : public IAction /*! ** \brief Default constructor */ - explicit Correlation(Data::TimeSeries ts, const AnyString& areaname); + explicit Correlation(Data::TimeSeriesType ts, const AnyString& areaname); //! Destructor virtual ~Correlation(); //@} @@ -63,7 +63,7 @@ class Correlation : public IAction virtual void createPostActionsWL(const IAction::Ptr& node); private: - Data::TimeSeries pType; + Data::TimeSeriesType pType; Data::AreaName pOriginalAreaName; }; // class IAction diff --git a/src/ui/action/handler/antares-study/area/timeseries.cpp b/src/ui/action/handler/antares-study/area/timeseries.cpp index 754d3ed737..a1070c0d4c 100644 --- a/src/ui/action/handler/antares-study/area/timeseries.cpp +++ b/src/ui/action/handler/antares-study/area/timeseries.cpp @@ -37,7 +37,7 @@ namespace AntaresStudy { namespace Area { -DataTimeseries::DataTimeseries(Data::TimeSeries ts, const AnyString& areaname) : +DataTimeseries::DataTimeseries(Data::TimeSeriesType ts, const AnyString& areaname) : pType(ts), pOriginalAreaName(areaname) { switch (ts) @@ -62,7 +62,7 @@ DataTimeseries::DataTimeseries(Data::TimeSeries ts, const AnyString& areaname) : } } -DataTimeseries::DataTimeseries(Data::TimeSeries ts, +DataTimeseries::DataTimeseries(Data::TimeSeriesType ts, const AnyString& areaname, const AnyString& clustername) : pType(ts), pOriginalAreaName(areaname), pOriginalPlantName(clustername) diff --git a/src/ui/action/handler/antares-study/area/timeseries.h b/src/ui/action/handler/antares-study/area/timeseries.h index e086bfc9df..0100e95986 100644 --- a/src/ui/action/handler/antares-study/area/timeseries.h +++ b/src/ui/action/handler/antares-study/area/timeseries.h @@ -53,12 +53,12 @@ class DataTimeseries : public IAction /*! ** \brief Default constructor */ - DataTimeseries(Data::TimeSeries ts, const AnyString& areaname); + DataTimeseries(Data::TimeSeriesType ts, const AnyString& areaname); /*! ** \brief Default constructor */ - DataTimeseries(Data::TimeSeries ts, const AnyString& areaname, const AnyString& clustername); + DataTimeseries(Data::TimeSeriesType ts, const AnyString& areaname, const AnyString& clustername); //! Destructor virtual ~DataTimeseries(); @@ -74,7 +74,7 @@ class DataTimeseries : public IAction virtual void registerViewsWL(Context& ctx); private: - Data::TimeSeries pType; + Data::TimeSeriesType pType; Data::AreaName pOriginalAreaName; Data::ClusterName pOriginalPlantName; diff --git a/src/ui/action/handler/antares-study/area/ts-generator.cpp b/src/ui/action/handler/antares-study/area/ts-generator.cpp index 8adf150624..95c8e02482 100644 --- a/src/ui/action/handler/antares-study/area/ts-generator.cpp +++ b/src/ui/action/handler/antares-study/area/ts-generator.cpp @@ -38,7 +38,7 @@ namespace AntaresStudy { namespace Area { -DataTSGenerator::DataTSGenerator(Data::TimeSeries ts, const AnyString& areaname) : +DataTSGenerator::DataTSGenerator(Data::TimeSeriesType ts, const AnyString& areaname) : pType(ts), pOriginalAreaName(areaname) { switch (ts) @@ -63,7 +63,7 @@ DataTSGenerator::DataTSGenerator(Data::TimeSeries ts, const AnyString& areaname) } } -DataTSGenerator::DataTSGenerator(Data::TimeSeries ts, +DataTSGenerator::DataTSGenerator(Data::TimeSeriesType ts, const AnyString& areaname, const AnyString& clustername) : pType(ts), pOriginalAreaName(areaname), pOriginalPlantName(clustername) diff --git a/src/ui/action/handler/antares-study/area/ts-generator.h b/src/ui/action/handler/antares-study/area/ts-generator.h index 371a29f463..a761128fe8 100644 --- a/src/ui/action/handler/antares-study/area/ts-generator.h +++ b/src/ui/action/handler/antares-study/area/ts-generator.h @@ -53,12 +53,12 @@ class DataTSGenerator : public IAction /*! ** \brief Default constructor */ - DataTSGenerator(Data::TimeSeries ts, const AnyString& areaname); + DataTSGenerator(Data::TimeSeriesType ts, const AnyString& areaname); /*! ** \brief Default constructor */ - DataTSGenerator(Data::TimeSeries ts, const AnyString& areaname, const AnyString& clustername); + DataTSGenerator(Data::TimeSeriesType ts, const AnyString& areaname, const AnyString& clustername); //! Destructor virtual ~DataTSGenerator(); @@ -74,7 +74,7 @@ class DataTSGenerator : public IAction virtual void registerViewsWL(Context& ctx); private: - Data::TimeSeries pType; + Data::TimeSeriesType pType; Data::AreaName pOriginalAreaName; Data::ClusterName pOriginalPlantName; diff --git a/src/ui/action/handler/antares-study/area/ts-node.cpp b/src/ui/action/handler/antares-study/area/ts-node.cpp index 4479a95e0c..b9d3d81dfb 100644 --- a/src/ui/action/handler/antares-study/area/ts-node.cpp +++ b/src/ui/action/handler/antares-study/area/ts-node.cpp @@ -38,7 +38,7 @@ namespace AntaresStudy { namespace Area { -NodeTimeseries::NodeTimeseries(Data::TimeSeries ts) : pType(ts) +NodeTimeseries::NodeTimeseries(Data::TimeSeriesType ts) : pType(ts) { // behavior pInfos.behavior = bhOverwrite; diff --git a/src/ui/action/handler/antares-study/area/ts-node.h b/src/ui/action/handler/antares-study/area/ts-node.h index 3e407aed56..94d332e5aa 100644 --- a/src/ui/action/handler/antares-study/area/ts-node.h +++ b/src/ui/action/handler/antares-study/area/ts-node.h @@ -53,7 +53,7 @@ class NodeTimeseries : public IAction /*! ** \brief Default constructor */ - NodeTimeseries(Data::TimeSeries ts); + NodeTimeseries(Data::TimeSeriesType ts); //! Destructor virtual ~NodeTimeseries(); //@} @@ -66,7 +66,7 @@ class NodeTimeseries : public IAction private: //! Type of the timeseries - const Data::TimeSeries pType; + const Data::TimeSeriesType pType; }; // class IAction diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.cpp b/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.cpp index 702766467d..b4930b90c8 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.cpp +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.cpp @@ -79,7 +79,7 @@ void Areas::initializeFromStudy() } } -void Areas::reloadDistributionLawsFromStudy(Data::TimeSeries ts) +void Areas::reloadDistributionLawsFromStudy(Data::TimeSeriesType ts) { if (!(!study)) { diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.h b/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.h index c09c04de9d..9b305202ec 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/analyzer/areas.h @@ -163,7 +163,7 @@ class Areas final : public virtual Renderer::IRenderer virtual bool valid() const; - void reloadDistributionLawsFromStudy(Data::TimeSeries ts); + void reloadDistributionLawsFromStudy(Data::TimeSeriesType ts); /*! ** \brief Reset internal variables according the current study diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.h b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.h index 2ad82aaae7..722d108f37 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.h @@ -39,7 +39,7 @@ namespace Datagrid { namespace Renderer { -template +template class XCastAllAreas final : public Renderer::IRenderer { public: diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.hxx b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.hxx index bc4f20e47a..c5632070e0 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.hxx +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-allareas.hxx @@ -39,40 +39,40 @@ namespace Datagrid { namespace Renderer { -template +template inline XCastAllAreas::XCastAllAreas(wxWindow* parent, Toolbox::InputSelector::Area* notifier) : pControl(parent), pNotifier(notifier) { OnStudyAreaRename.connect(this, &XCastAllAreas::onAreaRenamed); } -template +template inline XCastAllAreas::~XCastAllAreas() { destroyBoundEvents(); } -template +template inline int XCastAllAreas::width() const { return 4; } -template +template inline int XCastAllAreas::height() const { auto study = GetCurrentStudy(); return !study ? 0 : study->areas.size(); } -template +template inline bool XCastAllAreas::valid() const { auto study = GetCurrentStudy(); return !(!study) and study->areas.size() != 0; } -template +template wxString XCastAllAreas::columnCaption(int colIndx) const { switch (colIndx) @@ -89,7 +89,7 @@ wxString XCastAllAreas::columnCaption(int colIndx) const return wxEmptyString; } -template +template wxString XCastAllAreas::rowCaption(int rowIndx) const { auto study = GetCurrentStudy(); @@ -98,7 +98,7 @@ wxString XCastAllAreas::rowCaption(int rowIndx) const return wxStringFromUTF8(study->areas.byIndex[rowIndx]->name); } -template +template IRenderer::CellStyle XCastAllAreas::cellStyle(int x, int y) const { auto study = GetCurrentStudy(); @@ -132,7 +132,7 @@ IRenderer::CellStyle XCastAllAreas::cellStyle(int x, int y) const return IRenderer::cellStyleDefaultCenter; } -template +template wxColour XCastAllAreas::cellBackgroundColor(int, int y) const { auto study = GetCurrentStudy(); @@ -142,7 +142,7 @@ wxColour XCastAllAreas::cellBackgroundColor(int, int y) const return wxColor(area.ui->color[0], area.ui->color[1], area.ui->color[2]); } -template +template wxString XCastAllAreas::cellValue(int x, int y) const { auto study = GetCurrentStudy(); @@ -176,7 +176,7 @@ wxString XCastAllAreas::cellValue(int x, int y) const return wxEmptyString; } -template +template double XCastAllAreas::cellNumericValue(int x, int y) const { auto study = GetCurrentStudy(); @@ -209,7 +209,7 @@ double XCastAllAreas::cellNumericValue(int x, int y) const return 0.; } -template +template bool XCastAllAreas::cellValue(int x, int y, const Yuni::String& value) { auto study = GetCurrentStudy(); @@ -274,7 +274,7 @@ bool XCastAllAreas::cellValue(int x, int y, const Yuni::String& value) return false; } -template +template void XCastAllAreas::onAreaRenamed(Data::Area*) { if (pControl) diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.h b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.h index 1ec31c6a15..3e532cea30 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.h @@ -38,7 +38,7 @@ namespace Datagrid { namespace Renderer { -template +template class XCastCoefficients final : public Renderer::Matrix, public Renderer::ARendererArea { public: diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.hxx b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.hxx index 84fddf276c..193a069c5a 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.hxx +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-coefficients.hxx @@ -36,20 +36,20 @@ namespace Datagrid { namespace Renderer { -template +template inline XCastCoefficients::XCastCoefficients(wxWindow* control, Toolbox::InputSelector::Area* notifier) : MatrixAncestorType(control), Renderer::ARendererArea(control, notifier) { } -template +template inline XCastCoefficients::~XCastCoefficients() { destroyBoundEvents(); } -template +template wxString XCastCoefficients::columnCaption(int colIndx) const { static const wxString captions[Data::XCast::dataMax] = {wxT(" alpha "), @@ -61,19 +61,19 @@ wxString XCastCoefficients::columnCaption(int colIndx) const return colIndx < Data::XCast::dataMax ? captions[colIndx] : wxString(); } -template +template wxString XCastCoefficients::cellValue(int x, int y) const { return MatrixAncestorType::cellValue(x, y); } -template +template double XCastCoefficients::cellNumericValue(int x, int y) const { return MatrixAncestorType::cellNumericValue(x, y); } -template +template inline bool XCastCoefficients::cellValue(int x, int y, const Yuni::String& value) { using namespace Antares::Data; @@ -191,7 +191,7 @@ inline bool XCastCoefficients::cellValue(int x, int y, const Yuni::String& va return MatrixAncestorType::cellValue(x, y, value); } -template +template void XCastCoefficients::internalAreaChanged(Data::Area* area) { if (area) @@ -204,7 +204,7 @@ void XCastCoefficients::internalAreaChanged(Data::Area* area) Renderer::ARendererArea::internalAreaChanged(area); } -template +template IRenderer::CellStyle XCastCoefficients::cellStyle(int col, int row) const { // law \ coeff alpha beta gamma delta @@ -336,7 +336,7 @@ IRenderer::CellStyle XCastCoefficients::cellStyle(int col, int row) const return Yuni::Math::Zero(d) ? IRenderer::cellStyleDefaultDisabled : IRenderer::cellStyleDefault; } -template +template wxString XCastCoefficients::rowCaption(int rowIndx) const { return ((uint)rowIndx < 12) ? wxString() << (1 + rowIndx) << wxT(" - ") @@ -344,20 +344,20 @@ wxString XCastCoefficients::rowCaption(int rowIndx) const : wxString(); } -template +template inline Date::Precision XCastCoefficients::precision() { return Date::monthly; } -template +template void XCastCoefficients::onStudyClosed() { Renderer::Matrix::onStudyClosed(); Renderer::ARendererArea::onStudyClosed(); } -template +template void XCastCoefficients::onStudyLoaded() { Renderer::Matrix::onStudyLoaded(); diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.h b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.h index 123663ee1e..1088d1235a 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.h @@ -38,7 +38,7 @@ namespace Datagrid { namespace Renderer { -template +template class XCastConversion : public Renderer::Matrix, public Renderer::ARendererArea { public: diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.hxx b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.hxx index 2b3720c6bb..0b3a4b7f4d 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.hxx +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-conversion.hxx @@ -37,43 +37,43 @@ namespace Datagrid { namespace Renderer { -template +template XCastConversion::XCastConversion(wxWindow* control, Toolbox::InputSelector::Area* notifier) : MatrixAncestorType(control), Renderer::ARendererArea(control, notifier) { } -template +template XCastConversion::~XCastConversion() { destroyBoundEvents(); } -template +template inline wxString XCastConversion::columnCaption(int colIndx) const { return wxString() << wxT(" point ") << (colIndx + 1) << wxT(' '); } -template +template inline wxString XCastConversion::cellValue(int x, int y) const { return MatrixAncestorType::cellValue(x + 1, y); } -template +template double XCastConversion::cellNumericValue(int x, int y) const { return MatrixAncestorType::cellNumericValue(x + 1, y); } -template +template inline bool XCastConversion::cellValue(int x, int y, const Yuni::String& value) { return MatrixAncestorType::cellValue(x + 1, y, value); } -template +template void XCastConversion::internalAreaChanged(Data::Area* area) { if (area) @@ -86,7 +86,7 @@ void XCastConversion::internalAreaChanged(Data::Area* area) Renderer::ARendererArea::internalAreaChanged(area); } -template +template IRenderer::CellStyle XCastConversion::cellStyle(int col, int row) const { double b = MatrixAncestorType::cellNumericValue(col + 1, 0); @@ -96,13 +96,13 @@ IRenderer::CellStyle XCastConversion::cellStyle(int col, int row) const : MatrixAncestorType::cellStyle(col, row); } -template +template wxString XCastConversion::rowCaption(int rowIndx) const { return (rowIndx == 0) ? wxT("IN") : wxT("OUT"); } -template +template bool XCastConversion::onMatrixResize(uint, uint, uint& newX, uint&) { if (newX > Data::XCast::conversionMaxPoints) @@ -117,7 +117,7 @@ bool XCastConversion::onMatrixResize(uint, uint, uint& newX, uint&) return false; } -template +template void XCastConversion::onMatrixLoad() { auto& matrix = *pMatrix; @@ -147,14 +147,14 @@ void XCastConversion::onMatrixLoad() } } -template +template void XCastConversion::onStudyClosed() { Renderer::Matrix::onStudyClosed(); Renderer::ARendererArea::onStudyClosed(); } -template +template void XCastConversion::onStudyLoaded() { Renderer::Matrix::onStudyLoaded(); diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.h b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.h index 89b2ce486a..2890ed1296 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.h @@ -38,7 +38,7 @@ namespace Datagrid { namespace Renderer { -template +template class XCastK : public Renderer::Matrix, public Renderer::ARendererArea { public: diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.hxx b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.hxx index 9a2561386f..30e9f27972 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.hxx +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-k.hxx @@ -35,44 +35,44 @@ namespace Datagrid { namespace Renderer { -template +template XCastK::XCastK(wxWindow* control, Toolbox::InputSelector::Area* notifier) : MatrixAncestorType(control), Renderer::ARendererArea(control, notifier) { } -template +template XCastK::~XCastK() { destroyBoundEvents(); } -template +template wxString XCastK::columnCaption(int colIndx) const { return (colIndx < 12) ? wxStringFromUTF8(Date::MonthToString(colIndx)) << wxT(" ") : wxString(); } -template +template wxString XCastK::cellValue(int x, int y) const { return MatrixAncestorType::cellValue(x, y); } -template +template double XCastK::cellNumericValue(int x, int y) const { return MatrixAncestorType::cellNumericValue(x, y); } -template +template bool XCastK::cellValue(int x, int y, const Yuni::String& value) { return MatrixAncestorType::cellValue(x, y, value); } -template +template void XCastK::internalAreaChanged(Data::Area* area) { if (area) @@ -86,50 +86,50 @@ void XCastK::internalAreaChanged(Data::Area* area) Renderer::ARendererArea::internalAreaChanged(area); } -template +template inline IRenderer::CellStyle XCastK::cellStyle(int col, int row) const { return MatrixAncestorType::cellStyle(col, row); } -template +template inline wxString XCastK::rowCaption(int rowIndx) const { return wxString() << rowIndx; } -template +template inline int XCastK::width() const { return MatrixAncestorType::width(); } -template +template inline int XCastK::height() const { return MatrixAncestorType::height(); } -template +template inline uint XCastK::maxWidthResize() const { return 0; } -template +template inline bool XCastK::valid() const { return MatrixAncestorType::valid(); } -template +template void XCastK::onStudyClosed() { Renderer::Matrix::onStudyClosed(); Renderer::ARendererArea::onStudyClosed(); } -template +template void XCastK::onStudyLoaded() { Renderer::Matrix::onStudyLoaded(); diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.h b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.h index 1def9fa485..4f1373490b 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.h @@ -38,7 +38,7 @@ namespace Datagrid { namespace Renderer { -template +template class XCastTranslation final : public Renderer::Matrix, public Renderer::ARendererArea { public: diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.hxx b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.hxx index c9f9210a27..d59bd47042 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.hxx +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/xcast-translation.hxx @@ -38,43 +38,43 @@ namespace Datagrid { namespace Renderer { -template +template XCastTranslation::XCastTranslation(wxWindow* control, Toolbox::InputSelector::Area* notifier) : MatrixAncestorType(control), Renderer::ARendererArea(control, notifier) { } -template +template XCastTranslation::~XCastTranslation() { destroyBoundEvents(); } -template +template inline wxString XCastTranslation::columnCaption(int colIndx) const { return MatrixAncestorType::columnCaption(colIndx); } -template +template wxString XCastTranslation::cellValue(int x, int y) const { return MatrixAncestorType::cellValue(x, y); } -template +template inline double XCastTranslation::cellNumericValue(int x, int y) const { return MatrixAncestorType::cellNumericValue(x, y); } -template +template inline bool XCastTranslation::cellValue(int x, int y, const Yuni::String& value) { return MatrixAncestorType::cellValue(x, y, value); } -template +template void XCastTranslation::internalAreaChanged(Data::Area* area) { if (area) @@ -88,19 +88,19 @@ void XCastTranslation::internalAreaChanged(Data::Area* area) Renderer::ARendererArea::internalAreaChanged(area); } -template +template inline IRenderer::CellStyle XCastTranslation::cellStyle(int col, int row) const { return MatrixAncestorType::cellStyle(col, row); } -template +template inline wxString XCastTranslation::rowCaption(int rowIndx) const { return MatrixAncestorType::rowCaption(rowIndx); } -template +template wxColour XCastTranslation::horizontalBorderColor(int x, int y) const { // Getting informations about the next hour @@ -118,14 +118,14 @@ wxColour XCastTranslation::horizontalBorderColor(int x, int y) const return IRenderer::verticalBorderColor(x, y); } -template +template void XCastTranslation::onStudyClosed() { Renderer::Matrix::onStudyClosed(); Renderer::ARendererArea::onStudyClosed(); } -template +template void XCastTranslation::onStudyLoaded() { Renderer::Matrix::onStudyLoaded(); diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/cell.cpp b/src/ui/simulator/toolbox/components/datagrid/renderer/cell.cpp index 981922a2be..bb2e40ce76 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/cell.cpp +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/cell.cpp @@ -30,7 +30,7 @@ static bool convertToDouble(const String& value, double& valueDouble) // ------------------- // Base Cell class // ------------------- -Cell::Cell(TimeSeries ts) : tsKind_(ts) +Cell::Cell(TimeSeriesType ts) : tsKind_(ts) { // We have to wait for the study to be loaded before initializing data members from study. // That's why constructor delegates to member function onStudyLoaded. @@ -104,7 +104,7 @@ IRenderer::CellStyle inactiveCell::cellStyle() const // =================== // Status cell // =================== -readyMadeTSstatus::readyMadeTSstatus(TimeSeries ts) : Cell(ts) +readyMadeTSstatus::readyMadeTSstatus(TimeSeriesType ts) : Cell(ts) { } @@ -138,7 +138,7 @@ IRenderer::CellStyle readyMadeTSstatus::cellStyle() const // ========================== // Generated TS status cell // ========================== -generatedTSstatus::generatedTSstatus(TimeSeries ts) : Cell(ts) +generatedTSstatus::generatedTSstatus(TimeSeriesType ts) : Cell(ts) { } @@ -171,7 +171,7 @@ IRenderer::CellStyle generatedTSstatus::cellStyle() const // =================== // Number TS Cell // =================== -NumberTsCell::NumberTsCell(TimeSeries ts) : Cell(ts) +NumberTsCell::NumberTsCell(TimeSeriesType ts) : Cell(ts) { OnStudyLoaded.connect(this, &NumberTsCell::onStudyLoaded); } @@ -237,7 +237,7 @@ IRenderer::CellStyle NumberTsCell::cellStyle() const // =================== // Refresh TS cell // =================== -RefreshTsCell::RefreshTsCell(TimeSeries ts) : Cell(ts) +RefreshTsCell::RefreshTsCell(TimeSeriesType ts) : Cell(ts) { OnStudyLoaded.connect(this, &RefreshTsCell::onStudyLoaded); } @@ -274,7 +274,7 @@ IRenderer::CellStyle RefreshTsCell::cellStyle() const // =================== // Refresh Span cell // =================== -RefreshSpanCell::RefreshSpanCell(TimeSeries ts) : Cell(ts) +RefreshSpanCell::RefreshSpanCell(TimeSeriesType ts) : Cell(ts) { OnStudyLoaded.connect(this, &RefreshSpanCell::onStudyLoaded); } @@ -330,7 +330,7 @@ IRenderer::CellStyle RefreshSpanCell::cellStyle() const // ============================ // Seasonal correlation cell // ============================ -SeasonalCorrelationCell::SeasonalCorrelationCell(TimeSeries ts) : Cell(ts) +SeasonalCorrelationCell::SeasonalCorrelationCell(TimeSeriesType ts) : Cell(ts) { OnStudyLoaded.connect(this, &SeasonalCorrelationCell::onStudyLoaded); } @@ -400,7 +400,7 @@ IRenderer::CellStyle SeasonalCorrelationCell::cellStyle() const // ===================== // Store to input cell // ===================== -storeToInputCell::storeToInputCell(TimeSeries ts) : Cell(ts) +storeToInputCell::storeToInputCell(TimeSeriesType ts) : Cell(ts) { } @@ -442,7 +442,7 @@ IRenderer::CellStyle storeToInputCell::cellStyle() const // ====================== // Store to output cell // ====================== -storeToOutputCell::storeToOutputCell(TimeSeries ts) : Cell(ts) +storeToOutputCell::storeToOutputCell(TimeSeriesType ts) : Cell(ts) { } @@ -484,7 +484,7 @@ IRenderer::CellStyle storeToOutputCell::cellStyle() const // ====================== // Intra modal cell // ====================== -intraModalCell::intraModalCell(TimeSeries ts) : Cell(ts) +intraModalCell::intraModalCell(TimeSeriesType ts) : Cell(ts) { } @@ -520,7 +520,7 @@ IRenderer::CellStyle intraModalCell::cellStyle() const // ====================== // Inter modal cell // ====================== -interModalCell::interModalCell(TimeSeries ts) : Cell(ts) +interModalCell::interModalCell(TimeSeriesType ts) : Cell(ts) { } diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/cell.h b/src/ui/simulator/toolbox/components/datagrid/renderer/cell.h index c48769300f..1477ec4b91 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/cell.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/cell.h @@ -20,7 +20,7 @@ using namespace Antares::Data; class Cell : public Yuni::IEventObserver { public: - Cell(TimeSeries ts); + Cell(TimeSeriesType ts); ~Cell(); virtual wxString cellValue() const = 0; virtual double cellNumericValue() const = 0; @@ -33,7 +33,7 @@ class Cell : public Yuni::IEventObserver protected: Data::Study::Ptr study_; - TimeSeries tsKind_; + TimeSeriesType tsKind_; }; class blankCell : public Cell @@ -64,7 +64,7 @@ class inactiveCell : public Cell class readyMadeTSstatus : public Cell { public: - readyMadeTSstatus(TimeSeries ts); + readyMadeTSstatus(TimeSeriesType ts); ~readyMadeTSstatus() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -75,7 +75,7 @@ class readyMadeTSstatus : public Cell class generatedTSstatus : public Cell { public: - generatedTSstatus(TimeSeries ts); + generatedTSstatus(TimeSeriesType ts); ~generatedTSstatus() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -86,7 +86,7 @@ class generatedTSstatus : public Cell class NumberTsCell : public Cell { public: - NumberTsCell(TimeSeries ts); + NumberTsCell(TimeSeriesType ts); ~NumberTsCell() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -97,7 +97,7 @@ class NumberTsCell : public Cell void onStudyLoaded(); private: - std::map tsToNumberTs_; + std::map tsToNumberTs_; }; class NumberTsCellThermal : public NumberTsCell @@ -110,7 +110,7 @@ class NumberTsCellThermal : public NumberTsCell class RefreshTsCell : public Cell { public: - RefreshTsCell(TimeSeries ts); + RefreshTsCell(TimeSeriesType ts); ~RefreshTsCell() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -128,7 +128,7 @@ class RefreshTsCellThermal : public RefreshTsCell class RefreshSpanCell : public Cell { public: - RefreshSpanCell(TimeSeries ts); + RefreshSpanCell(TimeSeriesType ts); ~RefreshSpanCell() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -139,7 +139,7 @@ class RefreshSpanCell : public Cell void onStudyLoaded(); private: - std::map tsToRefreshSpan_; + std::map tsToRefreshSpan_; }; class RefreshSpanCellThermal : public RefreshSpanCell @@ -152,7 +152,7 @@ class RefreshSpanCellThermal : public RefreshSpanCell class SeasonalCorrelationCell : public Cell { public: - SeasonalCorrelationCell(TimeSeries ts); + SeasonalCorrelationCell(TimeSeriesType ts); ~SeasonalCorrelationCell() = default; virtual wxString cellValue() const override; double cellNumericValue() const override; @@ -163,7 +163,7 @@ class SeasonalCorrelationCell : public Cell void onStudyLoaded(); private: - std::map tsToCorrelation_; + std::map tsToCorrelation_; }; class SeasonalCorrelationCellThermal : public SeasonalCorrelationCell @@ -177,7 +177,7 @@ class SeasonalCorrelationCellThermal : public SeasonalCorrelationCell class storeToInputCell : public Cell { public: - storeToInputCell(TimeSeries ts); + storeToInputCell(TimeSeriesType ts); ~storeToInputCell() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -188,7 +188,7 @@ class storeToInputCell : public Cell class storeToOutputCell : public Cell { public: - storeToOutputCell(TimeSeries ts); + storeToOutputCell(TimeSeriesType ts); ~storeToOutputCell() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -199,7 +199,7 @@ class storeToOutputCell : public Cell class intraModalCell : public Cell { public: - intraModalCell(TimeSeries ts); + intraModalCell(TimeSeriesType ts); ~intraModalCell() = default; wxString cellValue() const override; double cellNumericValue() const override; @@ -210,7 +210,7 @@ class intraModalCell : public Cell class interModalCell : public Cell { public: - interModalCell(TimeSeries ts); + interModalCell(TimeSeriesType ts); ~interModalCell() = default; wxString cellValue() const override; double cellNumericValue() const override; diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/column.cpp b/src/ui/simulator/toolbox/components/datagrid/renderer/column.cpp index 064551856f..be086a1e6d 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/column.cpp +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/column.cpp @@ -58,7 +58,7 @@ namespace Renderer // ------------------- // Base column class // ------------------- -Column::Column(Antares::Data::TimeSeries ts, const wxString& caption) : +Column::Column(Antares::Data::TimeSeriesType ts, const wxString& caption) : tsKind_(ts), caption_(caption) { } @@ -86,7 +86,7 @@ Column::~Column() // -------------------- - // Classic column // --------------------- -classicColumn::classicColumn(TimeSeries ts, const wxString& caption) : Column(ts, caption) +classicColumn::classicColumn(TimeSeriesType ts, const wxString& caption) : Column(ts, caption) { cells_ = {new_check_allocation(), new_check_allocation(tsKind_), diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/column.h b/src/ui/simulator/toolbox/components/datagrid/renderer/column.h index e18a2d7893..66118f94a3 100644 --- a/src/ui/simulator/toolbox/components/datagrid/renderer/column.h +++ b/src/ui/simulator/toolbox/components/datagrid/renderer/column.h @@ -47,7 +47,7 @@ class Cell; class Column { public: - Column(Antares::Data::TimeSeries ts, const wxString& caption); + Column(Antares::Data::TimeSeriesType ts, const wxString& caption); virtual ~Column(); Cell* getLine(int y) const; int getNumberOfLines() const; @@ -55,7 +55,7 @@ class Column protected: std::vector cells_; - Antares::Data::TimeSeries tsKind_; + Antares::Data::TimeSeriesType tsKind_; wxString caption_; }; @@ -65,7 +65,7 @@ class Column class classicColumn final : public Column { public: - classicColumn(Antares::Data::TimeSeries ts, const wxString& caption); + classicColumn(Antares::Data::TimeSeriesType ts, const wxString& caption); ~classicColumn() override = default; }; diff --git a/src/ui/simulator/windows/analyzer/analyzer.h b/src/ui/simulator/windows/analyzer/analyzer.h index a4baa0e81f..f85252a8c0 100644 --- a/src/ui/simulator/windows/analyzer/analyzer.h +++ b/src/ui/simulator/windows/analyzer/analyzer.h @@ -188,7 +188,7 @@ class AnalyzerWizard final : public wxDialog private: Yuni::Event onUpdateMaxTimeseries; - Yuni::Event onUpdateTimeseriesType; + Yuni::Event onUpdateTimeseriesType; //! \name Filesearch //@{ @@ -228,7 +228,7 @@ class AnalyzerWizard final : public wxDialog Component::Spotlight* pFileSearch; - Data::TimeSeries pTSSelected; + Data::TimeSeriesType pTSSelected; Component::Button* pTSSelector; bool pUpdating; diff --git a/src/ui/simulator/windows/options/advanced/advanced.cpp b/src/ui/simulator/windows/options/advanced/advanced.cpp index 1ab88a48d6..3b925d47ef 100644 --- a/src/ui/simulator/windows/options/advanced/advanced.cpp +++ b/src/ui/simulator/windows/options/advanced/advanced.cpp @@ -462,7 +462,7 @@ void AdvancedParameters::onEditSeedTSDraws(wxCommandEvent& evt) void AdvancedParameters::onNumericQuality(Component::Button&, wxMenu& menu, void*, - Data::TimeSeries ts) + Data::TimeSeriesType ts) { pCurrentTS = ts; wxMenuItem* it; diff --git a/src/ui/simulator/windows/options/advanced/advanced.h b/src/ui/simulator/windows/options/advanced/advanced.h index 7d25a55b89..15e274fae5 100644 --- a/src/ui/simulator/windows/options/advanced/advanced.h +++ b/src/ui/simulator/windows/options/advanced/advanced.h @@ -72,7 +72,7 @@ class AdvancedParameters final : public wxDialog void onEditSeedTSDraws(wxCommandEvent&); - void onNumericQuality(Component::Button&, wxMenu&, void*, Data::TimeSeries ts); + void onNumericQuality(Component::Button&, wxMenu&, void*, Data::TimeSeriesType ts); void onSelectNumericQualityStandard(wxCommandEvent& evt); void onSelectNumericQualityHigh(wxCommandEvent& evt); @@ -127,7 +127,7 @@ class AdvancedParameters final : public wxDialog Component::Button* pBtnNumberOfCores; wxTextCtrl* pEditSeeds[Data::seedMax]; // Only used for menus - Data::TimeSeries pCurrentTS; + Data::TimeSeriesType pCurrentTS; }; // class AdvancedParameters diff --git a/src/ui/simulator/windows/xcast/xcast.h b/src/ui/simulator/windows/xcast/xcast.h index 9afa178004..bd21e6485e 100644 --- a/src/ui/simulator/windows/xcast/xcast.h +++ b/src/ui/simulator/windows/xcast/xcast.h @@ -41,7 +41,7 @@ namespace Antares { namespace Window { -template +template class XCast final : public wxPanel, public Yuni::IEventObserver> { public: diff --git a/src/ui/simulator/windows/xcast/xcast.hxx b/src/ui/simulator/windows/xcast/xcast.hxx index cfcbaa763f..c2535aaa32 100644 --- a/src/ui/simulator/windows/xcast/xcast.hxx +++ b/src/ui/simulator/windows/xcast/xcast.hxx @@ -42,7 +42,7 @@ namespace Antares { namespace Window { -template +template XCast::XCast(wxWindow* parent, Toolbox::InputSelector::Area* notifier) : wxPanel(parent, wxID_ANY), pNotifier(notifier), pArea(nullptr) { @@ -189,13 +189,13 @@ XCast::XCast(wxWindow* parent, Toolbox::InputSelector::Area* notifier) : pPageGeneral->select(); } -template +template inline XCast::~XCast() { ObserverAncestorType::destroyBoundEvents(); } -template +template void XCast::onUpdateDistribution(wxCommandEvent& evt) { wxChoice* obj = (wxChoice*)evt.GetEventObject(); @@ -220,7 +220,7 @@ void XCast::onUpdateDistribution(wxCommandEvent& evt) } } -template +template void XCast::onUpdateConversion(wxCommandEvent& evt) { if (!pArea) @@ -238,7 +238,7 @@ void XCast::onUpdateConversion(wxCommandEvent& evt) } } -template +template void XCast::onUpdateTSTranslationUse(wxCommandEvent& evt) { wxChoice* obj = (wxChoice*)evt.GetEventObject(); @@ -260,21 +260,21 @@ void XCast::onUpdateTSTranslationUse(wxCommandEvent& evt) } } -template +template inline void XCast::selectDefaultPage() { if (pPageGeneral) pPageGeneral->select(); } -template +template void XCast::onStudyClosed() { pArea = nullptr; selectDefaultPage(); } -template +template void XCast::onAreaChanged(Data::Area* area) { using namespace Yuni; @@ -308,7 +308,7 @@ void XCast::onAreaChanged(Data::Area* area) useTranslation->SetSelection(0); } -template +template void XCast::onInstalledCapacityChanged(wxCommandEvent& evt) { if (!pArea)