update spec

Author: cate-to

agrolib/project/project.cpp

@@ -4668,7 +4668,7 @@ bool Project::setMarkedFromPointList(QString fileName)
     return true;
 }
 
-bool Project::setMarkedPointsOfMacroArea(int areaNumber)
+bool Project::setMarkedPointsOfMacroArea(int areaNumber, bool viewNotActivePoints)
 {
     for (int i = 0; i < nrMeteoPoints; i++)
     {
@@ -4686,7 +4686,8 @@ bool Project::setMarkedPointsOfMacroArea(int areaNumber)
 
     for (int j = 0; j < pointList.size(); j++)
     {
-        meteoPoints[pointList[j]].marked = true;
+        if (meteoPoints[pointList[j]].active || viewNotActivePoints)
+            meteoPoints[pointList[j]].marked = true;
     }
 
     return true;

agrolib/project/project.h

@@ -308,7 +308,7 @@
         bool setActiveStateWithCriteria(bool isActive);
         bool setSelectedStateWithCriteria();
         bool setMarkedFromPointList(QString fileName);
-        bool setMarkedPointsOfMacroArea(int areaNumber);
+        bool setMarkedPointsOfMacroArea(int areaNumber, bool viewNotActivePoints);
         bool deleteMeteoPoints(const QList<QString>& pointList);
         bool deleteMeteoPointsData(const QList<QString>& pointList);
         bool loadOutputPointList(QString fileName);

fedora/SPECS/PRAGA.spec

@@ -1,4 +1,4 @@
-%global releaseno 1
+%global releaseno 2
 
 # Note: define srcarchivename in CI build only.
 %{!?srcarchivename: %global srcarchivename %{name}-%{version}-%{releaseno}}
@@ -57,6 +57,9 @@ cp -a src/PRAGA %{buildroot}/%{_bindir}/
 
 
 %changelog
+* Mon Mar 10 2025 Caterina Toscano <ctoscano@arpae.it> - 2.0.3-2
+- Release 2.0.3
+
 * Mon Mar 10 2025 Caterina Toscano <ctoscano@arpae.it> - 2.0.3-1
 - Release 2.0.3
 

src/mainWindow.cpp

@@ -536,7 +536,7 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
 
                         if (selection == markMacroAreaStations)
                         {
-                            myProject.setMarkedPointsOfMacroArea(int(gis::getValueFromXY(*(myProject.interpolationSettings.getMacroAreasMap()), myUtm.x, myUtm.y)));
+                            myProject.setMarkedPointsOfMacroArea(int(gis::getValueFromXY(*(myProject.interpolationSettings.getMacroAreasMap()), myUtm.x, myUtm.y)), viewNotActivePoints);
                             redrawMeteoPoints(currentPointsVisualization, true);
                         }
                         else if (selection == addMacroAreaLR)
@@ -607,7 +607,7 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
 
                     if (selection == markMacroAreaStations)
                     {
-                        myProject.setMarkedPointsOfMacroArea(int(gis::getValueFromXY(*(myProject.interpolationSettings.getMacroAreasMap()), myUtm.x, myUtm.y)));
+                        myProject.setMarkedPointsOfMacroArea(int(gis::getValueFromXY(*(myProject.interpolationSettings.getMacroAreasMap()), myUtm.x, myUtm.y)), viewNotActivePoints);
                         redrawMeteoPoints(currentPointsVisualization, true);
                     }
                     else if (selection == addMacroAreaLR)
@@ -7077,7 +7077,7 @@ void MainWindow::on_actionMark_macro_area_stations_triggered()
 
     if (! isValid)
         myProject.logError("Invalid number: " + numberString);
-    myProject.setMarkedPointsOfMacroArea(areaNr);
+    myProject.setMarkedPointsOfMacroArea(areaNr, viewNotActivePoints);
 
     redrawMeteoPoints(currentPointsVisualization, true);