From 6522cea03f0c5cdbd5e615cd39f30bc88315a0d9 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr> Date: Fri, 27 Oct 2023 14:20:38 +0200 Subject: [PATCH] pamhyr: Set axis label color to 'black' instead 'green'. --- src/View/Frictions/PlotStricklers.py | 4 ++-- src/View/Geometry/PlotAC.py | 8 ++++---- src/View/Geometry/PlotKPZ.py | 4 ++-- src/View/Geometry/PlotXY.py | 4 ++-- src/View/InitialConditions/PlotDKP.py | 4 ++-- src/View/InitialConditions/PlotDischarge.py | 4 ++-- src/View/Results/CustomPlot/Plot.py | 6 +++--- src/View/Results/PlotAC.py | 4 ++-- src/View/Results/PlotH.py | 4 ++-- src/View/Results/PlotKPC.py | 4 ++-- src/View/Results/PlotSedProfile.py | 4 ++-- src/View/Results/PlotSedReach.py | 4 ++-- src/View/Results/PlotXY.py | 4 ++-- src/View/SedimentLayers/Edit/Plot.py | 2 +- src/View/SedimentLayers/Reach/Plot.py | 4 ++-- src/View/SedimentLayers/Reach/Profile/Plot.py | 4 ++-- src/View/Tools/Plot/PamhyrCanvas.py | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/View/Frictions/PlotStricklers.py b/src/View/Frictions/PlotStricklers.py index a65ae896..2f180e68 100644 --- a/src/View/Frictions/PlotStricklers.py +++ b/src/View/Frictions/PlotStricklers.py @@ -68,11 +68,11 @@ class PlotStricklers(PamhyrPlot): self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Stricklers"), - color='green', fontsize=11 + color='black', fontsize=11 ) self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "Kp (m)"), - color='green', fontsize=11 + color='black', fontsize=11 ) kp = self.data.reach.get_kp() diff --git a/src/View/Geometry/PlotAC.py b/src/View/Geometry/PlotAC.py index 7cc75184..d5ffd32f 100644 --- a/src/View/Geometry/PlotAC.py +++ b/src/View/Geometry/PlotAC.py @@ -72,11 +72,11 @@ class PlotAC(PamhyrPlot): self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "Transverse abscissa (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Height (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.figure.tight_layout() @@ -176,11 +176,11 @@ class PlotAC(PamhyrPlot): self.canvas.axes.grid(color='grey', linestyle='--', linewidth=0.5) self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "Abscisse en travers (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Cote (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.figure.tight_layout() diff --git a/src/View/Geometry/PlotKPZ.py b/src/View/Geometry/PlotKPZ.py index 79fbfe05..6825abfa 100644 --- a/src/View/Geometry/PlotKPZ.py +++ b/src/View/Geometry/PlotKPZ.py @@ -64,11 +64,11 @@ class PlotKPZ(PamhyrPlot): self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "Kp (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Height (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) kp = self.data.get_kp() diff --git a/src/View/Geometry/PlotXY.py b/src/View/Geometry/PlotXY.py index fcd55ecc..9aba4652 100644 --- a/src/View/Geometry/PlotXY.py +++ b/src/View/Geometry/PlotXY.py @@ -65,11 +65,11 @@ class PlotXY(PamhyrPlot): # Axes self.canvas.axes.set_xlabel( _translate("Geometry", "X (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("Geometry", "Y (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.axis("equal") diff --git a/src/View/InitialConditions/PlotDKP.py b/src/View/InitialConditions/PlotDKP.py index b81e4cdf..ad854fb4 100644 --- a/src/View/InitialConditions/PlotDKP.py +++ b/src/View/InitialConditions/PlotDKP.py @@ -37,11 +37,11 @@ class PlotDKP(PamhyrPlot): self.canvas.axes.set_ylabel( self._trad["elevation"], - color='green', fontsize=11 + color='black', fontsize=11 ) self.canvas.axes.set_xlabel( self._trad["kp"], - color='green', fontsize=11 + color='black', fontsize=11 ) kp = self.data.reach.reach.get_kp() diff --git a/src/View/InitialConditions/PlotDischarge.py b/src/View/InitialConditions/PlotDischarge.py index 0f918501..b5a69d5c 100644 --- a/src/View/InitialConditions/PlotDischarge.py +++ b/src/View/InitialConditions/PlotDischarge.py @@ -31,11 +31,11 @@ class PlotDischarge(PamhyrPlot): self.canvas.axes.set_ylabel( self._trad["discharge"], - color='green', fontsize=11 + color='black', fontsize=11 ) self.canvas.axes.set_xlabel( self._trad["kp"], - color='green', fontsize=11 + color='black', fontsize=11 ) kp = self.data.reach.reach.get_kp() diff --git a/src/View/Results/CustomPlot/Plot.py b/src/View/Results/CustomPlot/Plot.py index 06f911a2..80dcf550 100644 --- a/src/View/Results/CustomPlot/Plot.py +++ b/src/View/Results/CustomPlot/Plot.py @@ -292,12 +292,12 @@ class CustomPlot(PamhyrPlot): self.canvas.axes.set_xlabel( self._trad[self._x], - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( self._trad[self._y_axes[0]], - color='green', fontsize=10 + color='black', fontsize=10 ) for axes in self._y_axes[1:]: @@ -307,7 +307,7 @@ class CustomPlot(PamhyrPlot): ax_new = self.canvas.axes.twinx() ax_new.set_ylabel( self._trad[axes], - color='green', fontsize=10 + color='black', fontsize=10 ) self._axes[axes] = ax_new diff --git a/src/View/Results/PlotAC.py b/src/View/Results/PlotAC.py index 345b5824..16c3b93c 100644 --- a/src/View/Results/PlotAC.py +++ b/src/View/Results/PlotAC.py @@ -61,11 +61,11 @@ class PlotAC(PamhyrPlot): self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "X (m)"), - color='green', fontsize=11 + color='black', fontsize=11 ) self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Elevation (m)"), - color='green', fontsize=11 + color='black', fontsize=11 ) reach = self.results.river.reach(self._current_reach_id) diff --git a/src/View/Results/PlotH.py b/src/View/Results/PlotH.py index a6184e21..234e5642 100644 --- a/src/View/Results/PlotH.py +++ b/src/View/Results/PlotH.py @@ -82,11 +82,11 @@ class PlotH(PamhyrPlot): # Axes self.canvas.axes.set_xlabel( _translate("Results", "Time (s)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("Results", "Discharge (m³/s)"), - color='green', fontsize=10 + color='black', fontsize=10 ) ts = list(self.results.get("timestamps")) diff --git a/src/View/Results/PlotKPC.py b/src/View/Results/PlotKPC.py index 827ca104..a030ded8 100644 --- a/src/View/Results/PlotKPC.py +++ b/src/View/Results/PlotKPC.py @@ -63,11 +63,11 @@ class PlotKPC(PamhyrPlot): self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Elevation (m)"), - color='green', fontsize=11 + color='black', fontsize=11 ) self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "KP (m)"), - color='green', fontsize=11 + color='black', fontsize=11 ) kp = reach.geometry.get_kp() diff --git a/src/View/Results/PlotSedProfile.py b/src/View/Results/PlotSedProfile.py index 5d25b189..895df719 100644 --- a/src/View/Results/PlotSedProfile.py +++ b/src/View/Results/PlotSedProfile.py @@ -132,11 +132,11 @@ class PlotSedProfile(PamhyrPlot): self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "X (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Height (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) x = profile.geometry.get_station() diff --git a/src/View/Results/PlotSedReach.py b/src/View/Results/PlotSedReach.py index fe7498d1..3978930d 100644 --- a/src/View/Results/PlotSedReach.py +++ b/src/View/Results/PlotSedReach.py @@ -213,11 +213,11 @@ class PlotSedReach(PamhyrPlot): self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "Kp (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Height (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) kp = reach.geometry.get_kp() diff --git a/src/View/Results/PlotXY.py b/src/View/Results/PlotXY.py index 276ab600..21ba93a4 100644 --- a/src/View/Results/PlotXY.py +++ b/src/View/Results/PlotXY.py @@ -83,11 +83,11 @@ class PlotXY(PamhyrPlot): # Axes self.canvas.axes.set_xlabel( _translate("Results", "X (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("Results", "Y (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.axis("equal") diff --git a/src/View/SedimentLayers/Edit/Plot.py b/src/View/SedimentLayers/Edit/Plot.py index 69e58f83..820dc46b 100644 --- a/src/View/SedimentLayers/Edit/Plot.py +++ b/src/View/SedimentLayers/Edit/Plot.py @@ -35,7 +35,7 @@ class Plot(PamhyrPlot): self.canvas.axes.axes.get_xaxis().set_visible(False) self.canvas.axes.set_ylabel( self._trad["height"], - color='green', fontsize=10 + color='black', fontsize=10 ) if self.data is None: diff --git a/src/View/SedimentLayers/Reach/Plot.py b/src/View/SedimentLayers/Reach/Plot.py index 1bea651f..118af1db 100644 --- a/src/View/SedimentLayers/Reach/Plot.py +++ b/src/View/SedimentLayers/Reach/Plot.py @@ -46,11 +46,11 @@ class Plot(PamhyrPlot): self.canvas.axes.set_xlabel( self._trad["kp"], - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( self._trad["height"], - color='green', fontsize=10 + color='black', fontsize=10 ) kp = self.data.get_kp() diff --git a/src/View/SedimentLayers/Reach/Profile/Plot.py b/src/View/SedimentLayers/Reach/Profile/Plot.py index 5000ca9b..17a1a584 100644 --- a/src/View/SedimentLayers/Reach/Profile/Plot.py +++ b/src/View/SedimentLayers/Reach/Profile/Plot.py @@ -46,11 +46,11 @@ class Plot(PamhyrPlot): self.canvas.axes.set_xlabel( _translate("MainWindow_reach", "X (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) self.canvas.axes.set_ylabel( _translate("MainWindow_reach", "Height (m)"), - color='green', fontsize=10 + color='black', fontsize=10 ) x = self.data.get_station() diff --git a/src/View/Tools/Plot/PamhyrCanvas.py b/src/View/Tools/Plot/PamhyrCanvas.py index ee1f5373..b8962c2e 100644 --- a/src/View/Tools/Plot/PamhyrCanvas.py +++ b/src/View/Tools/Plot/PamhyrCanvas.py @@ -32,7 +32,7 @@ class MplCanvas(FigureCanvasQTAgg): '(x = ' + format(x, '1.4f') + ', \t' + ' y = ' + format(y, '1.4f') + ')' ) - self.axes.grid(color='green', linestyle='--', linewidth=0.5) + self.axes.grid(color='black', linestyle='--', linewidth=0.5) self.axes.yaxis.tick_left() self.axes.xaxis.tick_bottom() self.axes.spines[['top', 'right']].set_color('none') -- GitLab