Blame view

src/ParamOutputImpl/Plot/Time/TimePlot.cc 77.9 KB
fbe3c2bb   Benjamin Renard   First commit
1
2
3
4
5
6
7
8
/*
 * TimePlot.cc
 *
 *  Created on: 22 nov. 2013
 *      Author: CS
 */

#include "TimePlot.hh"
fbe3c2bb   Benjamin Renard   First commit
9
#include "AxesNode.hh"
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
10
11
#include "AxisLegendManager.hh"
#include "DefaultTimeAxisDecorator.hh"
fbe3c2bb   Benjamin Renard   First commit
12
#include "ParamInfo.hh"
fbe3c2bb   Benjamin Renard   First commit
13
#include "ParamMgr.hh"
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
14
15
16
17
18
19
20
#include "ParamTable.hh"
#include "Parameter.hh"
#include "ParamsNode.hh"
#include "PlPlotUtil.hh"
#include "PlotLogger.hh"
#include "PlotOutput.hh"
#include "Range.hh"
fbe3c2bb   Benjamin Renard   First commit
21
#include "ShadesTools.hh"
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
22
23
24
#include "TickMarkDecorator.hh"
#include "TimeUtil.hh"
#include <cstddef>
fbe3c2bb   Benjamin Renard   First commit
25
#include <fstream>
2acc7d49   Hacene SI HADJ MOHAND   progress
26
#include <limits>
fbe3c2bb   Benjamin Renard   First commit
27

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
28
29
30
#include <sstream>
#include <string>
#include <vector>
fbe3c2bb   Benjamin Renard   First commit
31
32

#include <boost/format.hpp>
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
33
#include <iostream>
fbe3c2bb   Benjamin Renard   First commit
34
35
36
37

using namespace AMDA::Parameters;
using namespace AMDA::Info;

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
38
39
namespace plot
{
fbe3c2bb   Benjamin Renard   First commit
40

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
41
	QSASConfig *TimePlot::qsasconfig = NULL;
fbe3c2bb   Benjamin Renard   First commit
42

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
43
44
45
46
	TimePlot::TimePlot(AMDA::Parameters::ParameterManager &manager,
					   boost::shared_ptr<Panel> panel, TimeAxisDecorator *timeAxisDecorator, bool isStandalone) : PanelPlotOutput(manager, panel, isStandalone), _startDateDrawn(false)
	{
		setTimeAxisDecorator(std::shared_ptr<TimeAxisDecorator>(timeAxisDecorator));
fbe3c2bb   Benjamin Renard   First commit
47
	}
fbe3c2bb   Benjamin Renard   First commit
48

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
49
50
51
52
53
54
55
	TimePlot::~TimePlot()
	{
		if (qsasconfig != NULL)
		{
			free(qsasconfig);
			qsasconfig = nullptr;
		}
fbe3c2bb   Benjamin Renard   First commit
56
57
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
58
59
60
61
62
63
64
65
66
67
68
69
70
	TimeAxis *TimePlot::getTimeAxis()
	{
		std::string lAxisId = getXAxisId();
		boost::shared_ptr<Axis> xAxis = _panel->getAxis(lAxisId);
		if (xAxis.get() == nullptr)
		{
			std::stringstream lError;
			lError << "TimePlot::apply"
				   << ": time axis with id '" << lAxisId << "' not found.";
			BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
		}
		return dynamic_cast<TimeAxis *>(xAxis.get());
	}
fbe3c2bb   Benjamin Renard   First commit
71

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
72
73
74
75
76
77
78
79
80
81
	void TimePlot::preparePlotArea(double startTime, double stopTime, int intervalIndex)
	{
		// dump properties for test
		const char *lBuildType = getenv("BUILD_TYPE");
		if (lBuildType && std::string(lBuildType) == "Debug")
		{
			std::ofstream out("timePlot.txt");
			dump(out);
			out.close();
		}
fbe3c2bb   Benjamin Renard   First commit
82

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
83
84
85
		// Configure Series to draw on axis by checking which color to use and
		// number of series to draw on a same axis.
		configureSeriesAxis();
fbe3c2bb   Benjamin Renard   First commit
86

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
87
		configureAxisLegend();
fbe3c2bb   Benjamin Renard   First commit
88

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
89
		configureSpectroAxis();
62024e03   Erdogan Furkan   Some modifications
90
91
92
93

		configureSauvaudAxis();

		configureIntervalsLegend();
fbe3c2bb   Benjamin Renard   First commit
94

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
95
		configureParamsLegend(startTime, stopTime, intervalIndex);
fbe3c2bb   Benjamin Renard   First commit
96

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
97
98
99
100
		// configure X axis
		getTimeAxisDecorator()->configure(this, getTimeAxis(), startTime, stopTime, _pParameterValues);
		getTimeAxis()->_used = true;
		_pls->timefmt(getTimeAxisDecorator()->getPlFormat().c_str());
fbe3c2bb   Benjamin Renard   First commit
101

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
102
103
		PanelPlotOutput::preparePlotArea(startTime, stopTime, intervalIndex);
	}
fbe3c2bb   Benjamin Renard   First commit
104

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
105
106
107
	bool TimePlot::draw(double startTime, double stopTime, int intervalIndex,
						bool isFirstInterval, bool isLastInterval)
	{
fbe3c2bb   Benjamin Renard   First commit
108

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
109
		bool dataPloted = PanelPlotOutput::draw(startTime, stopTime, intervalIndex, isFirstInterval, isLastInterval);
fbe3c2bb   Benjamin Renard   First commit
110

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
111
112
113
114
115
116
		// Draw start date
		if (!_startDateDrawn /*&& getTimeAxis()->_used*/)
			drawStartDate(getTimeAxis(), startTime, stopTime);
		_startDateDrawn = true;
		return dataPloted;
	}
fbe3c2bb   Benjamin Renard   First commit
117

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
118
119
120
121
122
123
	void TimePlot::calculatePlotArea(const Bounds &panelBounds_, Bounds &bounds_)
	{
		PanelPlotOutput::calculatePlotArea(panelBounds_, bounds_);
		// decorator is responsible of reserving extra space for what it manage (labels for instance).
		getTimeAxisDecorator()->updatePlotArea(this, getTimeAxis(), panelBounds_, bounds_);
	}
fbe3c2bb   Benjamin Renard   First commit
124

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
125
126
127
128
129
130
	void TimePlot::configureSeriesAxis()
	{
		// map<YAxisId, userRangeDefined>
		std::map<std::string, Range> lAxisRange;
		Range lColorAxeRange;
		SeriesProperties lSeriesProperties;
fbe3c2bb   Benjamin Renard   First commit
131

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
132
		boost::shared_ptr<ColorAxis> lZAxis = _panel->getColorAxis();
fbe3c2bb   Benjamin Renard   First commit
133

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
		// Parse each parameter to define on which axis to draw series.
		for (auto param : _parameterAxesList)
		{
			// Get number of series to draw
			// For each index of parameter identify to which axis series must be drawn.
			for (auto lSeriesProperties : param.getYSeriePropertiesList())
			{
				if (!lSeriesProperties.hasYAxis())
				{
					continue;
				}
				boost::shared_ptr<Axis> lYAxis = _panel->getAxis(lSeriesProperties.getYAxisId());
				if (lYAxis.get() == nullptr)
				{
					std::stringstream lError;
					lError << "TimePlot::configureSeriesAxis"
						   << ": Y axis with id '" << lSeriesProperties.getYAxisId() << "' not found.";
					BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
				}
fbe3c2bb   Benjamin Renard   First commit
153

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
154
155
156
157
158
159
160
161
162
163
				lYAxis->_used = true;
				Range lYAxisRequestRange = lYAxis->Axis::getRequestedRange();
				Range lRange = lYAxis->Axis::getRange();
				// If range status for this axis is set by the user do not update range "automatically".
				if (isnan(lYAxisRequestRange.getMin()) && isnan(lYAxisRequestRange.getMax()))
				{
					Range lEstimatedRange(lAxisRange[lYAxis->_id]);
					for (auto index : lSeriesProperties.getIndexList(_pParameterValues))
					{
						Range lParamIndexRange(
2fc1f2f8   Benjamin Renard   Full rework for s...
164
165
166
							(*_pParameterValues)[lSeriesProperties.getParamId()].getMin(index),
							(*_pParameterValues)[lSeriesProperties.getParamId()].getMax(index));

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
167
						ErrorBarProperties &errBarProp = lSeriesProperties.getErrorBarProperties();
2fc1f2f8   Benjamin Renard   Full rework for s...
168

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
169
170
171
172
						// Update lParamIndexRange depending on the use of ErrorBars on the plot
						if (errBarProp.getErrorMinMax() != nullptr)
						{
							Range lParamMinRange(
2fc1f2f8   Benjamin Renard   Full rework for s...
173
174
								(*_pParameterValues)[errBarProp.getErrorMinMax()->getUsedParamMin()].getMin(-1),
								(*_pParameterValues)[errBarProp.getErrorMinMax()->getUsedParamMin()].getMax(-1));
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
175
							Range lParamMaxRange(
2fc1f2f8   Benjamin Renard   Full rework for s...
176
177
178
								(*_pParameterValues)[errBarProp.getErrorMinMax()->getUsedParamMax()].getMin(-1),
								(*_pParameterValues)[errBarProp.getErrorMinMax()->getUsedParamMax()].getMax(-1));

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
179
180
181
182
							if (lParamMinRange.getMin() < lParamIndexRange.getMin())
								lParamIndexRange.setMin(lParamMinRange.getMin());
							if (lParamMinRange.getMax() > lParamIndexRange.getMax())
								lParamIndexRange.setMax(lParamMinRange.getMax());
2fc1f2f8   Benjamin Renard   Full rework for s...
183

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
184
185
186
187
188
							if (lParamMaxRange.getMin() < lParamIndexRange.getMin())
								lParamIndexRange.setMin(lParamMaxRange.getMin());
							if (lParamMaxRange.getMax() > lParamIndexRange.getMax())
								lParamIndexRange.setMax(lParamMaxRange.getMax());
						}
fbe3c2bb   Benjamin Renard   First commit
189

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
190
191
192
193
194
195
196
197
198
199
200
201
						if (isnan(lEstimatedRange.getMin()) && isnan(lEstimatedRange.getMax()))
						{
							lEstimatedRange.setMin(lParamIndexRange.getMin());
							lEstimatedRange.setMax(lParamIndexRange.getMax());
						}
						else
						{
							lEstimatedRange.setMin(std::min(lEstimatedRange.getMin(), lParamIndexRange.getMin()));
							lEstimatedRange.setMax(std::max(lEstimatedRange.getMax(), lParamIndexRange.getMax()));
						}
						if (lParamIndexRange.getMin() == lParamIndexRange.getMax())
							lEstimatedRange.setMargin(0.05);
2fc1f2f8   Benjamin Renard   Full rework for s...
202
					}
e062d6ef   Benjamin Renard   Fix axes range wh...
203

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
204
					lEstimatedRange._extend = lRange._extend;
641ba7e4   Hacene SI HADJ MOHAND   ok for time plot
205

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
206
207
					lAxisRange[lYAxis->_id] = lEstimatedRange;
				}
fbe3c2bb   Benjamin Renard   First commit
208

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
209
210
				// Set ZAxis range if a color param is defined for this serie
				if (lZAxis != nullptr)
fbe3c2bb   Benjamin Renard   First commit
211
				{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
					if (!lSeriesProperties.getColorParamId().empty())
					{
						lZAxis->_used = true;
						Range lRange(lZAxis->getRange());
						ParameterAxes *colorSerieParameterAxes = getParameterAxesByColorSerieId(lSeriesProperties.getColorSerieId());
						if (colorSerieParameterAxes == NULL)
							continue;
						ColorSeriesProperties &colorSerieProp = colorSerieParameterAxes->getColorSeriePropertiesById(lSeriesProperties.getColorSerieId());
						// If range status for this axis is set by the user do not update range "automatically".
						if (isnan(lRange.getMin()) && isnan(lRange.getMax()))
						{
							Range lEstimatedRange(lColorAxeRange);
							Range lParamIndexRange(
								(*_pParameterValues)[lSeriesProperties.getColorParamId()].getMin(
									colorSerieProp.getIndex()),
								(*_pParameterValues)[lSeriesProperties.getColorParamId()].getMax(
									colorSerieProp.getIndex()));

							if (isnan(lEstimatedRange.getMin()) && isnan(lEstimatedRange.getMax()))
							{
								lEstimatedRange.setMin(lParamIndexRange.getMin());
								lEstimatedRange.setMax(lParamIndexRange.getMax());
							}
							else
							{
								lEstimatedRange.setMin(std::min(lEstimatedRange.getMin(), lParamIndexRange.getMin()));
								lEstimatedRange.setMax(std::max(lEstimatedRange.getMax(), lParamIndexRange.getMax()));
							}
							if (lParamIndexRange.getMin() == lParamIndexRange.getMax())
								lEstimatedRange.setMargin(0.05);
							lEstimatedRange._extend = lRange._extend;
							lColorAxeRange = lEstimatedRange;
fbe3c2bb   Benjamin Renard   First commit
244
						}
fbe3c2bb   Benjamin Renard   First commit
245
246
247
248
					}
				}
			}
		}
fbe3c2bb   Benjamin Renard   First commit
249

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
250
251
252
253
254
255
256
257
		// Update range of axis. Done after because, axis range may be processed in several pass (one for each series)
		for (auto lAxis : lAxisRange)
		{
			boost::shared_ptr<Axis> lYAxis = _panel->getAxis(lAxis.first);
			Range lRange(lAxis.second);
			fixRange(lRange, lYAxis->_scale == Axis::Scale::LOGARITHMIC);
			lYAxis->setRange(lRange);
		}
fbe3c2bb   Benjamin Renard   First commit
258

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
259
260
261
262
263
		if (lZAxis != nullptr && lColorAxeRange.isSet())
		{
			fixRange(lColorAxeRange, lZAxis->_scale == Axis::Scale::LOGARITHMIC);
			lZAxis->setRange(lColorAxeRange);
		}
5c050d50   Benjamin Renard   Fix another bugs ...
264
	}
fbe3c2bb   Benjamin Renard   First commit
265

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
266
267
268
269
270
	void TimePlot::configureAxisLegend()
	{
		// Y axis
		AxisLegendManager::configureYAxisLegendForSpectro(this);
		AxisLegendManager::configureYAxisLegendForSeries(this);
fbe3c2bb   Benjamin Renard   First commit
271

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
272
273
274
275
		// Z axis
		AxisLegendManager::configureColorAxisLegendForSpectro(this);
		AxisLegendManager::configureColorAxisLegendForSeries(this);
	}
fbe3c2bb   Benjamin Renard   First commit
276

62024e03   Erdogan Furkan   Some modifications
277
278
	void TimePlot::configureIntervalsLegend()
	{
0fa2d990   Erdogan Furkan   7616 - Adding lab...
279
		ParamMgr *piMgr = ParamMgr::getInstance();
62024e03   Erdogan Furkan   Some modifications
280
281
		for (auto param : _parameterAxesList)
		{
0fa2d990   Erdogan Furkan   7616 - Adding lab...
282
283
284
			std::shared_ptr<IntervalsProperties> intervalsPropertiesPtr = param.getIntervalsProperties();
			ParameterSPtr p = _parameterManager.getParameter(param._originalParamId);
			AMDA::Info::ParamInfoSPtr paramInfo = piMgr->getParamInfoFromId(p->getInfoId());
62024e03   Erdogan Furkan   Some modifications
285

0fa2d990   Erdogan Furkan   7616 - Adding lab...
286
287
			if (intervalsPropertiesPtr != nullptr)
			{
ac0e4b16   Erdogan Furkan   Some modifications
288
				boost::shared_ptr<TextLegendProperties> pTextLegendProperties = intervalsPropertiesPtr->getLegend();
0fa2d990   Erdogan Furkan   7616 - Adding lab...
289

d9ec904f   Benjamin Renard   Fix
290
291
292
293
294
				if (pTextLegendProperties != nullptr) {
					if (pTextLegendProperties->getText() == "")
					{
						pTextLegendProperties->setText(paramInfo->getShortName());
					}
0fa2d990   Erdogan Furkan   7616 - Adding lab...
295

d9ec904f   Benjamin Renard   Fix
296
297
					pTextLegendProperties->setColor(intervalsPropertiesPtr->getColor());
				}
62024e03   Erdogan Furkan   Some modifications
298
299
300
301
			}
		}
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
302
303
	void TimePlot::configureSpectroAxis()
	{
fbe3c2bb   Benjamin Renard   First commit
304
		// Parse each parameter to define on which axis to draw spectro
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
305
306
307
308
309
		for (auto param : _parameterAxesList)
		{
			std::shared_ptr<SpectroProperties> spectroPropertiesPtr = param.getSpectroProperties();
			if (spectroPropertiesPtr == nullptr)
				continue; //no spectro defined
08ec1dde   Benjamin Renard   Add propertie _us...
310

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
311
312
			if (!spectroPropertiesPtr->hasYAxis())
				continue;
fbe3c2bb   Benjamin Renard   First commit
313

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
314
315
316
317
318
319
320
321
322
			LOG4CXX_DEBUG(gLogger, "Spectro Y axis is " << spectroPropertiesPtr->getYAxisId());
			boost::shared_ptr<Axis> lYAxis = _panel->getAxis(spectroPropertiesPtr->getYAxisId());
			if (lYAxis.get() == nullptr)
			{
				std::stringstream lError;
				lError << "TimePlot::configureSpectroAxis"
					   << ": Y axis with id '" << spectroPropertiesPtr->getYAxisId() << "' not found.";
				BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
			}
966af096   Benjamin Renard   Fix 'sum in range...
323

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
324
			lYAxis->_used = true;
fbe3c2bb   Benjamin Renard   First commit
325

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
326
327
328
			//set Z axis range
			boost::shared_ptr<Axis> lZAxis = _panel->getAxis(spectroPropertiesPtr->getZAxisId());
			if (lZAxis.get() == nullptr)
fbe3c2bb   Benjamin Renard   First commit
329
			{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
330
331
332
333
				std::stringstream lError;
				lError << "TimePlot::configureSpectroAxis"
					   << ": Z axis with id '" << spectroPropertiesPtr->getZAxisId() << "' not found.";
				BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
fbe3c2bb   Benjamin Renard   First commit
334
			}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
335
336
337
338
339
340
341

			lZAxis->_used = true;

			ParameterSPtr p = _parameterManager.getParameter(param._originalParamId);
			int parameterDimension;
			if (spectroPropertiesPtr->getRelatedDim() == 0)
				parameterDimension = (*_pParameterValues)[spectroPropertiesPtr->getParamId()].getDim1Size();
fbe3c2bb   Benjamin Renard   First commit
342
			else
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
343
344
345
346
347
				parameterDimension = (*_pParameterValues)[spectroPropertiesPtr->getParamId()].getDim2Size();

			//set Y axis range
			Range lYAxisRequestRange = lYAxis->Axis::getRequestedRange();
			Range lYAxisRange = lYAxis->Axis::getRange();
0fa2d990   Erdogan Furkan   7616 - Adding lab...
348

7d595235   Erdogan Furkan   #9981 - Done
349
350
351
352
353
354
			if (lYAxis->_reverse){
				double lYAxisMin = lYAxisRange.getMin();
				lYAxisRange.setMin(lYAxisRange.getMax());
				lYAxisRange.setMax(lYAxisMin);

			}
7d595235   Erdogan Furkan   #9981 - Done
355

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
356
			AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId());
0fa2d990   Erdogan Furkan   7616 - Adding lab...
357

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
358
			if (isnan(lYAxisRequestRange.getMin()) && isnan(lYAxisRequestRange.getMax()))
fbe3c2bb   Benjamin Renard   First commit
359
			{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
360
361
362
				boost::shared_ptr<AMDA::Info::ParamTable> tableSPtr;
				if (paramInfo != nullptr)
					tableSPtr = paramInfo->getTable(spectroPropertiesPtr->getRelatedDim());
0fa2d990   Erdogan Furkan   7616 - Adding lab...
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384

				if (tableSPtr == nullptr)
				{
					// look for unique embedded table
					boost::shared_ptr<AMDA::Info::ParamTable> linkedTableSPtr;
					int counter = 0;
					for (auto pInfo : paramInfo->getLinkedParamList())
					{
						linkedTableSPtr = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(pInfo)->getTable(spectroPropertiesPtr->getRelatedDim());
						if (linkedTableSPtr == nullptr)
							continue;
						counter++;
					}
					if (linkedTableSPtr == nullptr || counter != 1)
					{
						LOG4CXX_DEBUG(gLogger, "table cannot be defined from linked info params");
					}
					else
					{
						tableSPtr = linkedTableSPtr;
					}
				}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
385
386

				if (tableSPtr == nullptr)
fbe3c2bb   Benjamin Renard   First commit
387
				{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
388
389
390
					LOG4CXX_DEBUG(gLogger, "No table defined => use index");
					lYAxisRange.setMin(std::min(0., lYAxisRange.getMin()));
					lYAxisRange.setMax(std::max((double)parameterDimension, lYAxisRange.getMax()));
f2db3c16   Benjamin Renard   Support variable ...
391
392
393
				}
				else
				{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
394
395
					AMDA::Info::t_TableBound crtBound;
					if (!tableSPtr->isVariable(&_parameterManager))
f2db3c16   Benjamin Renard   Support variable ...
396
					{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
397
						for (int i = 0; i < parameterDimension; ++i)
f2db3c16   Benjamin Renard   Support variable ...
398
						{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
399
							crtBound = tableSPtr->getBound(&_parameterManager, i);
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
400
401
402
							if (!std::isnan(crtBound.min))
							{
								if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.min <= 0)))
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
403
									lYAxisRange.setMin(std::min(crtBound.min, lYAxisRange.getMin()));
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
404
405
406
407
							}
							if (!std::isnan(crtBound.max))
							{
								if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.max <= 0)))
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
									lYAxisRange.setMax(std::max(crtBound.max, lYAxisRange.getMax()));
							}
						}
					}
					else
					{
						//Variable table => we need to loop under all records to find axis min & max values
						for (int i = 0; i < (*_pParameterValues)[spectroPropertiesPtr->getParamId()].getSize(); ++i)
						{
							std::map<std::string, std::vector<double>> paramsTableData;
							for (std::map<std::string, std::string>::iterator it = spectroPropertiesPtr->getTableParams().begin(); it != spectroPropertiesPtr->getTableParams().end(); ++it)
							{
								ParameterData &data = (*_pParameterValues)[it->second];
								std::vector<double> paramTableValues;
								for (int j = 0; j < data.getDim1Size(); ++j)
								{
									if (i < data.getSize())
									{
										double *values = data.getValues(AMDA::Common::ParameterIndexComponent(j), i);
										paramTableValues.push_back((*values));
									}
								}
								paramsTableData[it->first] = paramTableValues;
							}
							for (int j = 0; j < parameterDimension; ++j)
							{
								crtBound = tableSPtr->getBound(&_parameterManager, j, &paramsTableData);
								if (!std::isnan(crtBound.min))
								{
									if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.min <= 0)))
										lYAxisRange.setMin(std::min(crtBound.min, lYAxisRange.getMin()));
								}
								if (!std::isnan(crtBound.max))
								{
									if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.max <= 0)))
										lYAxisRange.setMax(std::max(crtBound.max, lYAxisRange.getMax()));
								}
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
445
							}
f2db3c16   Benjamin Renard   Support variable ...
446
447
						}
					}
fbe3c2bb   Benjamin Renard   First commit
448
				}
fbe3c2bb   Benjamin Renard   First commit
449
			}
fbe3c2bb   Benjamin Renard   First commit
450

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
451
452
			//do not extend the axis
			lYAxisRange._extend = false;
fbe3c2bb   Benjamin Renard   First commit
453

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
454
			fixRange(lYAxisRange, lYAxis->_scale == Axis::Scale::LOGARITHMIC);
fbe3c2bb   Benjamin Renard   First commit
455

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
456
			lYAxis->setRange(lYAxisRange);
fbe3c2bb   Benjamin Renard   First commit
457

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
458
			LOG4CXX_DEBUG(gLogger, "Y axis range : min = " << lYAxisRange.getMin() << ", max = " << lYAxisRange.getMax());
fbe3c2bb   Benjamin Renard   First commit
459

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
460
461
462
463
464
465
466
467
468
			Range lParamRange = lZAxis->Axis::getRange();
			if (isnan(lParamRange.getMin()) && isnan(lParamRange.getMax()))
			{
				std::string normalization = spectroPropertiesPtr->getNormalization();
				if (normalization == "log" || normalization == "linear")
				{
					lParamRange.setMin(0);
					lParamRange.setMax(1);
				}
fbe3c2bb   Benjamin Renard   First commit
469
				else
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
				{
					//auto range
					for (auto index : spectroPropertiesPtr->getIndexes())
					{
						//compute global range for all indexes
						double minVal, maxVal;
						if (lZAxis->_scale == Axis::Scale::LOGARITHMIC)
							minVal = (*_pParameterValues)[spectroPropertiesPtr->getParamId()].getMinStrictPos(index);
						else
							minVal = (*_pParameterValues)[spectroPropertiesPtr->getParamId()].getMin(index);
						maxVal = (*_pParameterValues)[spectroPropertiesPtr->getParamId()].getMax(index);
						if (!isnan(minVal))
							lParamRange.setMin(std::min(minVal, lParamRange.getMin()));
						//else
						//	lParamRange.setMin(0);
						if (!isnan(maxVal))
							lParamRange.setMax(std::max(maxVal, lParamRange.getMax()));
						//else
						//	lParamRange.setMax(10);
fbe3c2bb   Benjamin Renard   First commit
489
					}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
490
491
492
493
					if (isnan(lParamRange.getMin()))
						lParamRange.setMin(0);
					if (isnan(lParamRange.getMax()))
						lParamRange.setMax(10);
fbe3c2bb   Benjamin Renard   First commit
494
495
				}
			}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
496
497
			else
				lParamRange._extend = false;
fbe3c2bb   Benjamin Renard   First commit
498

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
499
500
501
502
			//set z axis range
			fixRange(lParamRange, lZAxis->_scale == Axis::Scale::LOGARITHMIC);
			LOG4CXX_DEBUG(gLogger, "ZAxis range : ZMin = " << lParamRange.getMin() << ", ZMax = " << lParamRange.getMax());
			lZAxis->setRange(lParamRange);
fbe3c2bb   Benjamin Renard   First commit
503
504
		}
	}
0fa2d990   Erdogan Furkan   7616 - Adding lab...
505
506

	void TimePlot::configureSauvaudAxis()
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
507
508
509
510
511
512
513
	{
		// Parse each parameter to define on which axis to draw Sauvaud
		for (auto param : _parameterAxesList)
		{
			std::shared_ptr<SauvaudProperties> sauvaudPropertiesPtr = param.getSauvaudProperties();
			if (sauvaudPropertiesPtr == nullptr)
				continue; //no sauvaud defined
fbe3c2bb   Benjamin Renard   First commit
514

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
515
516
			if (!sauvaudPropertiesPtr->hasYAxis())
				continue;
fbe3c2bb   Benjamin Renard   First commit
517

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
518
519
			LOG4CXX_DEBUG(gLogger, "Sauvaud Y axis is " << sauvaudPropertiesPtr->getYAxisId());
			boost::shared_ptr<Axis> lYAxis = _panel->getAxis(sauvaudPropertiesPtr->getYAxisId());
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
520
521
522
523
524
525
526
			if (lYAxis.get() == nullptr)
			{
				std::stringstream lError;
				lError << "TimePlot::configureSauvaudAxis"
					   << ": Y axis with id '" << sauvaudPropertiesPtr->getYAxisId() << "' not found.";
				BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
			}
fbe3c2bb   Benjamin Renard   First commit
527

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
528
			lYAxis->_used = true;
0fa2d990   Erdogan Furkan   7616 - Adding lab...
529

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
530
531
532
533
534
535
536
537
538
			//set Z axis range
			boost::shared_ptr<Axis> lZAxis = _panel->getAxis(sauvaudPropertiesPtr->getZAxisId());
			if (lZAxis.get() == nullptr)
			{
				std::stringstream lError;
				lError << "TimePlot::configureSauvaudAxis"
					   << ": Z axis with id '" << sauvaudPropertiesPtr->getZAxisId() << "' not found.";
				BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
			}
fbe3c2bb   Benjamin Renard   First commit
539

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
540
541
542
			lZAxis->_used = true;

			ParameterSPtr p = _parameterManager.getParameter(param._originalParamId);
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
543
			int rightParameterDimension;
0fa2d990   Erdogan Furkan   7616 - Adding lab...
544
			int rightDim = sauvaudPropertiesPtr->getRightDim();
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
545
546
			if (rightDim == 0){
				rightParameterDimension = (*_pParameterValues)[sauvaudPropertiesPtr->getParamId()].getDim1Size();
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
547
548
			}else{
				rightParameterDimension = (*_pParameterValues)[sauvaudPropertiesPtr->getParamId()].getDim2Size();
0fa2d990   Erdogan Furkan   7616 - Adding lab...
549
			}
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
550
			//set Y axis range
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
551

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
552
			AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId());
0fa2d990   Erdogan Furkan   7616 - Adding lab...
553
554
555

			// configure right axis
			Range lYAxisRequestRange = lYAxis->Axis::getRequestedRange();
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
556
			Range lYAxisRange = lYAxis->Axis::getRange();
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
557
558
			if (isnan(lYAxisRequestRange.getMin()) && isnan(lYAxisRequestRange.getMax()))
			{
5f13f59c   Hacene SI HADJ MOHAND   in progress worki...
559
				boost::shared_ptr<AMDA::Info::ParamTable> rightTableSPtr;
0fa2d990   Erdogan Furkan   7616 - Adding lab...
560
561
562
563
564
565

				if (paramInfo != nullptr)
				{

					rightTableSPtr = paramInfo->getTable(rightDim);
				}
5f13f59c   Hacene SI HADJ MOHAND   in progress worki...
566
				if (rightTableSPtr == nullptr)
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
567
568
569
				{
					LOG4CXX_DEBUG(gLogger, "No table defined => use index");
					lYAxisRange.setMin(std::min(0., lYAxisRange.getMin()));
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
570
					lYAxisRange.setMax(std::max((double)rightParameterDimension, lYAxisRange.getMax()));
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
571
				}
0fa2d990   Erdogan Furkan   7616 - Adding lab...
572
573
574
				else
				{
					AMDA::Info::t_TableBound crtBound;
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
					if (!rightTableSPtr->isVariable(&_parameterManager))
					{
						for (int i = 0; i < rightParameterDimension; ++i)
						{
							crtBound = rightTableSPtr->getBound(&_parameterManager, i);
							if (!std::isnan(crtBound.min))
							{
								if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.min <= 0)))
									lYAxisRange.setMin(std::min(crtBound.min, lYAxisRange.getMin()));
							}
							if (!std::isnan(crtBound.max))
							{
								if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.max <= 0)))
									lYAxisRange.setMax(std::max(crtBound.max, lYAxisRange.getMax()));
							}
						}
					}
					else
					{
0fa2d990   Erdogan Furkan   7616 - Adding lab...
594
						// Variable table => we need to loop under all records to find axis min & max values
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
						for (int i = 0; i < (*_pParameterValues)[sauvaudPropertiesPtr->getParamId()].getSize(); ++i)
						{
							std::map<std::string, std::vector<double>> paramsTableData;
							for (std::map<std::string, std::string>::iterator it = sauvaudPropertiesPtr->getTableParams().begin(); it != sauvaudPropertiesPtr->getTableParams().end(); ++it)
							{
								ParameterData &data = (*_pParameterValues)[it->second];
								std::vector<double> paramTableValues;
								for (int j = 0; j < data.getDim1Size(); ++j)
								{
									if (i < data.getSize())
									{
										double *values = data.getValues(AMDA::Common::ParameterIndexComponent(j), i);
										paramTableValues.push_back((*values));
									}
								}
								paramsTableData[it->first] = paramTableValues;
							}
							for (int j = 0; j < rightParameterDimension; ++j)
							{
								crtBound = rightTableSPtr->getBound(&_parameterManager, j, &paramsTableData);
								if (!std::isnan(crtBound.min))
								{
									if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.min <= 0)))
										lYAxisRange.setMin(std::min(crtBound.min, lYAxisRange.getMin()));
								}
								if (!std::isnan(crtBound.max))
								{
									if (!((lYAxis->_scale == Axis::Scale::LOGARITHMIC) && (crtBound.max <= 0)))
										lYAxisRange.setMax(std::max(crtBound.max, lYAxisRange.getMax()));
								}
							}
						}
					}
				}
0fa2d990   Erdogan Furkan   7616 - Adding lab...
629
630
			}

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
631
			//do not extend the axis
0fa2d990   Erdogan Furkan   7616 - Adding lab...
632
			lYAxisRange._extend = false;
fbe3c2bb   Benjamin Renard   First commit
633

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
634
			fixRange(lYAxisRange, lYAxis->_scale == Axis::Scale::LOGARITHMIC);
fbe3c2bb   Benjamin Renard   First commit
635

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
636
			lYAxis->setRange(lYAxisRange);
fbe3c2bb   Benjamin Renard   First commit
637

0fa2d990   Erdogan Furkan   7616 - Adding lab...
638
639
			LOG4CXX_DEBUG(gLogger, "Y right axis range : min = " << lYAxisRange.getMin() << ", max = " << lYAxisRange.getMax());

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
640
641
642
643
644
645
646
647
648
649
650
			Range lParamRange = lZAxis->Axis::getRange();
			if (isnan(lParamRange.getMin()) && isnan(lParamRange.getMax()))
			{
				std::string normalization = sauvaudPropertiesPtr->getNormalization();
				if (normalization == "log" || normalization == "linear")
				{
					lParamRange.setMin(0);
					lParamRange.setMax(1);
				}
				else
				{
0fa2d990   Erdogan Furkan   7616 - Adding lab...
651
					// auto range
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
652
653
					for (auto index : sauvaudPropertiesPtr->getIndexes())
					{
0fa2d990   Erdogan Furkan   7616 - Adding lab...
654
						// compute global range for all indexes
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
655
656
657
658
659
660
661
662
						double minVal, maxVal;
						if (lZAxis->_scale == Axis::Scale::LOGARITHMIC)
							minVal = (*_pParameterValues)[sauvaudPropertiesPtr->getParamId()].getMinStrictPos(index);
						else
							minVal = (*_pParameterValues)[sauvaudPropertiesPtr->getParamId()].getMin(index);
						maxVal = (*_pParameterValues)[sauvaudPropertiesPtr->getParamId()].getMax(index);
						if (!isnan(minVal))
							lParamRange.setMin(std::min(minVal, lParamRange.getMin()));
0fa2d990   Erdogan Furkan   7616 - Adding lab...
663
						// else
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
664
665
666
						//	lParamRange.setMin(0);
						if (!isnan(maxVal))
							lParamRange.setMax(std::max(maxVal, lParamRange.getMax()));
0fa2d990   Erdogan Furkan   7616 - Adding lab...
667
						// else
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
668
669
670
671
672
673
674
675
676
677
						//	lParamRange.setMax(10);
					}
					if (isnan(lParamRange.getMin()))
						lParamRange.setMin(0);
					if (isnan(lParamRange.getMax()))
						lParamRange.setMax(10);
				}
			}
			else
				lParamRange._extend = false;
fbe3c2bb   Benjamin Renard   First commit
678

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
679
680
681
682
683
			//set z axis range
			fixRange(lParamRange, lZAxis->_scale == Axis::Scale::LOGARITHMIC);
			LOG4CXX_DEBUG(gLogger, "ZAxis range : ZMin = " << lParamRange.getMin() << ", ZMax = " << lParamRange.getMax());
			lZAxis->setRange(lParamRange);
		}
fbe3c2bb   Benjamin Renard   First commit
684
685
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
686
	/**
fbe3c2bb   Benjamin Renard   First commit
687
688
689
 * @brief Identify if other side of the plot area need to be drawn or not.
 * @note A plot area side need to be drawn when there is no axis associated to it.
 */
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
690
691
692
693
694
	std::string TimePlot::drawOppositeSide(boost::shared_ptr<Axis> pAxis)
	{
		if (pAxis.get() == getTimeAxis() && getTimeAxis()->isOnlyTickmarks())
		{
			return "";
fbe3c2bb   Benjamin Renard   First commit
695
		}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
696
697
698
		else
		{
			return PanelPlotOutput::drawOppositeSide(pAxis);
fbe3c2bb   Benjamin Renard   First commit
699
		}
fbe3c2bb   Benjamin Renard   First commit
700
	}
fbe3c2bb   Benjamin Renard   First commit
701

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
702
703
704
705
706
707
708
	void TimePlot::drawXAxis(boost::shared_ptr<Axis> pXAxis, PlWindow &pPlWindow, Bounds &pPlotAreaSize, TickConf &pTickConf)
	{
		LOG4CXX_DEBUG(gLogger, "Drawing X axis ");
		// draw main axis...
		PanelPlotOutput::drawXAxis(pXAxis, pPlWindow, pPlotAreaSize, pTickConf);
		// delegate to decorator any extra drawing stuff it needs to perform...
		getTimeAxisDecorator()->draw(this, getTimeAxis(), _pls);
fbe3c2bb   Benjamin Renard   First commit
709
710
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
711
712
713
714
	// Convert an X axis string value to a double X value assuming it's a DD_Time value
	double TimePlot::convertXAxisValue(const std::string &value)
	{
		return DD_Time2Double(value.c_str());
fbe3c2bb   Benjamin Renard   First commit
715
716
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
	ConstantLine *TimePlot::getConstantLineFromId(int serieId, int constantId, boost::shared_ptr<Axis> &yAxis)
	{
		for (auto parameter : _parameterAxesList)
		{
			for (auto serieProperties : parameter.getYSeriePropertiesList())
			{
				if ((serieProperties.getId() == serieId) && (serieProperties.hasYAxis() == true))
				{
					yAxis = _panel->getAxis(serieProperties.getYAxisId());
					for (auto constantLine : yAxis->_constantLines)
					{
						if (constantLine->getId() == constantId)
						{
							return constantLine.get();
						}
fbe3c2bb   Benjamin Renard   First commit
732
733
734
735
					}
				}
			}
		}
fbe3c2bb   Benjamin Renard   First commit
736

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
737
738
739
740
741
742
		// ConstantId not found, we throw an exception
		std::stringstream lError;
		lError << "TimePlot::getConstantLineFromId : Unable to find constantId='" << constantId << "' for serieId='" << serieId << "'";
		BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
		return NULL;
	}
fbe3c2bb   Benjamin Renard   First commit
743

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
744
745
746
747
748
749
750
751
752
753
754
	bool TimePlot::getSeriePropertiesById(int serieId, SeriesProperties &rSerieProperties)
	{
		for (auto parameter : _parameterAxesList)
		{
			for (auto serieProperties : parameter.getYSeriePropertiesList())
			{
				if (serieProperties.getId() == serieId)
				{
					rSerieProperties = serieProperties;
					return true;
				}
fbe3c2bb   Benjamin Renard   First commit
755
756
			}
		}
fbe3c2bb   Benjamin Renard   First commit
757

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
758
759
		return false;
	}
fbe3c2bb   Benjamin Renard   First commit
760

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
761
	void TimePlot::mergeAndSortTime(double *values1Time, int values1Nb,
fbe3c2bb   Benjamin Renard   First commit
762
									double *values2Time, int values2Nb,
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
763
764
									std::vector<double> &valuesTime)
	{
fbe3c2bb   Benjamin Renard   First commit
765

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
766
767
768
		// Build 2 vectors
		std::vector<double> v1(values1Time, values1Time + values1Nb);
		std::vector<double> v2(values2Time, values2Time + values2Nb);
fbe3c2bb   Benjamin Renard   First commit
769

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
770
771
772
		// Populate resulting vector
		valuesTime.insert(valuesTime.end(), v1.begin(), v1.end());
		valuesTime.insert(valuesTime.end(), v2.begin(), v2.end());
fbe3c2bb   Benjamin Renard   First commit
773

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
774
775
776
		// Sort and remove duplicates for the resulting vector
		sort(valuesTime.begin(), valuesTime.end());
		valuesTime.erase(unique(valuesTime.begin(), valuesTime.end()), valuesTime.end());
fbe3c2bb   Benjamin Renard   First commit
777
	}
fbe3c2bb   Benjamin Renard   First commit
778

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
779
780
	double TimePlot::getInterpolatedValue(double *values, double *valuesTime, int valuesNb, double atTime)
	{
fbe3c2bb   Benjamin Renard   First commit
781

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
782
783
784
785
		// get index of first time after given time_
		if (isnan(atTime))
		{
			return nan("");
fbe3c2bb   Benjamin Renard   First commit
786
787
		}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
788
789
790
791
792
793
794
795
		double *pTime = valuesTime;

		for (int t = 0; t < valuesNb; t++)
		{
			// No interpolation required
			if (*pTime == atTime)
			{
				return values[t];
fbe3c2bb   Benjamin Renard   First commit
796
			}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
			// Interpolation required
			if (*pTime >= atTime)
			{
				if (t == 0)
				{
					return nan("");
				}
				else
				{
					double v1 = values[t - 1];
					double v2 = values[t];
					double d1 = valuesTime[t - 1];
					double d2 = valuesTime[t];
					// Return a linear interpolation of the value for the index
					return (v1 + (v2 - v1) * (atTime - d1) / (d2 - d1));
				}
fbe3c2bb   Benjamin Renard   First commit
813
			}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
814
			pTime++;
fbe3c2bb   Benjamin Renard   First commit
815
		}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
816
		return nan("");
fbe3c2bb   Benjamin Renard   First commit
817
818
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
819
820
821
822
	bool TimePlot::intersect(double xi, double y1i, double y2i,
							 double xj, double y1j, double y2j,
							 double *xInter)
	{
fbe3c2bb   Benjamin Renard   First commit
823

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
824
825
826
827
828
		// Simply checks if segment are above or below the other
		if (((y1i >= y2i) && (y1j >= y2j)) || ((y1i <= y2i) && (y1j <= y2j)))
		{
			return false;
		}
fbe3c2bb   Benjamin Renard   First commit
829

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
830
831
832
833
		// Computes intersection point :
		// Compute a and b (y = a * x + b) for each segment
		double a1 = (y1j - y1i) / (xj - xi);
		double b1 = y1i - a1 * xi;
fbe3c2bb   Benjamin Renard   First commit
834

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
835
836
		double a2 = (y2j - y2i) / (xj - xi);
		double b2 = y2i - a2 * xi;
fbe3c2bb   Benjamin Renard   First commit
837

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
838
839
		// Compute intersection point (a1*x+b1 = a2*x+b2)
		*xInter = (b2 - b1) / (a1 - a2);
fbe3c2bb   Benjamin Renard   First commit
840

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
841
842
		return true;
	}
fbe3c2bb   Benjamin Renard   First commit
843

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
844
845
846
	void TimePlot::addIntersectionTime(double *values1, double *values1Time, int values1Nb,
									   double *values2, double *values2Time, int values2Nb,
									   std::vector<double> &valuesTime)
fbe3c2bb   Benjamin Renard   First commit
847
	{
fbe3c2bb   Benjamin Renard   First commit
848

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
849
850
		if (valuesTime.empty() == true)
			return;
fbe3c2bb   Benjamin Renard   First commit
851

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
852
853
		// For each time segment compute intersection if it exists
		std::vector<double> intersectionTime;
fbe3c2bb   Benjamin Renard   First commit
854

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
855
856
857
		double xi = valuesTime[0];
		double y1i = getInterpolatedValue(values1, values1Time, values1Nb, xi);
		double y2i = getInterpolatedValue(values2, values2Time, values2Nb, xi);
fbe3c2bb   Benjamin Renard   First commit
858

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
859
860
861
862
863
		for (size_t t = 1; t < valuesTime.size(); t++)
		{
			double xj = valuesTime[t];
			double y1j = getInterpolatedValue(values1, values1Time, values1Nb, xj);
			double y2j = getInterpolatedValue(values2, values2Time, values2Nb, xj);
fbe3c2bb   Benjamin Renard   First commit
864

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
865
866
867
868
869
			double xInter;
			if (intersect(xi, y1i, y2i, xj, y1j, y2j, &xInter) == true)
			{
				intersectionTime.push_back(xInter);
			}
fbe3c2bb   Benjamin Renard   First commit
870

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
871
872
873
874
875
			// Next vector element
			xi = xj;
			y1i = y1j;
			y2i = y2j;
		}
fbe3c2bb   Benjamin Renard   First commit
876

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
877
878
		// Add intersections informations to the resulting values
		valuesTime.insert(valuesTime.end(), intersectionTime.begin(), intersectionTime.end());
fbe3c2bb   Benjamin Renard   First commit
879

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
880
881
882
883
		// Sort and remove duplicates for the resulting vector
		sort(valuesTime.begin(), valuesTime.end());
		valuesTime.erase(unique(valuesTime.begin(), valuesTime.end()), valuesTime.end());
	}
fbe3c2bb   Benjamin Renard   First commit
884

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
885
	void TimePlot::drawFillArea(double *values1, double *values1Time, int values1Nb,
fbe3c2bb   Benjamin Renard   First commit
886
887
								double *values2, double *values2Time, int values2Nb,
								std::vector<double> &valuesTime,
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
888
889
890
891
892
893
894
								bool colorGreaterSpecified, Color &colorGreater,
								bool colorLessSpecified, Color &colorLess,
								SeriesProperties &rSeriesProperties)
	{
		// Get X and Y axis.
		boost::shared_ptr<Axis> lXAxis(_panel->getAxis(rSeriesProperties.getXAxisId()));
		boost::shared_ptr<Axis> lYAxis(_panel->getAxis(rSeriesProperties.getYAxisId()));
fbe3c2bb   Benjamin Renard   First commit
895

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
896
897
		Range lXRange = getXAxisRange(rSeriesProperties, lXAxis);
		Range lYRange = getYAxisRange(rSeriesProperties, lYAxis);
fbe3c2bb   Benjamin Renard   First commit
898

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
899
		_pls->wind(lXRange.getMin(), lXRange.getMax(), lYRange.getMin(), lYRange.getMax());
fbe3c2bb   Benjamin Renard   First commit
900

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
901
902
903
		PLFLT x[4], y[4], deltai, deltaj;
		Color curColor;
		Color lInitialColor = changeColor(_pls, colorGreater, _panel->_page->_mode);
fbe3c2bb   Benjamin Renard   First commit
904

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
905
		for (size_t i = 0; i < (valuesTime.size() - 1); i++)
fbe3c2bb   Benjamin Renard   First commit
906
		{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
			x[0] = valuesTime[i];
			x[1] = x[0];
			x[2] = valuesTime[i + 1];
			x[3] = x[2];

			y[0] = getInterpolatedValue(values1, values1Time, values1Nb, valuesTime[i]);
			y[1] = getInterpolatedValue(values2, values2Time, values2Nb, valuesTime[i]);
			y[2] = getInterpolatedValue(values2, values2Time, values2Nb, valuesTime[i + 1]);
			y[3] = getInterpolatedValue(values1, values1Time, values1Nb, valuesTime[i + 1]);

			deltai = y[1] - y[0];
			deltaj = y[2] - y[3];

			// Set fill color depending on segment position
			if (((deltai > 0) && (fabs(deltai) > fabs(deltaj))) ||
				((deltaj > 0) && (fabs(deltaj) > fabs(deltai))))
			{
				// s1 above s2
				if (colorGreaterSpecified == true)
				{
					curColor = colorGreater;
				}
				else
				{
					continue;
				}
fbe3c2bb   Benjamin Renard   First commit
933
			}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
			else if (((deltai < 0) && (fabs(deltai) > fabs(deltaj))) ||
					 ((deltaj < 0) && (fabs(deltaj) > fabs(deltai))))
			{
				// s1 under s2
				if (colorLessSpecified == true)
				{
					curColor = colorLess;
				}
				else
				{
					continue;
				}
			}
			else
			{
				// Colinear segments, no fill required
fbe3c2bb   Benjamin Renard   First commit
950
951
				continue;
			}
fbe3c2bb   Benjamin Renard   First commit
952

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
953
954
955
			// Fill polygon using the given color
			changeColor(_pls, curColor, _panel->_page->_mode);
			_pls->fill(4, x, y);
fbe3c2bb   Benjamin Renard   First commit
956
957
		}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
958
959
960
		// Restore color.
		restoreColor(_pls, lInitialColor, _panel->_page->_mode);
	}
e7b3586a   Benjamin Renard   Fix fill between ...
961

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
962
963
964
965
	void TimePlot::drawFills(double startDate, double stopDate)
	{
		PanelPlotOutput::drawFills(startDate, stopDate);
		LOG4CXX_DEBUG(gLogger, "TimePlot::drawFills");
e7b3586a   Benjamin Renard   Fix fill between ...
966

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
967
		SeriesProperties rSeriesProperties;
fbe3c2bb   Benjamin Renard   First commit
968

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
969
970
971
		double *values1 = NULL;
		double *values1Time = NULL;
		int values1Nb = 0;
fbe3c2bb   Benjamin Renard   First commit
972

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
973
974
975
		double *values2 = NULL;
		double *values2Time = NULL;
		int values2Nb = 0;
fbe3c2bb   Benjamin Renard   First commit
976

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
977
		std::vector<double> valuesTime;
e7b3586a   Benjamin Renard   Fix fill between ...
978

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
979
980
		// Drawing Fill Area located between Serie and Constant (horizontal) line
		for (auto fillSerieConstant : _panel->_fillSerieConstants)
fbe3c2bb   Benjamin Renard   First commit
981
		{
fbe3c2bb   Benjamin Renard   First commit
982

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
983
984
985
986
987
988
			// Retrieve serie parameter values for serieId
			if (!getSeriePropertiesById(fillSerieConstant->getSerieId(), rSeriesProperties))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawFills - Cannot find serie id " << fillSerieConstant->getSerieId());
				continue;
			}
fbe3c2bb   Benjamin Renard   First commit
989

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
990
991
992
993
994
995
996
			//get computed values for this serie and interval
			if (!getComputedValuesFromSerieAndInterval(startDate, stopDate, rSeriesProperties,
													   rSeriesProperties.getIndex(), &values1, &values1Time, values1Nb))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawFills - Cannot get computed values for serie id " << fillSerieConstant->getSerieId());
				continue;
			}
fbe3c2bb   Benjamin Renard   First commit
997

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
998
999
1000
			// Retrieve constantLine informations for these fill
			boost::shared_ptr<Axis> yAxis;
			ConstantLine *constantLine = getConstantLineFromId(fillSerieConstant->getSerieId(), fillSerieConstant->getConstantId(), yAxis);
fbe3c2bb   Benjamin Renard   First commit
1001

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1002
			// Retrieve axis attachment
fbe3c2bb   Benjamin Renard   First commit
1003

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1004
1005
1006
			// Build values2 values2Time array with 2 values : yConst & (first time, last time) for serie
			values2 = new double[2];
			values2Time = new double[2];
fbe3c2bb   Benjamin Renard   First commit
1007

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1008
1009
			values2[0] = convertYAxisValue(constantLine->getValue());
			values2[1] = convertYAxisValue(constantLine->getValue());
fbe3c2bb   Benjamin Renard   First commit
1010

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1011
1012
1013
1014
1015
			if (yAxis->_scale == Axis::Scale::LOGARITHMIC)
			{
				values2[0] = log10(values2[0]);
				values2[1] = log10(values2[1]);
			}
fbe3c2bb   Benjamin Renard   First commit
1016

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1017
1018
			values2Time[0] = values1Time[0];
			values2Time[1] = values1Time[values1Nb - 1];
fbe3c2bb   Benjamin Renard   First commit
1019

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1020
			values2Nb = 2;
fbe3c2bb   Benjamin Renard   First commit
1021

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1022
1023
1024
1025
1026
1027
1028
			// Build time vector by merging existing times and computing intersections, and draw it !
			mergeAndSortTime(values1Time, values1Nb, values2Time, values2Nb, valuesTime);
			addIntersectionTime(values1, values1Time, values1Nb, values2, values2Time, values2Nb, valuesTime);
			drawFillArea(values1, values1Time, values1Nb, values2, values2Time, values2Nb, valuesTime,
						 fillSerieConstant->isColorGreaterSpecified(), fillSerieConstant->getColorGreater(),
						 fillSerieConstant->isColorLessSpecified(), fillSerieConstant->getColorLess(),
						 rSeriesProperties);
fbe3c2bb   Benjamin Renard   First commit
1029

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1030
1031
1032
			delete[] values1;
			delete[] values2;
			delete[] values2Time;
fbe3c2bb   Benjamin Renard   First commit
1033
1034
		}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1035
1036
		// Drawing Fill Area located between first and second Serie
		for (auto fillSerieSerie : _panel->_fillSerieSeries)
fbe3c2bb   Benjamin Renard   First commit
1037
		{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1038
1039
1040
1041
1042
1043
			// Retrieve serie parameter values for firstSerieId
			if (!getSeriePropertiesById(fillSerieSerie->getFirstSerieId(), rSeriesProperties))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawFills - Cannot find serie id " << fillSerieSerie->getFirstSerieId());
				continue;
			}
fbe3c2bb   Benjamin Renard   First commit
1044

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1045
1046
1047
1048
1049
1050
1051
			//get computed values for this serie and interval
			if (!getComputedValuesFromSerieAndInterval(startDate, stopDate, rSeriesProperties,
													   rSeriesProperties.getIndex(), &values1, &values1Time, values1Nb))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawFills - Cannot get computed values for serie id " << fillSerieSerie->getFirstSerieId());
				continue;
			}
fbe3c2bb   Benjamin Renard   First commit
1052

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1053
1054
1055
1056
1057
1058
			// Retrieve serie parameter values for secondSerieId
			if (!getSeriePropertiesById(fillSerieSerie->getSecondSerieId(), rSeriesProperties))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawFills - Cannot find serie id " << fillSerieSerie->getSecondSerieId());
				continue;
			}
fbe3c2bb   Benjamin Renard   First commit
1059

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1060
1061
1062
1063
1064
1065
1066
			//get computed values for this serie and interval
			if (!getComputedValuesFromSerieAndInterval(startDate, stopDate, rSeriesProperties,
													   rSeriesProperties.getIndex(), &values2, &values2Time, values2Nb))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawFills - Cannot get computed values for serie id " << fillSerieSerie->getSecondSerieId());
				continue;
			}
fbe3c2bb   Benjamin Renard   First commit
1067

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1068
1069
1070
1071
1072
1073
1074
			// Build time vector by merging existing times and computing intersections, and draw it !
			mergeAndSortTime(values1Time, values1Nb, values2Time, values2Nb, valuesTime);
			addIntersectionTime(values1, values1Time, values1Nb, values2, values2Time, values2Nb, valuesTime);
			drawFillArea(values1, values1Time, values1Nb, values2, values2Time, values2Nb, valuesTime,
						 fillSerieSerie->isColorGreaterSpecified(), fillSerieSerie->getColorGreater(),
						 fillSerieSerie->isColorLessSpecified(), fillSerieSerie->getColorLess(),
						 rSeriesProperties);
fbe3c2bb   Benjamin Renard   First commit
1075

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1076
1077
1078
			delete[] values1;
			delete[] values2;
		}
fbe3c2bb   Benjamin Renard   First commit
1079
1080
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1081
1082
1083
1084
	void TimePlot::drawSeries(double startDate, double stopDate, int intervalIndex,
							  std::string pParamId, SeriesProperties &pSeries,
							  AMDA::Common::ParameterIndexComponent pParamIndex,
							  ParameterAxes &param, bool moreThanOneSerieForAxis)
fbe3c2bb   Benjamin Renard   First commit
1085
	{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1086
1087
1088
		LOG4CXX_DEBUG(gLogger, "TimePlot::drawSeries - Drawing serie for parameter " << pParamId << "[" << pParamIndex.getDim1Index() << "," << pParamIndex.getDim2Index() << "]");
		// This will configure window, draw axes (if needed) and legend of axes.
		PanelPlotOutput::drawSeries(startDate, stopDate, intervalIndex, pParamId, pSeries, pParamIndex, param, moreThanOneSerieForAxis);
fbe3c2bb   Benjamin Renard   First commit
1089

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1090
1091
		if (!pSeries.hasYAxis())
			return;
fbe3c2bb   Benjamin Renard   First commit
1092

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1093
1094
1095
1096
		// Y axis may be missing (tickplot for example)
		std::string yAxisId = pSeries.getYAxisId();
		if (yAxisId.empty())
			return;
fbe3c2bb   Benjamin Renard   First commit
1097

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1098
1099
1100
1101
1102
1103
		//get computed values
		double *computedValues = NULL;
		double *timeValues = NULL;
		int nbValues;
		if (!getComputedValuesFromSerieAndInterval(startDate, stopDate, pSeries, pParamIndex,
												   &computedValues, &timeValues, nbValues))
fbe3c2bb   Benjamin Renard   First commit
1104
		{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1105
			LOG4CXX_DEBUG(gLogger, "TimePlot::drawSeries - Cannot get computed values for serie");
fbe3c2bb   Benjamin Renard   First commit
1106
1107
			return;
		}
fbe3c2bb   Benjamin Renard   First commit
1108

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
		double *coloredComputedValues = NULL;
		double *coloredTimeValues = NULL;
		//get colored value if needed
		if (!pSeries.getColorParamId().empty() && (_panel->getColorAxis() != nullptr))
		{
			int nbColoredValues;
			if (!getColoredComputedValuesFromSerieAndInterval(startDate, stopDate, pSeries,
															  &coloredComputedValues, &coloredTimeValues, nbColoredValues))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawSeries - Cannot get computed values for colored parameter");
				return;
			}
		}

		PlWindow lPlWindow = PlWindow(getTimeAxis()->getRange().getMin(), getTimeAxis()->getRange().getMax(),
									  _panel->getAxis(yAxisId)->getRange().getMin(), _panel->getAxis(yAxisId)->getRange().getMax());
fbe3c2bb   Benjamin Renard   First commit
1125

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1126
1127
		_pls->wind(std::get<0>(lPlWindow), std::get<1>(lPlWindow),
				   std::get<2>(lPlWindow), std::get<3>(lPlWindow));
fbe3c2bb   Benjamin Renard   First commit
1128

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1129
1130
1131
		//draw serie
		Color lineColor = getSerieLineColor(pSeries, moreThanOneSerieForAxis);
		Color symbolColor = getSerieSymbolColor(pSeries, lineColor);
fbe3c2bb   Benjamin Renard   First commit
1132

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1133
1134
1135
1136
1137
		drawSymbols(
			pSeries.getSymbolProperties().getType(),
			pSeries.getSymbolProperties().getSize(), 1.,
			symbolColor,
			nbValues, timeValues, computedValues, coloredComputedValues);
fbe3c2bb   Benjamin Renard   First commit
1138

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1139
1140
1141
1142
1143
1144
		drawLines(
			pSeries.getLineProperties().getType(),
			pSeries.getLineProperties().getStyle(),
			pSeries.getLineProperties().getWidth(),
			lineColor,
			nbValues, timeValues, computedValues, coloredComputedValues);
fbe3c2bb   Benjamin Renard   First commit
1145

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1146
1147
		//add serie to param legend
		addSerieToParamsLegend(pSeries, pParamIndex, param._originalParamId, lineColor, symbolColor, startDate, stopDate, intervalIndex);
fbe3c2bb   Benjamin Renard   First commit
1148

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1149
1150
		//draw interval
		drawSerieInterval(pSeries, timeValues, computedValues, timeValues, nbValues, intervalIndex);
fbe3c2bb   Benjamin Renard   First commit
1151

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1152
1153
1154
		delete[] computedValues;
		if (coloredComputedValues != NULL)
			delete[] coloredComputedValues;
fbe3c2bb   Benjamin Renard   First commit
1155

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1156
1157
1158
		// Draw min/max error bars if required
		ErrorBarProperties &errorBarProp = pSeries.getErrorBarProperties();
		if (errorBarProp.getErrorMinMax() != nullptr)
fbe3c2bb   Benjamin Renard   First commit
1159
		{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1160
1161
1162
1163
1164
1165
1166
1167
1168
			//get computed min/max error data
			double *minComputedValues = NULL;
			double *minTimeValues = NULL;
			int nbMinValues;

			double *maxComputedValues = NULL;
			double *maxTimeValues = NULL;
			int nbMaxValues;

ab9fea4a   Erdogan Furkan   #7268 - Done
1169
			if (!getErrorComputedValuesFromSerieAndInterval(startDate, stopDate, pSeries, pParamIndex,
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1170
1171
1172
1173
1174
1175
															&minComputedValues, &minTimeValues, nbMinValues,
															&maxComputedValues, &maxTimeValues, nbMaxValues))
			{
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawSeries - Cannot get min/max error values for serie");
				return;
			}
fbe3c2bb   Benjamin Renard   First commit
1176

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1177
1178
			LineProperties &lineProps = pSeries.getErrorBarProperties().getLineProperties();
			drawYErrors(lineProps.getType(),
fbe3c2bb   Benjamin Renard   First commit
1179
1180
1181
1182
1183
1184
						lineProps.getStyle(),
						lineProps.getWidth(),
						lineProps.getColor(),
						nbMinValues, minTimeValues,
						minComputedValues, maxComputedValues);

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1185
1186
1187
1188
			// Free values
			delete[] minComputedValues;
			delete[] maxComputedValues;
		}
fbe3c2bb   Benjamin Renard   First commit
1189
	}
fbe3c2bb   Benjamin Renard   First commit
1190

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1191
1192
1193
1194
1195
	void TimePlot::drawSpectro(double startDate, double stopDate, std::string pParamId, SpectroProperties &pSpectro)
	{
		LOG4CXX_DEBUG(gLogger, "TimePlot::drawSpectro Drawing spectro for parameter " << pParamId);
		// This will configure window, draw axes (if needed) and legend of axes.
		PanelPlotOutput::drawSpectro(startDate, stopDate, pParamId, pSpectro);
fbe3c2bb   Benjamin Renard   First commit
1196

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1197
1198
		//get parameter data and info
		ParameterSPtr p = _parameterManager.getParameter(pParamId);
fbe3c2bb   Benjamin Renard   First commit
1199

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1200
		ParameterData &data = (*_pParameterValues)[pSpectro.getParamId()];
fbe3c2bb   Benjamin Renard   First commit
1201

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1202
1203
1204
1205
		boost::shared_ptr<AMDA::Info::ParamTable> tableSPtr;
		AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId());
		if (paramInfo != nullptr)
			tableSPtr = paramInfo->getTable(pSpectro.getRelatedDim());
f3cd5351   Hacene SI HADJ MOHAND   us ok
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
                
                                        if (tableSPtr == nullptr){
                                            boost::shared_ptr<AMDA::Info::ParamTable> linkedTableSPtr;
                                            int counter = 0;
                                            // work on this 
                                            for (auto pInfo :paramInfo->getLinkedParamList()){
                                                linkedTableSPtr = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(pInfo)->getTable(pSpectro.getRelatedDim());
                                                if (linkedTableSPtr == nullptr)
                                                    continue;
                                                counter ++;
                                            }
                                            if(linkedTableSPtr == nullptr || counter !=1){
                                                LOG4CXX_DEBUG(gLogger, "table cannot be defined from linked info params");
                                            }else{
                                                tableSPtr = linkedTableSPtr;
                                            }
                                        }                
fbe3c2bb   Benjamin Renard   First commit
1223

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1224
1225
1226
1227
		//get axis
		boost::shared_ptr<Axis> lXAxis = _panel->getAxis(pSpectro.getXAxisId());
		boost::shared_ptr<Axis> lYAxis = _panel->getAxis(pSpectro.getYAxisId());
		boost::shared_ptr<ColorAxis> lZAxis = _panel->getColorAxis();
fbe3c2bb   Benjamin Renard   First commit
1228

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1229
1230
		//Check dimensions
		if (pSpectro.getRelatedDim() == 0)
fbe3c2bb   Benjamin Renard   First commit
1231
		{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1232
1233
1234
1235
1236
			if (data.getDim1Size() + 1 <= 0)
			{
				LOG4CXX_INFO(gLogger, "TimePlot::drawSpectro - No data to plot");
				return;
			}
fbe3c2bb   Benjamin Renard   First commit
1237
		}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1238
		else
fbe3c2bb   Benjamin Renard   First commit
1239
		{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1240
1241
1242
1243
1244
			if (data.getDim2Size() + 1 <= 0)
			{
				LOG4CXX_INFO(gLogger, "TimePlot::drawSpectro - No data to plot");
				return;
			}
fbe3c2bb   Benjamin Renard   First commit
1245
		}
fbe3c2bb   Benjamin Renard   First commit
1246

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1247
1248
		LOG4CXX_DEBUG(gLogger, "TimePlot::drawSpectro - Build data grid");
		MatrixGrid matrixGrid;
f2db3c16   Benjamin Renard   Support variable ...
1249

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1250
1251
1252
		//get specific colors for min / max values
		Color minValColor = lZAxis->getMinValColor();
		Color maxValColor = lZAxis->getMaxValColor();
2d64c235   Benjamin Renard   Fix bug with spec...
1253

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1254
		if ((tableSPtr == nullptr) || !tableSPtr->isVariable(&_parameterManager))
fbe3c2bb   Benjamin Renard   First commit
1255
		{
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1256
			int startIndex; // index corresponding to startDate
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1257
1258
1259
			int nbValues;
			data.getIntervalBounds(startDate, stopDate, startIndex, nbValues);
			for (auto index : pSpectro.getIndexes())
fbe3c2bb   Benjamin Renard   First commit
1260
			{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1261
1262
1263
1264
1265
1266
1267
1268
1269
				GridPart part;
				if (tableSPtr == nullptr)
				{
					if (pSpectro.getRelatedDim() == 0)
						part.y[0] = index.getDim1Index();
					else
						part.y[0] = index.getDim2Index();
					part.y[1] = part.y[0] + 1;
				}
f2db3c16   Benjamin Renard   Support variable ...
1270
				else
f2db3c16   Benjamin Renard   Support variable ...
1271
				{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1272
1273
1274
1275
1276
1277
					AMDA::Info::t_TableBound crtBound;
					if (pSpectro.getRelatedDim() == 0)
						crtBound = tableSPtr->getBound(&_parameterManager, index.getDim1Index());
					else
						crtBound = tableSPtr->getBound(&_parameterManager, index.getDim2Index());
					if (std::isnan(crtBound.min) || std::isnan(crtBound.max))
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
1278
						continue;
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1279
1280
1281
1282
1283
1284
1285
1286
1287
					part.y[0] = crtBound.min;
					part.y[1] = crtBound.max;
					if (lYAxis->_scale == Axis::Scale::LOGARITHMIC)
					{
						if ((crtBound.min <= 0) || (crtBound.max <= 0))
							continue;
						part.y[0] = log10(part.y[0]);
						part.y[1] = log10(part.y[1]);
					}
f2db3c16   Benjamin Renard   Support variable ...
1288
				}
fbe3c2bb   Benjamin Renard   First commit
1289

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1290
1291
1292
1293
1294
1295
1296
				if (lYAxis->_reverse)
				{
					if (((part.y[0] < lYAxis->getRange().getMax()) && (part.y[1] < lYAxis->getRange().getMax())) ||
						((part.y[0] > lYAxis->getRange().getMin()) && (part.y[1] < lYAxis->getRange().getMin())))
					{
						continue;
					}
2d64c235   Benjamin Renard   Fix bug with spec...
1297
				}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1298
1299
1300
1301
1302
1303
1304
				else
				{
					if (((part.y[0] < lYAxis->getRange().getMin()) && (part.y[1] < lYAxis->getRange().getMin())) ||
						((part.y[0] > lYAxis->getRange().getMax()) && (part.y[1] < lYAxis->getRange().getMax())))
					{
						continue;
					}
2d64c235   Benjamin Renard   Fix bug with spec...
1305
				}
2d64c235   Benjamin Renard   Fix bug with spec...
1306

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
				for (int i = 0; i < nbValues - 1; ++i)
				{
					part.x[0] = data.getTimes()[startIndex + i];
					part.x[1] = data.getTimes()[startIndex + i + 1];
					part.isColorIndex = false;
					part.value = data.getValues(index, startIndex)[i];
					matrixGrid.push_back(part);
				}
				//Apply background subtraction
				applyBackgroundSubtraction(matrixGrid, pSpectro, data);
				//draw spectro
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawSpectro - Draw data grid - " << matrixGrid.size());
				std::string normalization = pSpectro.getNormalization();
				if (!normalization.empty())
					normalize(matrixGrid, normalization);
				drawMatrix(matrixGrid, pSpectro.getMin(), pSpectro.getMax(),
						   minValColor, maxValColor, lZAxis->_color._colorMapIndex, pSpectro.getUseLog0AsMin());
				matrixGrid.clear();
			}
f2db3c16   Benjamin Renard   Support variable ...
1326
		}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1327
		else
fbe3c2bb   Benjamin Renard   First commit
1328
		{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1329
1330
1331
1332
1333
1334
1335
1336
			//Variable table
			AMDA::Info::t_TableBound crtBound;
			//for (auto index : pSpectro.getIndexes())
			//{
			int startIndex;
			int nbValues;
			data.getIntervalBounds(startDate, stopDate, startIndex, nbValues);
			for (int i = 0; i < nbValues - 1; ++i)
8c71f50a   Benjamin Renard   Improve execution...
1337
			{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1338
1339
1340
1341
1342
1343
				GridPart part;
				part.x[0] = data.getTimes()[startIndex + i];
				part.x[1] = data.getTimes()[startIndex + i + 1];

				std::map<std::string, std::vector<double>> paramsTableData;
				for (std::map<std::string, std::string>::iterator it = pSpectro.getTableParams().begin(); it != pSpectro.getTableParams().end(); ++it)
f2db3c16   Benjamin Renard   Support variable ...
1344
				{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1345
1346
1347
1348
1349
1350
1351
1352
					ParameterData &tableData = (*_pParameterValues)[it->second];
					std::vector<double> paramTableValues;
					for (int j = 0; j < tableData.getDim1Size(); ++j)
					{
						double *values = tableData.getValues(AMDA::Common::ParameterIndexComponent(j, -1), i);
						paramTableValues.push_back((*values));
					}
					paramsTableData[it->first] = paramTableValues;
f2db3c16   Benjamin Renard   Support variable ...
1353
				}
8c71f50a   Benjamin Renard   Improve execution...
1354

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1355
1356
1357
1358
				for (auto index : pSpectro.getIndexes())
				{
					part.isColorIndex = false;
					part.value = data.getValues(index, startIndex)[i];
f2db3c16   Benjamin Renard   Support variable ...
1359

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1360
1361
1362
1363
					if (pSpectro.getRelatedDim() == 0)
						crtBound = tableSPtr->getBound(&_parameterManager, index.getDim1Index(), &paramsTableData);
					else
						crtBound = tableSPtr->getBound(&_parameterManager, index.getDim2Index(), &paramsTableData);
f2db3c16   Benjamin Renard   Support variable ...
1364

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1365
1366
					part.y[0] = crtBound.min;
					part.y[1] = crtBound.max;
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
1367

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1368
					if (!std::isnan(crtBound.min) && !std::isnan(crtBound.max))
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
1369
					{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1370
						if (lYAxis->_scale == Axis::Scale::LOGARITHMIC)
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
1371
						{
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1372
1373
1374
1375
1376
1377
							if ((crtBound.min > 0) && (crtBound.max > 0))
							{
								part.y[0] = log10(part.y[0]);
								part.y[1] = log10(part.y[1]);
								matrixGrid.push_back(part);
							}
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
1378
						}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1379
1380
						else
							matrixGrid.push_back(part);
ed9a1eaf   Benjamin Renard   Add Maven STATIC ...
1381
					}
f2db3c16   Benjamin Renard   Support variable ...
1382
				}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1383
1384
1385
1386
1387
1388
1389
1390
				//draw spectro
				LOG4CXX_DEBUG(gLogger, "TimePlot::drawSpectro - Draw data grid - " << matrixGrid.size());
				std::string normalization = pSpectro.getNormalization();
				if (!normalization.empty())
					normalize(matrixGrid, normalization);
				drawMatrix(matrixGrid, pSpectro.getMin(), pSpectro.getMax(),
						   minValColor, maxValColor, lZAxis->_color._colorMapIndex, pSpectro.getUseLog0AsMin());
				matrixGrid.clear();
f2db3c16   Benjamin Renard   Support variable ...
1391
			}
fbe3c2bb   Benjamin Renard   First commit
1392
1393
		}
	}
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1394
        
e1e55413   Hacene SI HADJ MOHAND   us ok
1395
        	void TimePlot::drawSauvaud(double startDate, double stopDate, std::string pParamId, SauvaudProperties &pSauvaud, int /*subIndex=0*/, int /*subsNumber=1*/, std::string /*opositeLegend*/)
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1396
1397
	{
		LOG4CXX_DEBUG(gLogger, "TimePlot::drawSauvaud Drawing sauvaud for parameter " << pParamId);
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1398
1399
                
                                     
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1400
1401
1402
1403
1404

		//get parameter data and info
		ParameterSPtr p = _parameterManager.getParameter(pParamId);

		ParameterData &data = (*_pParameterValues)[pSauvaud.getParamId()];
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1405
1406
1407
                                        int rightDim = pSauvaud.getRightDim();
                                        int leftDim   = (rightDim ==0) ? 1 :0;
                                        int rightDimSize =-1;
d924031c   Hacene SI HADJ MOHAND   progress
1408
1409
                                        int leftDimSize =-1;
                                        bool invertedTable = false;
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1410
1411
1412
1413
1414
1415
1416
                                        if(rightDim ==0){
                                                rightDimSize = data.getDim1Size();
                                                leftDimSize = data.getDim2Size() ;
                                        }else{
                                                rightDimSize = data.getDim2Size() ;
                                                leftDimSize = data.getDim1Size() ;
                                        }
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1417

b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1418
1419
1420
1421
1422
                                        if (  rightDimSize < 0 && leftDimSize<0 )
                                        {
                                                LOG4CXX_INFO(gLogger, "TimePlot::drawSauvaud - No data to plot");
                                                return;
                                        }
5f13f59c   Hacene SI HADJ MOHAND   in progress worki...
1423
1424
		boost::shared_ptr<AMDA::Info::ParamTable> rightTableSPtr;
                                        boost::shared_ptr<AMDA::Info::ParamTable> leftTableSPtr;
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1425
		AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId());
5f13f59c   Hacene SI HADJ MOHAND   in progress worki...
1426
		if (paramInfo != nullptr){
d924031c   Hacene SI HADJ MOHAND   progress
1427
1428
1429
			rightTableSPtr  = paramInfo->getTable(rightDim);
                                                            leftTableSPtr     = paramInfo->getTable(leftDim);
                                                            invertedTable   = leftTableSPtr->isInvertedOrder(&_parameterManager);
5f13f59c   Hacene SI HADJ MOHAND   in progress worki...
1430
1431
                                         }
                                
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1432
1433
1434
		//get axis
		boost::shared_ptr<Axis> lXAxis = _panel->getAxis(pSauvaud.getXAxisId());
		boost::shared_ptr<Axis> lYAxis = _panel->getAxis(pSauvaud.getYAxisId());
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1435
		boost::shared_ptr<ColorAxis> lZAxis = _panel->getColorAxis();
5f13f59c   Hacene SI HADJ MOHAND   in progress worki...
1436
                
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1437
1438
1439
1440
                                        // Init data                 
                                        int startIndex; // index corresponding to startDate
                                        int nbValues;
                                        data.getIntervalBounds(startDate, stopDate, startIndex, nbValues);
5f13f59c   Hacene SI HADJ MOHAND   in progress worki...
1441

736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1442
		LOG4CXX_DEBUG(gLogger, "TimePlot::drawSauvaud - Build data grid");
d924031c   Hacene SI HADJ MOHAND   progress
1443
1444
                
                                        int plotIndex; 
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1445

9aec59c6   Hacene SI HADJ MOHAND   inverted table in...
1446
                                        for(int spectroIndex =0; spectroIndex < leftDimSize; spectroIndex ++){
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1447
1448
		// This will configure window, draw axes (if needed) and legend of axes.
                                            
9aec59c6   Hacene SI HADJ MOHAND   inverted table in...
1449
                                            plotIndex = (!invertedTable)? spectroIndex : leftDimSize-spectroIndex-1;
d924031c   Hacene SI HADJ MOHAND   progress
1450
                                            
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1451
                                            // set left label for each sub-plot label table value or index  
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
                                            std::string plotLabel = std::to_string(spectroIndex);
                                                       if ((leftTableSPtr == nullptr) || !leftTableSPtr->isVariable(&_parameterManager))
                                                        {
                                                            if ( leftTableSPtr== nullptr)
                                                                {
                                                                // nothing to do 
                                                            }else{
                                                                AMDA::Info::t_TableBound rightBound = leftTableSPtr->getBound(&_parameterManager, spectroIndex);
                                                                 if (!std::isnan(rightBound.min) && !std::isnan(rightBound.max)){
                                                                        double boundVal =  (rightBound.min + rightBound.max)/2;
                                                                        plotLabel = std::to_string((int)std::round(boundVal));
                                                                 }
                                                            }
                                                            }else{
                                                                            // variable
                                                                      for (int i = 0; i < nbValues - 1; ++i){
                                                                            std::map<std::string, std::vector<double>> paramsTableData;
                                                                            for (std::map<std::string, std::string>::iterator it = pSauvaud.getTableParams().begin(); it != pSauvaud.getTableParams().end(); ++it)
                                                                            {
                                                                                    ParameterData &tableData = (*_pParameterValues)[it->second];
                                                                                    std::vector<double> paramTableValues;
                                                                                    for (int j = 0; j < rightDimSize; ++j)
                                                                                    {
                                                                                            double *values = tableData.getValues(AMDA::Common::ParameterIndexComponent(j, -1), i);
                                                                                            paramTableValues.push_back((*values));
                                                                                    }
                                                                                    paramsTableData[it->first] = paramTableValues;
                                                                            }
                                                                          AMDA::Info::t_TableBound rightBound  = leftTableSPtr->getBound(&_parameterManager, spectroIndex, &paramsTableData);
                                                                          if (!std::isnan(rightBound.min) && !std::isnan(rightBound.max)){
                                                                                double boundVal =  (rightBound.min + rightBound.max)/2;
                                                                                plotLabel = std::to_string((int)std::round(boundVal));
                                                                            }
                                                                       }     
                                                             }
                                                    Label label(lYAxis->_legend.getFont(), lYAxis->_legend.getColor());
                                                    label._text = plotLabel;
e1e55413   Hacene SI HADJ MOHAND   us ok
1489
1490
1491
1492
1493
                                                    lYAxis->_legend.setLabel(label);
                                                    std::string opositeLabel ="";
                                                    if(spectroIndex == leftDimSize -1){
                                                            opositeLabel = "  "+rightTableSPtr ->getName(&_parameterManager);
                                                            opositeLabel = opositeLabel + "\n ["+rightTableSPtr ->getUnits(&_parameterManager)+"]";
d924031c   Hacene SI HADJ MOHAND   progress
1494
                                                            PanelPlotOutput::drawSauvaud(startDate, stopDate, pParamId, pSauvaud,plotIndex , leftDimSize, opositeLabel);
e1e55413   Hacene SI HADJ MOHAND   us ok
1495
                                                    }else{
d924031c   Hacene SI HADJ MOHAND   progress
1496
                                                            PanelPlotOutput::drawSauvaud(startDate, stopDate, pParamId, pSauvaud,plotIndex , leftDimSize, "");
e1e55413   Hacene SI HADJ MOHAND   us ok
1497
                                                    }
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1498
                                                    
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1499
                                                    
e1e55413   Hacene SI HADJ MOHAND   us ok
1500

b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
                                                    MatrixGrid matrixGrid;
                                                    
                                                    		//get specific colors for min / max values
                                                Color minValColor = lZAxis->getMinValColor();
                                                Color maxValColor = lZAxis->getMaxValColor();

                                                if ((rightTableSPtr == nullptr) || !rightTableSPtr->isVariable(&_parameterManager))
                                                {

                                                        AMDA::Common::ParameterIndexComponentList indexes =  pSauvaud.getIndexesByIndex(spectroIndex, leftDim);
                                                        for (auto index : indexes) 
                                                        {
                                                                GridPart part;
                                                                if ( rightTableSPtr== nullptr)
                                                                {
                                                                        if (rightDim == 0)
                                                                                part.y[0] = index.getDim1Index();
                                                                        else
                                                                                part.y[0] = index.getDim2Index();
                                                                        part.y[1] = part.y[0] + 1;
                                                                }
                                                                else
                                                                {
                                                                        AMDA::Info::t_TableBound crtBound;
                                                                        if (rightDim == 0)
                                                                                crtBound = rightTableSPtr->getBound(&_parameterManager, index.getDim1Index());
                                                                        else
                                                                                crtBound = rightTableSPtr->getBound(&_parameterManager, index.getDim2Index());
                                                                        if (std::isnan(crtBound.min) || std::isnan(crtBound.max))
                                                                                continue;
                                                                        part.y[0] = crtBound.min;
                                                                        part.y[1] = crtBound.max;
                                                                        if (lYAxis->_scale == Axis::Scale::LOGARITHMIC)
                                                                        {
                                                                                if ((crtBound.min <= 0) || (crtBound.max <= 0))
                                                                                        continue;
                                                                                part.y[0] = log10(part.y[0]);
                                                                                part.y[1] = log10(part.y[1]);
                                                                        }
                                                                }

                                                                if (lYAxis->_reverse)
                                                                {
                                                                        if (((part.y[0] < lYAxis->getRange().getMax()) && (part.y[1] < lYAxis->getRange().getMax())) ||
                                                                                ((part.y[0] > lYAxis->getRange().getMin()) && (part.y[1] < lYAxis->getRange().getMin())))
                                                                        {
                                                                                continue;
                                                                        }
                                                                }
                                                                else
                                                                {
                                                                        if (((part.y[0] < lYAxis->getRange().getMin()) && (part.y[1] < lYAxis->getRange().getMin())) ||
                                                                                ((part.y[0] > lYAxis->getRange().getMax()) && (part.y[1] < lYAxis->getRange().getMax())))
                                                                        {
                                                                                continue;
                                                                        }
                                                                }

                                                                for (int i = 0; i < nbValues - 1; ++i)
                                                                {
                                                                        part.x[0] = data.getTimes()[startIndex + i];
                                                                        part.x[1] = data.getTimes()[startIndex + i + 1];
                                                                        part.isColorIndex = false;
                                                                        part.value = data.getValues(index, startIndex)[i];
                                                                        matrixGrid.push_back(part);
                                                                }
                                                        
                                                                //Apply background subtraction
                                                                applyBackgroundSubtraction(matrixGrid, pSauvaud, data);
                                                                //draw sauvaud
                                                                LOG4CXX_DEBUG(gLogger, "TimePlot::drawSauvaud - Draw data grid - " << matrixGrid.size());
                                                                std::string normalization = pSauvaud.getNormalization();
                                                                if (!normalization.empty())
                                                                        normalize(matrixGrid, normalization);
                                                                drawMatrix(matrixGrid, pSauvaud.getMin(), pSauvaud.getMax(),
                                                                                   minValColor, maxValColor, lZAxis->_color._colorMapIndex, pSauvaud.getUseLog0AsMin());
                                                                matrixGrid.clear();
                                                                }
                                                        
		          }else{
                                                            //Variable table
                                                            AMDA::Info::t_TableBound crtBound;
                                                            int startIndex;
                                                            int nbValues;
                                                            data.getIntervalBounds(startDate, stopDate, startIndex, nbValues);
                                                            for (int i = 0; i < nbValues - 1; ++i)
                                                            {
                                                                    GridPart part;
                                                                    part.x[0] = data.getTimes()[startIndex + i];
                                                                    part.x[1] = data.getTimes()[startIndex + i + 1];

                                                                    std::map<std::string, std::vector<double>> paramsTableData;
                                                                    for (std::map<std::string, std::string>::iterator it = pSauvaud.getTableParams().begin(); it != pSauvaud.getTableParams().end(); ++it)
                                                                    {
                                                                            ParameterData &tableData = (*_pParameterValues)[it->second];
                                                                            std::vector<double> paramTableValues;
                                                                            for (int j = 0; j < tableData.getDim1Size(); ++j)
                                                                            {
                                                                                    double *values = tableData.getValues(AMDA::Common::ParameterIndexComponent(j, -1), i);
                                                                                    paramTableValues.push_back((*values));
                                                                            }
                                                                            paramsTableData[it->first] = paramTableValues;
                                                                    }

                                                                    for (auto index : pSauvaud.getIndexesByIndex(spectroIndex, leftDim))
                                                                    {
                                                                            part.isColorIndex = false;
                                                                            part.value = data.getValues(index, startIndex)[i];

                                                                            if (rightDim == 0)
                                                                                    crtBound = rightTableSPtr->getBound(&_parameterManager, index.getDim1Index(), &paramsTableData);
                                                                            else
                                                                                    crtBound = rightTableSPtr->getBound(&_parameterManager, index.getDim2Index(), &paramsTableData);

                                                                            part.y[0] = crtBound.min;
                                                                            part.y[1] = crtBound.max;

                                                                            if (!std::isnan(crtBound.min) && !std::isnan(crtBound.max))
                                                                            {
                                                                                    if (lYAxis->_scale == Axis::Scale::LOGARITHMIC)
                                                                                    {
                                                                                            if ((crtBound.min > 0) && (crtBound.max > 0))
                                                                                            {
                                                                                                    part.y[0] = log10(part.y[0]);
                                                                                                    part.y[1] = log10(part.y[1]);
                                                                                                    matrixGrid.push_back(part);
                                                                                            }
                                                                                    }
                                                                                    else
                                                                                            matrixGrid.push_back(part);
                                                                            }
                                                                    
                                                                    //draw sauvaud
                                                                    LOG4CXX_DEBUG(gLogger, "TimePlot::drawSauvaud - Draw data grid - " << matrixGrid.size());
                                                                    std::string normalization = pSauvaud.getNormalization();
                                                                    if (!normalization.empty())
                                                                            normalize(matrixGrid, normalization);
                                                                    drawMatrix(matrixGrid, pSauvaud.getMin(), pSauvaud.getMax(),
                                                                                       minValColor, maxValColor, lZAxis->_color._colorMapIndex, pSauvaud.getUseLog0AsMin());
                                                                    matrixGrid.clear();
                                                            }
                                                 }                   
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1643
		}
b0205fd9   Hacene SI HADJ MOHAND   plot ok reste que...
1644
                                     }
9aec59c6   Hacene SI HADJ MOHAND   inverted table in...
1645
1646
1647
1648
1649
1650
1651
1652
1653
                                        // draw legend
                                        std::string plotLabel = "  "+leftTableSPtr ->getName(&_parameterManager);
                                        plotLabel = plotLabel + "\n ["+leftTableSPtr ->getUnits(&_parameterManager)+"]";
                                                
                                        Label label(lYAxis->_legend.getFont(), lYAxis->_legend.getColor());
                                        label._text = plotLabel;
                                        lYAxis->_legend.setLabel(label);
                                                   
                                        PanelPlotOutput::drawSauvaud(startDate, stopDate, pParamId, pSauvaud, leftDimSize, leftDimSize, "");
736a40f7   Hacene SI HADJ MOHAND   configureSauvaudAxis
1654
1655
1656
	}
        
        
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1657
1658
1659
1660
1661
1662

	void TimePlot::applyBackgroundSubtraction(MatrixGrid &matrixGrid, SpectroProperties &pSpectro, ParameterData &data)
	{
		//We get the background subtraction value given by the user
		const double backgroundSubValue = pSpectro.getBackgroundSubValue();

9e7f1f63   Menouard AZIB   Remplacer les str...
1663
1664
1665
		//If negative value then quit and do nothing
		if (backgroundSubValue < 0)
			return;
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1666
1667
1668

		const int len = matrixGrid.size();
		//Channel subtraction
9e7f1f63   Menouard AZIB   Remplacer les str...
1669
		if (pSpectro.getBackgroundSubType() == SpectroProperties::BackgroundSubType::BYCHANNEL)
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
		{
			int indexChannelDim1 = -1;
			int indexChannelDim2 = -1;

			//The selected dimension of the background subtraction
			if (pSpectro.getBackgroundSubDim() == 0)
				indexChannelDim1 = (int)backgroundSubValue;
			else
				indexChannelDim2 = (int)backgroundSubValue;

			//Get the values which corresponds to the selected channel
			double *values = data.getValues(AMDA::Common::ParameterIndexComponent(indexChannelDim1, indexChannelDim2), 0);
			//Apply the subtraction
			for (int i = 0; i < len; i++)
				matrixGrid[i].value -= values[i];
		}
		//Fixed value substraction
9e7f1f63   Menouard AZIB   Remplacer les str...
1687
		else if (pSpectro.getBackgroundSubType() == SpectroProperties::BackgroundSubType::FIXEDVALUE)
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1688
1689
1690
1691
1692
1693
1694
1695
		{
			for (int i = 0; i < len; i++)
				matrixGrid[i].value -= backgroundSubValue;
		}
		else
		{
			std::stringstream lError;
			lError << "Unknown background substracion type "
9e7f1f63   Menouard AZIB   Remplacer les str...
1696
				   << pSpectro.getBackgroundSubType();
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
			BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
		}

		return;
	}

	void TimePlot::normalize(MatrixGrid &matrixGrid, std::string normalizationType)
	{
		if (normalizationType == "none")
			return;
		double min = DBL_MAX;
		double max = DBL_MIN;
		int len = matrixGrid.size();
		if (normalizationType == "log")
		{
			for (auto val : matrixGrid)
			{
				if (val.value < min && val.value > 0)
					min = val.value;
				if (val.value > max)
					max = val.value;
			}
		}
		else
		{
			for (auto val : matrixGrid)
			{
				if (val.value < min)
					min = val.value;
				if (val.value > max)
					max = val.value;
			}
		}
		if (std::isnan(min) || std::isnan(max))
		{
			return;
		}
		else if (min == max)
		{
			for (int i = 0; i < len; i++)
				matrixGrid[i].value = matrixGrid[i].value / max;
		}
		else
		{
			if (normalizationType == "log")
			{
				for (int i = 0; i < len; i++)
					matrixGrid[i].value = (std::log10(matrixGrid[i].value) - std::log10(min)) / (std::log10(max) - std::log10(min));
				return;
			}
			else if (normalizationType == "linear")
			{
				for (int i = 0; i < len; i++)
					matrixGrid[i].value = (matrixGrid[i].value - min) / (max - min);
				return;
			}
			else
			{
				std::stringstream lError;
				lError << "Unknwon normalization " << normalizationType;
				BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
			}
		}
	}

	Color TimePlot::getStatusColor(AMDA::Info::ParamInfoSPtr &paramInfo, double value)
	{
		Color color;

		if ((paramInfo != nullptr) && !paramInfo->getStatusDef().empty())
		{
			for (int s = 0; s < (int)paramInfo->getStatusDef().size(); ++s)
			{
				if (value >= paramInfo->getStatusDef()[s].getMinValue() && value <= paramInfo->getStatusDef()[s].getMaxValue())
				{
					if (!paramInfo->getStatusDef()[s].getColor().empty())
					{
						std::string colorStr = paramInfo->getStatusDef()[s].getColor();
						createColor(color, colorStr);
						return color;
					}
677db865   Benjamin Renard   Draw intervals on...
1778
1779
1780
				}
			}
		}
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1781
1782

		return color;
677db865   Benjamin Renard   Draw intervals on...
1783
1784
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1785
1786
1787
1788
1789
1790
	void TimePlot::drawOneInterval(double tmin, double tmax, Color color)
	{
		if (!color.isSet())
		{
			return;
		}
677db865   Benjamin Renard   Draw intervals on...
1791

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
		//Fill interval
		PanelPlotOutput::drawRectangle(tmin, tmax, 0., 1., color, 0.25);

		//Draw borders
		PLFLT x[2], y[2];
		x[0] = tmin;
		y[0] = 0.;
		x[1] = tmin;
		y[1] = 1.;
		PanelPlotOutput::drawLines(LineType::LINE, LineStyle::PLAIN, 2, color, 2, x, y);

		x[0] = tmax;
		y[0] = 0.;
		x[1] = tmax;
		y[1] = 1.;
		PanelPlotOutput::drawLines(LineType::LINE, LineStyle::PLAIN, 2, color, 2, x, y);
677db865   Benjamin Renard   Draw intervals on...
1808
1809
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1810
1811
1812
1813
1814
1815
	void TimePlot::drawIntervals(double startDate, double stopDate, std::string pParamId,
								 IntervalsProperties &pIntervals)
	{
		LOG4CXX_DEBUG(gLogger, "TimePlot::drawIntervals Drawing intervals for parameter " << pParamId);
		// This will configure window, draw axes (if needed) and legend of axes.
		PanelPlotOutput::drawIntervals(startDate, stopDate, pParamId, pIntervals);
e257cfb9   Benjamin Renard   First implementat...
1816

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1817
		PlWindow lPlWindow = PlWindow(getTimeAxis()->getRange().getMin(), getTimeAxis()->getRange().getMax(), 0, 1);
e257cfb9   Benjamin Renard   First implementat...
1818

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1819
1820
		_pls->wind(std::get<0>(lPlWindow), std::get<1>(lPlWindow),
				   std::get<2>(lPlWindow), std::get<3>(lPlWindow));
677db865   Benjamin Renard   Draw intervals on...
1821

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1822
		ParameterData &data = (*_pParameterValues)[pIntervals.getParamId()];
677db865   Benjamin Renard   Draw intervals on...
1823

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1824
1825
1826
1827
		ParameterSPtr p = _parameterManager.getParameter(pIntervals.getParamId());
		AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId());

		//get computed values
17074cf0   Benjamin Renard   Merge amdadev int...
1828
		int startIndex, nbData = 0;
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
		data.getIntervalBounds(startDate, stopDate, startIndex, nbData);

		Color crtColor;

		// Draw intervals
		double crtVal = NAN;
		double tmin = 0, tmax = 0;
		for (int i = 0; i < nbData - 1; ++i)
		{
			double t1 = data.getTimes()[startIndex + i];
			double t2 = data.getTimes()[startIndex + i + 1];
			double v = *data.getValues(AMDA::Common::ParameterIndexComponent(-1, -1), startIndex + i);

			if (isNAN(crtVal))
			{
				tmin = t1;
				tmax = t2;
				crtVal = v;
				continue;
			}
			else if (crtVal == v)
			{
				tmax = t2;
				continue;
			}

e803aecf   Erdogan Furkan   7616 - Adding mod...
1855
			crtColor = pIntervals.getColor();
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867

			drawOneInterval(tmin, tmax, crtColor);

			tmin = t1;
			tmax = t2;
			crtVal = v;
			crtColor = Color();
		}

		//Draw last interval if need
		if ((tmin != tmax) && !isNAN(crtVal))
		{
e803aecf   Erdogan Furkan   7616 - Adding mod...
1868
			crtColor = pIntervals.getColor();
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1869
1870
			drawOneInterval(tmin, tmax, crtColor);
		}
4de2b52c   Benjamin Renard   Fix some tests + ...
1871
	}
e257cfb9   Benjamin Renard   First implementat...
1872

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1873
	/**
fbe3c2bb   Benjamin Renard   First commit
1874
1875
 * @brief Draw further information (for instance start date).
 */
fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1876
1877
1878
	void TimePlot::drawStartDate(TimeAxis *pXAxis, double startTime, double stopTime)
	{
		LOG4CXX_DEBUG(gLogger, "Drawing start date.");
fbe3c2bb   Benjamin Renard   First commit
1879

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1880
1881
		if (pXAxis->_showTickMark == false || !pXAxis->_drawn || !pXAxis->_visible)
			return;
fbe3c2bb   Benjamin Renard   First commit
1882

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1883
		// use panel font to draw start date.
fbe3c2bb   Benjamin Renard   First commit
1884

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1885
1886
		// If font of legend is not defined, use panel font.
		Font font(_panel->getFont());
fbe3c2bb   Benjamin Renard   First commit
1887

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
		// PlPlotUtil::setPlFont(font);
		//CharSize charsize = PlPlotUtil::getCharacterSizeInPlPage(_panel->_page);
		// panel bounds.
		Bounds lPanelBounds(_panel->getBoundsInPlPage());

		// plotting area bounds (i.e. current viewport dimensions)
		PLFLT lXMin, lXMax, lYMin, lYMax;
		_pls->gvpd(lXMin, lXMax, lYMin, lYMax);

		// position of reference point of string along the bottom edge
		// expressed as a fraction of the length of the bottom edge
		// set it at the very beginning of edge and use justification to handle
		// reverse axis.
		float lPosition = 0.0;
		// display it one line above the main panel bottom border :
		float disp = -1;

		long int lTime = static_cast<long int>(startTime);
		tm *lTimeTm = gmtime(&lTime);
		char lTimeChr[80];

		// Format date.
		strftime(lTimeChr, 80,
				 getPlStartTimeFormat(pXAxis->_timeFormat,
									  startTime,
									  stopTime)
					 .c_str(),
				 lTimeTm);

		PLFLT mxmin, mxmax, mymin, mymax;
		plgspa(&mxmin, &mxmax, &mymin, &mymax);
		float x_subpage_per_mm = 1. / (mxmax - mxmin);

		LOG4CXX_DEBUG(gLogger, "Start date to draw : " << lTimeChr);

		// Set font
		PlPlotUtil::setPlFont(font);

		PLFLT dateWidthInMm;
		dateWidthInMm = plstrl(lTimeChr);

		// set viewport for start date :
		_pls->vpor(lXMin, lXMax, lPanelBounds._y, lPanelBounds._y + lPanelBounds._height);

		// Draw start date.
		if (pXAxis->_reverse)
		{
			lPosition = 1.;
			if (dateWidthInMm * x_subpage_per_mm > lPanelBounds._x + lPanelBounds._width - lXMax)
				lPosition = 1. - (dateWidthInMm * x_subpage_per_mm - (lPanelBounds._x + lPanelBounds._width - lXMax)) / (lXMax - lXMin);
			_pls->mtex("b", disp, lPosition, 0., lTimeChr);
		}
		else
		{
			lPosition = 0.;
			if (dateWidthInMm * x_subpage_per_mm > lXMin - lPanelBounds._x)
				lPosition = (dateWidthInMm * x_subpage_per_mm - lXMin + lPanelBounds._x) / (lXMax - lXMin);
			_pls->mtex("b", disp, lPosition, 1., lTimeChr);
		}

		// restore viewport :
		_pls->vpor(lXMin, lXMax, lYMin, lYMax);
fbe3c2bb   Benjamin Renard   First commit
1950
1951
	}

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
	const std::string TimePlot::getXAxisId() const
	{
		// time plot can manage only one x axis.
		// search for its id
		for (auto param : _parameterAxesList)
		{
			//search time axis in color serie if exist
			if (!param.getYSeriePropertiesList().empty())
				return param.getYSeriePropertiesList().begin()->getXAxisId();
			//search time axis in spectro if exist
			if (param.getSpectroProperties() != nullptr)
				return param.getSpectroProperties()->getXAxisId();
		}
fbe3c2bb   Benjamin Renard   First commit
1965

fe6b6521   Menouard AZIB   J'ai ajouté le tr...
1966
1967
		return DefaultPlotConfiguration::TIME_DEFAULT_ID;
	}
fbe3c2bb   Benjamin Renard   First commit
1968
1969

} /* namespace plot */