mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
merge master
This commit is contained in:
commit
d05d1e6914
14 files changed
+410
-119
No files matched your search
@@ -269,20 +269,29 @@ class InitialConditionsWindow(PamhyrWindow):
|
||||
settings = QSettings(QSettings.IniFormat,
|
||||
QSettings.UserScope, 'MyOrg', )
|
||||
options |= QFileDialog.DontUseNativeDialog
|
||||
filename, _ = QtWidgets.QFileDialog.getOpenFileName(
|
||||
|
||||
file_types = [
|
||||
self._trad["file_bin"],
|
||||
self._trad["file_ini"],
|
||||
self._trad["file_all"],
|
||||
]
|
||||
file_name, _ = QtWidgets.QFileDialog.getOpenFileName(
|
||||
self,
|
||||
self._trad["open_file"],
|
||||
"",
|
||||
";; ".join(["Mage (*.BIN)"]),
|
||||
";; ".join(file_types),
|
||||
options=options
|
||||
)
|
||||
|
||||
if filename != "":
|
||||
size = os.stat(filename).st_size
|
||||
# self._table.import_geometry(0, filename)
|
||||
self._import_from_file(filename)
|
||||
if file_name != "":
|
||||
size = os.stat(file_name).st_size
|
||||
# self._table.import_geometry(0, file_name)
|
||||
if file_name[-4:] == ".BIN":
|
||||
self._import_from_bin_file(file_name)
|
||||
elif file_name[-4:].upper() == ".INI":
|
||||
self._import_from_ini_file(file_name)
|
||||
|
||||
def _import_from_file(self, file_name):
|
||||
def _import_from_bin_file(self, file_name):
|
||||
solver = Mage8("dummy")
|
||||
name = os.path.basename(file_name)\
|
||||
.replace(".BIN", "")
|
||||
@@ -310,10 +319,11 @@ class InitialConditionsWindow(PamhyrWindow):
|
||||
|
||||
def _import_from_results(self, results):
|
||||
logger.debug(f"import from results: {results}")
|
||||
row = self.index_selected_row()
|
||||
|
||||
self._table.import_from_results(row, results)
|
||||
|
||||
def _import_from_ini_file(self, file_name):
|
||||
self._table.read_from_ini(file_name)
|
||||
|
||||
def move_up(self):
|
||||
row = self.index_selected_row()
|
||||
self._table.move_up(row)
|
||||
|
||||
Reference in new issue
Block a user