Skip to content

Commit a828f23

Browse files
committed
update proxy graph y-axis
1 parent 7e79516 commit a828f23

File tree

3 files changed

+46
-14
lines changed

3 files changed

+46
-14
lines changed

DATA/PROJECT/test/SETTINGS/parameters.ini

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ aggregationMethod=AVG
1919
algorithm=idw
2020
lapseRateCode=true
2121
minRegressionR2=0.1
22-
optimalDetrending=true
22+
optimalDetrending=false
2323
thermalInversion=true
2424
topographicDistance=false
2525
useDewPoint=true
2626
useInterpolationTemperatureForRH=true
2727
topographicDistanceMaxMultiplier=128
2828
dynamicLapserate=false
2929
meteogrid_upscalefromdem=true
30-
localDetrending=false
30+
localDetrending=true
3131
glocalDetrending=false
32-
multipleDetrending=false
32+
multipleDetrending=true
3333
min_points_local_detrending=20
3434
doNotRetrend=false
3535
retrendOnly=false
@@ -52,8 +52,8 @@ field=altitude
5252
order=1
5353
table=point_properties
5454
use_for_spatial_quality_control=true
55-
fitting_parameters_min=0, -3.50001, 0.002, -0.01
56-
fitting_parameters_max=2500, 13, 0.007, -0.0015
55+
fitting_parameters_min=0, -22, 0.002, -0.01
56+
fitting_parameters_max=2500, 46, 0.007, -0.0015
5757
fitting_first_guess=0, 1, 1, 1
5858
fitting_function=double_piecewise
5959

agrolib/proxyWidget/proxyWidget.cpp

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "dialogChangeAxis.h"
12
#include "meteo.h"
23
#include "proxyWidget.h"
34
#include "utilities.h"
@@ -9,6 +10,8 @@
910

1011
#include <QLayout>
1112
#include <QDate>
13+
#include <QColorDialog>
14+
1215

1316

1417
Crit3DProxyWidget::Crit3DProxyWidget(Crit3DInterpolationSettings* interpolationSettings, Crit3DMeteoPoint *meteoPoints, int nrMeteoPoints, frequencyType currentFrequency, QDate currentDate, int currentHour, Crit3DQuality *quality, Crit3DInterpolationSettings* SQinterpolationSettings, Crit3DMeteoSettings *meteoSettings, Crit3DClimateParameters *climateParam, bool checkSpatialQuality, int macroAreaNumber)
@@ -18,7 +21,10 @@ Crit3DProxyWidget::Crit3DProxyWidget(Crit3DInterpolationSettings* interpolationS
1821
this->resize(1024, 700);
1922
this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
2023
this->setAttribute(Qt::WA_DeleteOnClose);
21-
24+
25+
//maxEnsembleLine = NODATA;
26+
//minEnsembleLine = -NODATA;
27+
2228
// layout
2329
QVBoxLayout *mainLayout = new QVBoxLayout();
2430
QGroupBox *horizontalGroupBox = new QGroupBox();
@@ -130,7 +136,10 @@ Crit3DProxyWidget::Crit3DProxyWidget(Crit3DInterpolationSettings* interpolationS
130136
QMenuBar* menuBar = new QMenuBar();
131137
QMenu *editMenu = new QMenu("Edit");
132138
QAction* updateStations = new QAction(tr("&Update"), this);
139+
QAction* changeLeftAxis = new QAction(tr("&Change axis left"), this);
140+
133141
editMenu->addAction(updateStations);
142+
editMenu->addAction(changeLeftAxis);
134143

135144
menuBar->addMenu(editMenu);
136145
mainLayout->setMenuBar(menuBar);
@@ -143,6 +152,8 @@ Crit3DProxyWidget::Crit3DProxyWidget(Crit3DInterpolationSettings* interpolationS
143152
connect(&modelLR, &QCheckBox::toggled, [=](int toggled){ this->modelLRClicked(toggled); });
144153
connect(&detrended, &QCheckBox::toggled, [=](){ this->plot(); });
145154
connect(updateStations, &QAction::triggered, this, [=](){ this->plot(); });
155+
connect(changeLeftAxis, &QAction::triggered, this, &Crit3DProxyWidget::on_actionChangeLeftAxis);
156+
146157

147158
if (currentFrequency != noFrequency)
148159
{
@@ -548,6 +559,20 @@ void Crit3DProxyWidget::modelLRClicked(int toggled)
548559
}
549560
}
550561

562+
void Crit3DProxyWidget::on_actionChangeLeftAxis()
563+
{
564+
565+
DialogChangeAxis changeAxisDialog(1, false);
566+
if (changeAxisDialog.result() == QDialog::Accepted)
567+
{
568+
//axisY_sx->setMin(changeAxisDialog.getMinVal());
569+
//axisY_sx->setMax(changeAxisDialog.getMaxVal());
570+
chartView->axisY->setMin(floor(changeAxisDialog.getMinVal()));
571+
chartView->axisY->setMax(ceil(changeAxisDialog.getMaxVal()));
572+
}
573+
}
574+
575+
551576
void Crit3DProxyWidget::addMacroAreaLR()
552577
{
553578
//controllo is glocal ready viene fatto a monte

agrolib/proxyWidget/proxyWidget.h

+15-8
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
public:
1616
Crit3DProxyWidget(Crit3DInterpolationSettings* interpolationSettings, Crit3DMeteoPoint* meteoPoints, int nrMeteoPoints, frequencyType currentFrequency, QDate currentDate, int currentHour, Crit3DQuality* quality, Crit3DInterpolationSettings* SQinterpolationSettings, Crit3DMeteoSettings *meteoSettings, Crit3DClimateParameters *climateParam, bool checkSpatialQuality, int macroAreaNumber);
17-
~Crit3DProxyWidget();
18-
void closeEvent(QCloseEvent *event);
17+
~Crit3DProxyWidget() override;
18+
void closeEvent(QCloseEvent *event) override;
1919
void updateDateTime(QDate newDate, int newHour);
2020
void updateFrequency(frequencyType newFrequency);
2121
void changeProxyPos(const QString proxyName);
@@ -26,18 +26,25 @@
2626
void addMacroAreaLR();
2727

2828
private:
29+
30+
int nrMeteoPoints;
31+
bool checkSpatialQuality;
32+
int currentHour;
33+
int proxyPos;
34+
int macroAreaNumber;
35+
36+
std::vector <Crit3DInterpolationDataPoint> outInterpolationPoints;
2937
Crit3DInterpolationSettings* interpolationSettings;
3038
Crit3DQuality* quality;
3139
Crit3DInterpolationSettings* SQinterpolationSettings;
3240
Crit3DMeteoSettings *meteoSettings;
3341
Crit3DMeteoPoint* meteoPoints;
3442
Crit3DClimateParameters *climateParam;
35-
int nrMeteoPoints;
36-
bool checkSpatialQuality;
43+
3744
frequencyType currentFrequency;
3845
QDate currentDate;
39-
int currentHour;
40-
std::vector <Crit3DInterpolationDataPoint> outInterpolationPoints;
46+
47+
QValueAxis *axisY_sx;
4148
QComboBox comboVariable;
4249
QComboBox comboAxisX;
4350
QCheckBox detrended;
@@ -47,11 +54,11 @@
4754
QTextEdit lapseRate;
4855
ChartView *chartView;
4956
meteoVariable myVar;
50-
int proxyPos;
51-
int macroAreaNumber;
5257

5358
Crit3DTime getCurrentTime();
5459

60+
void on_actionChangeLeftAxis();
61+
5562
signals:
5663
void closeProxyWidget();
5764
};

0 commit comments

Comments
 (0)