parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solver: Fix minor issue and add long name translate.

mesh
Pierre-Antoine Rouby 2023-06-12 17:36:59 +02:00
parent e6878c4735
commit 81d4b1e657
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Solver/ASolver.py
View File

@ -49,11 +49,11 @@ class AbstractSolver(object):
@property @property
def name(self): def name(self):
return self.name return self._name
@property @property
def description(self): def description(self):
return self.description return self._description
@property @property
def status(self): def status(self):

10
src/Solver/Solvers.py
View File

@ -1,8 +1,18 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from PyQt5.QtCore import QCoreApplication
from Solver.GenericSolver import GenericSolver from Solver.GenericSolver import GenericSolver
from Solver.Mage import Mage7, Mage8 from Solver.Mage import Mage7, Mage8
_translate = QCoreApplication.translate
solver_long_name = {
"generic": _translate("Solvers", "Generic"),
"mage7": _translate("Solvers", "Mage version 7"),
"mage8": _translate("Solvers", "Mage version 8"),
}
solver_type_list = { solver_type_list = {
"generic": GenericSolver, "generic": GenericSolver,
"mage7": Mage7, "mage7": Mage7,

14
src/View/Configure/Solver/Window.py
View File

@ -27,15 +27,15 @@ class ConfigureSolverWindow(ASubWindow):
self.connect() self.connect()
def copy_data(self): def copy_data(self):
self.set_combobox_text("comboBox_solver", self.data.get_type()) self.set_combobox_text("comboBox_solver", self.data.type)
self.set_line_edit_text("lineEdit_name", self.data.name) self.set_line_edit_text("lineEdit_name", self.data.name)
self.set_line_edit_text("lineEdit_description", self.data.description) self.set_line_edit_text("lineEdit_description", self.data.description)
self.set_line_edit_text("lineEdit_input", self.data.path_input) self.set_line_edit_text("lineEdit_input", self.data._path_input)
self.set_line_edit_text("lineEdit_input_cmd", self.data.cmd_input) self.set_line_edit_text("lineEdit_input_cmd", self.data._cmd_input)
self.set_line_edit_text("lineEdit_solver", self.data.path_solver) self.set_line_edit_text("lineEdit_solver", self.data._path_solver)
self.set_line_edit_text("lineEdit_solver_cmd", self.data.cmd_solver) self.set_line_edit_text("lineEdit_solver_cmd", self.data._cmd_solver)
self.set_line_edit_text("lineEdit_output", self.data.path_output) self.set_line_edit_text("lineEdit_output", self.data._path_output)
self.set_line_edit_text("lineEdit_output_cmd", self.data.cmd_output) self.set_line_edit_text("lineEdit_output_cmd", self.data._cmd_output)
def connect(self): def connect(self):
# File button # File button

8
src/View/Configure/Window.py
View File

@ -25,6 +25,7 @@ from PyQt5.QtWidgets import (
QComboBox, QUndoStack, QShortcut, QHeaderView, QComboBox, QUndoStack, QShortcut, QHeaderView,
) )
from Solver.Solvers import solver_long_name
class SolverTableModel(QAbstractTableModel): class SolverTableModel(QAbstractTableModel):
def __init__(self, headers=[], rows=[]): def __init__(self, headers=[], rows=[]):
@ -42,7 +43,12 @@ class SolverTableModel(QAbstractTableModel):
if role != Qt.ItemDataRole.DisplayRole: if role != Qt.ItemDataRole.DisplayRole:
return QVariant() return QVariant()
return self.rows[index.row()][self.headers[index.column()]] ret = self.rows[index.row()][self.headers[index.column()]]
if self.headers[index.column()] == "type":
ret = solver_long_name[ret]
return ret
def headerData(self, section, orientation, role): def headerData(self, section, orientation, role):
if (role == Qt.ItemDataRole.DisplayRole and if (role == Qt.ItemDataRole.DisplayRole and