Compare commits

..

No commits in common. "7d42c164fc76021c9e6fc7c125c3e52771ed9811" and "e7b63fe2705520d97a02093c9ee425a45b02f1d6" have entirely different histories.

5 changed files with 17 additions and 24 deletions

View File

@ -277,19 +277,18 @@ class SedimentLayer(SQLSubModel):
"FROM sedimentary_layer " "FROM sedimentary_layer "
) )
if table is not None: for row in table:
for row in table: sl = cls(
sl = cls( id=row[0],
id=row[0], name=row[1],
name=row[1], comment=row[2],
comment=row[2], status=data['status']
status=data['status'] )
)
data["sl"] = sl.id data["sl"] = sl.id
sl._layers = Layer._db_load(execute, data) sl._layers = Layer._db_load(execute, data)
new.append(sl) new.append(sl)
return new return new

View File

@ -310,16 +310,11 @@ class TableModel(PamhyrTableModel):
if line[0] == "$": if line[0] == "$":
current_reach = int(line[1]) - 1 current_reach = int(line[1]) - 1
if (current_reach <= len(self._data.enable_edges()) and if (current_reach <= len(self._data.enable_edges()) and
current_reach >= 0): current_reach >= 0) :
data.append( data.append([self._data.enable_edges()[current_reach], float(line[2]), float(line[3])])
[self._data.enable_edges()[current_reach],
float(line[2]),
float(line[3])
]
)
else: else:
if (current_reach <= len(self._data.enable_edges()) and if (current_reach <= len(self._data.enable_edges()) and
current_reach >= 0): current_reach >= 0) :
data[-1].append( data[-1].append(
[ [
old_pamhyr_date_to_timestamp(line[0]), old_pamhyr_date_to_timestamp(line[0]),

View File

@ -256,7 +256,7 @@ class ImportCommand(QUndoCommand):
def redo(self): def redo(self):
self._lcs.delete_i(self._tab, self._old_rows) self._lcs.delete_i(self._tab, self._old_rows)
if self._new_lc is None: if self._new_lc == None:
self._new_lc = [] self._new_lc = []
for row, data in enumerate(self._data): for row, data in enumerate(self._data):
new = LateralContrib(status=self._lcs._status) new = LateralContrib(status=self._lcs._status)
@ -270,7 +270,6 @@ class ImportCommand(QUndoCommand):
for row, el in enumerate(self._new_lc): for row, el in enumerate(self._new_lc):
self._lcs.insert(self._tab, row, el) self._lcs.insert(self._tab, row, el)
class DuplicateCommand(QUndoCommand): class DuplicateCommand(QUndoCommand):
def __init__(self, lcs, tab, rows, lc): def __init__(self, lcs, tab, rows, lc):
QUndoCommand.__init__(self) QUndoCommand.__init__(self)

View File

@ -494,7 +494,7 @@ class ResultsWindow(PamhyrWindow):
table = self.find(QTableView, f"tableView_profile") table = self.find(QTableView, f"tableView_profile")
indexes = table.selectedIndexes() indexes = table.selectedIndexes()
if len(indexes) == 0: if len(indexes) == 0:
return [] return 0
return [i.row() for i in indexes] return [i.row() for i in indexes]

View File

@ -260,8 +260,8 @@ def date_dmy_to_timestamp(date: str):
def old_pamhyr_date_to_timestamp(date: str): def old_pamhyr_date_to_timestamp(date: str):
v = date.split(":") v = date.split(":")
if len(v) != 4: if len(v) != 4:
if len(v) == 1: # minutes if len(v) == 1: # minutes
return int(float(v[0]) * 60) # Minute to sec return int(float(v[0]) * 60) # Minute to sec
else: else:
return 0 return 0