Merge commit '943c9329ee8cd90d42a6b2001c1b6d357ff758b4'

ftomei · ftomei · commit f9e5c415d5cf · 2025-03-28T18:40:35.000+01:00
diff --git a/agrolib/meteoWidget/meteoWidget.cpp b/agrolib/meteoWidget/meteoWidget.cpp
@@ -3091,8 +3091,8 @@ void Crit3DMeteoWidget::on_actionAddStation()
         QString station = stationId+"_"+stationsName;
         allStations << station;
     }
+    DialogAddStation selectStation(allStations);
 
-    DialogAddStation dialogAddStation(allStations, _allMeteoPointsPointer, _meteoPoints);
 }
 
 void Crit3DMeteoWidget::on_actionInfoPoint()
diff --git a/agrolib/meteoWidget/meteoWidget.h b/agrolib/meteoWidget/meteoWidget.h
@@ -23,7 +23,7 @@
             void setIsEnsemble(bool value);
             bool getIsEnsemble() { return _isEnsemble; }
             void setNrMembers(int value) { _nrMembers = value; }
-            void setAllMeteoPointsPointer(Crit3DMeteoPoint* pointer, int nrAllMeteoPoints) { _allMeteoPointsPointer = pointer; _nrAllMeteoPoints = nrAllMeteoPoints;}
+            void setAllMeteoPointsPointer(Crit3DMeteoPoint* pointer) { _allMeteoPointsPointer = pointer; }
 
             void setFrequency(frequencyType frequency);
 
@@ -44,8 +44,6 @@
             bool _isEnsemble;
             bool _isInitialized;
             int _nrMembers;
-            int _nrAllMeteoPoints;
-
 
             QVector<Crit3DMeteoPoint> _meteoPoints;
             QVector<Crit3DMeteoPoint> _meteoPointsEnsemble;
diff --git a/agrolib/project/project.cpp b/agrolib/project/project.cpp
@@ -4173,7 +4173,7 @@ void Project::showMeteoWidgetPoint(std::string idMeteoPoint, std::string namePoi
             meteoWidgetId = 0;
         }
         meteoWidgetPoint->setMeteoWidgetID(meteoWidgetId);
-        meteoWidgetPoint->setAllMeteoPointsPointer(meteoPoints, nrMeteoPoints);
+        meteoWidgetPoint->setAllMeteoPointsPointer(meteoPoints);
         meteoWidgetPointList.append(meteoWidgetPoint);
         QObject::connect(meteoWidgetPoint, SIGNAL(closeWidgetPoint(int)), this, SLOT(deleteMeteoWidgetPoint(int)));
         meteoPointsDbHandler->loadDailyData(getCrit3DDate(firstDaily), getCrit3DDate(lastDaily), mp);

Original file line number	Diff line number	Diff line change
`@@ -3091,8 +3091,8 @@ void Crit3DMeteoWidget::on_actionAddStation()`
`3091`	`3091`	`QString station = stationId+"_"+stationsName;`
`3092`	`3092`	`allStations << station;`
`3093`	`3093`	`}`
	`3094`	`+ DialogAddStation selectStation(allStations);`
`3094`	`3095`
`3095`		`- DialogAddStation dialogAddStation(allStations, _allMeteoPointsPointer, _meteoPoints);`
`3096`	`3096`	`}`
`3097`	`3097`
`3098`	`3098`	`void Crit3DMeteoWidget::on_actionInfoPoint()`
Original file line number	Diff line number	Diff line change
`@@ -4173,7 +4173,7 @@ void Project::showMeteoWidgetPoint(std::string idMeteoPoint, std::string namePoi`
`4173`	`4173`	`meteoWidgetId = 0;`
`4174`	`4174`	`}`
`4175`	`4175`	`meteoWidgetPoint->setMeteoWidgetID(meteoWidgetId);`
`4176`		`- meteoWidgetPoint->setAllMeteoPointsPointer(meteoPoints, nrMeteoPoints);`
	`4176`	`+ meteoWidgetPoint->setAllMeteoPointsPointer(meteoPoints);`
`4177`	`4177`	`meteoWidgetPointList.append(meteoWidgetPoint);`
`4178`	`4178`	`QObject::connect(meteoWidgetPoint, SIGNAL(closeWidgetPoint(int)), this, SLOT(deleteMeteoWidgetPoint(int)));`
`4179`	`4179`	`meteoPointsDbHandler->loadDailyData(getCrit3DDate(firstDaily), getCrit3DDate(lastDaily), mp);`