From 7b2c276643cb7f624138cc2f6fd91bbd594999fa Mon Sep 17 00:00:00 2001
From: Dylan Jeannin <dylanjeannin@gmail.com>
Date: Fri, 24 Jul 2026 13:53:30 +0200
Subject: [PATCH] Mage: reset node name registry for each export + display only
 Mage/Rubar solver in hydraulic solvers list

---
 src/Solver/Mage.py           | 11 ++++++++---
 src/View/RunSolver/Window.py |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index 1428f583..a7f5740d 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -65,6 +65,8 @@ class Mage(CommandLineSolver):
         self._cmd_solver = "@path @input -o @output"
         self._cmd_output = ""
 
+        self._reset_node_names()
+
     @classmethod
     def default_parameters(cls):
         lst = super(Mage, cls).default_parameters()
@@ -125,9 +127,11 @@ class Mage(CommandLineSolver):
 
     _l_alph = len(_alph)
 
-    _nodes_cnt = 0
-    _nodes_names = {}
-    _nodes_views = set()
+    def _reset_node_names(self):
+        """Reset the node-name registry for a new export."""
+        self._nodes_cnt = 0
+        self._nodes_names = {}
+        self._nodes_views = set()
 
     def get_reach_name(self, reach):
         index = self._study.river.get_edge_id(reach) + 1
@@ -1005,6 +1009,7 @@ class Mage8(Mage):
     @timer
     def export(self, study, repertory, qlog=None, name="0"):
         self._study = study
+        self._reset_node_names()
         name = study.name.replace(" ", "_")
 
         # Define GRA file name
diff --git a/src/View/RunSolver/Window.py b/src/View/RunSolver/Window.py
index 65e8546b..fe4b2b3f 100644
--- a/src/View/RunSolver/Window.py
+++ b/src/View/RunSolver/Window.py
@@ -82,7 +82,9 @@ class SelectSolverWindow(PamhyrDialog):
         # solvers = self._config.solvers
         # solvers mage
         solvers = list(filter(
-            lambda x: "adists" not in x._type, self._config.solvers
+            lambda x: "adists" not in x._type
+            and "adistt" not in x._type, 
+            self._config.solvers
         ))
         solvers_name = list(
             map(