GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r241:1a61ee1f7b08

Implementation of the new Dela T computation strategy

perrinel -

r241:1a61ee1f7b08

parent child

Context file:

r241:1a61ee1f7b08

app/src/Main.cpp +5 -3

             #if __GNUC__
             #if __x86_64__ || __ppc64__
-                pluginDir.cd("../lib64/SciQlop");
+                if (!pluginDir.cd("../lib64/SciQlop")) {
+                    pluginDir.cd("../lib64/sciqlop");
+                }
             #else
-                pluginDir.cd("../lib/SciQlop");
+                __x86_64__ || __ppc64__ if (!pluginDir.cd("../lib/SciQlop")) { pluginDir.cd("../lib/sciqlop"); }
-            #endif
+                #endif
             #endif
                 qCDebug(LOG_PluginManager())
                     << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());

core/include/Variable/Variable.h +1 0

                 QString mission() const noexcept;
                 QString unit() const noexcept;
                 SqpDateTime dateTime() const noexcept;
+                void setDateTime(const SqpDateTime &dateTime) noexcept;
                 /// @return the data of the variable, nullptr if there is no data
                 IDataSeries *dataSeries() const noexcept;

core/src/Variable/Variable.cpp +6 -13

@@ -50,6 +50,11 SqpDateTime Variable::dateTime() const noexcept
50	return impl->m_DateTime;	50	return impl->m_DateTime;
51	}	51	}
52		52
		53	void Variable::setDateTime(const SqpDateTime &dateTime) noexcept
		54	{
		55	impl->m_DateTime = dateTime;
		56	}
		57
53	void Variable::setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept	58	void Variable::setDataSeries(std::unique_ptr<IDataSeries> dataSeries) noexcept
54	{	59	{
55	if (!impl->m_DataSeries) {	60	if (!impl->m_DataSeries) {
@@ -73,19 +78,7 IDataSeries *Variable::dataSeries() const noexcept
73		78
74	bool Variable::contains(const SqpDateTime &dateTime)	79	bool Variable::contains(const SqpDateTime &dateTime)
75	{	80	{
76	if (!impl->m_DateTime.contains(dateTime)) {	81	return impl->m_DateTime.contains(dateTime);
77	// The current variable dateTime isn't enough to display the dateTime requested.
78	// We have to update it to the new dateTime requested.
79	// the correspondant new data to display will be given by the cache if possible and the
80	// provider if necessary.
81	qCInfo(LOG_Variable()) << "NEW DATE NEEDED";
82
83	// impl->m_DateTime = dateTime;
84
85	return false;
86	}
87
88	return true;
89	}	82	}
90		83
91	bool Variable::intersect(const SqpDateTime &dateTime)	84	bool Variable::intersect(const SqpDateTime &dateTime)

gui/src/Visualization/VisualizationGraphWidget.cpp +20 -13

                     if (!variable->contains(dateTime)) {
+                        auto variableDateTimeWithTolerance = dateTime;
                         if (variable->intersect(dateTime)) {
                             auto variableDateTime = variable->dateTime();
                             if (variableDateTime.m_TStart < dateTime.m_TStart) {
                                 dateTime.m_TStart = variableDateTime.m_TStart;
-                                // add 20% tolerance for left (start) side
+                                // START is set to the old one. tolerance have to be added to the right
-                                auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                // add 10% tolerance for right (end) side
-                                dateTime.m_TStart -= tolerance;
+                                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                variableDateTimeWithTolerance.m_TEnd += tolerance;
                             }
                             if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
                                 dateTime.m_TEnd = variableDateTime.m_TEnd;
-                                // add 20% tolerance for right (end) side
+                                // END is set to the old one. tolerance have to be added to the left
-                                auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                // add 10% tolerance for left (start) side
-                                dateTime.m_TEnd += tolerance;
+                                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                variableDateTimeWithTolerance.m_TStart -= tolerance;
                             }
                         }
                         else {
                             // add 10% tolerance for each side
                             auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
-                            dateTime.m_TStart -= tolerance;
+                            variableDateTimeWithTolerance.m_TStart -= tolerance;
-                            dateTime.m_TEnd += tolerance;
+                            variableDateTimeWithTolerance.m_TEnd += tolerance;
                         }
-                        // CHangement detected, we need to
+                        variable->setDateTime(dateTime);
-                        sqpApp->variableController().requestDataLoading(variable, dateTime);
+                        // CHangement detected, we need to ask controller to request data loading
+                        sqpApp->variableController().requestDataLoading(variable,
+                                                                        variableDateTimeWithTolerance);
                     }
                 }
             }
             {
                 auto zoomOrientations = QFlags<Qt::Orientation>{};
-                // Lambda that enables a zoom orientation if the key modifier related to this orientation has
+                // Lambda that enables a zoom orientation if the key modifier related to this orientation
+                // has
                 // been pressed
                 auto enableOrientation
                     = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
             void VisualizationGraphWidget::onDataCacheVariableUpdated()
             {
                 // NOTE:
-                //    We don't want to call the method for each component of a variable unitarily, but for all
+                //    We don't want to call the method for each component of a variable unitarily, but for
+                //    all
                 //    its components at once (eg its three components in the case of a vector).
                 //    The unordered_multimap does not do this easily, so the question is whether to:

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages