parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

put compare solvers in results window

Browse Source
This commit is contained in:
Theophile Terraz committed 2025-01-10 16:54:02 +01:00
1 parent 8d9a196059
commit 41d1fb9d59
11 files changed
+224 -99
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/View/MainWindow.py
+22 -8
View File
@@ -81,7 +81,7 @@ from View.RunSolver.Window import (
SolverLogWindow,
CompareSolversWindow
)
from View.Results.Window import ResultsWindow, CompareResultsWindow
from View.Results.Window import ResultsWindow # , CompareResultsWindow
from View.RunSolver.WindowAdisTS import (
SelectSolverWindowAdisTS,
SolverLogWindowAdisTS
@@ -1437,7 +1437,6 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
data=[
self._study,
None, # No config
solver,
results
]
):
@@ -1445,8 +1444,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
res = ResultsWindow(
study=self._study,
solver=solver,
results=results,
results=[results],
parent=self
)
res.show()
@@ -1586,20 +1584,34 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
data=[
self._study,
None, # No config
results._solver,
results
results[0]
]
):
w = self.get_sub_window(
ResultsWindow,
data=[
self._study,
None, # No config
results[0]
])
#w.add_result(result[1], run.solver2)
return
res = CompareResultsWindow(
res = ResultsWindow(
study=self._study,
solver=results._solver,
results=results,
parent=self
)
res.show()
#res = CompareResultsWindow(
#study=self._study,
#solver=results._solver,
#results=results,
#parent=self
#)
#res.show()
def diff_results(self, solver1, solver2):
if solver1 is None:
@@ -1637,6 +1649,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
# TODO message
return None
return [result1, result2]
result3 = Results(self._study, solver3)
result3.set("nb_reach", result1.get("nb_reach"))
result3.set("nb_profile", result1.get("nb_profile"))