Compare commits

..

No commits in common. "de7f3e63b1afc4a9e6ca42850b655de68501c374" and "de180b36359815a991fe1a3f7dfc6e6b5545bf97" have entirely different histories.

4 changed files with 12 additions and 20 deletions

View File

@ -582,10 +582,10 @@ class BoundaryCondition(SQLSubModel):
self._data.index(bc)
def get_i(self, index):
if len(self._data) == 0:
if len(self.data) == 0:
return None
return self._data[index]
return self.data[index]
def get_range(self, _range):
lst = []

View File

@ -115,10 +115,7 @@ class Results(SQLSubModel):
)
""")
if ext != "":
return True
return cls._create_submodel(execute)
return True
@classmethod
def _db_update(cls, execute, version, data=None):

View File

@ -58,7 +58,7 @@ logger = logging.getLogger()
class TableModel(PamhyrTableModel):
def get_true_data_row(self, row):
bc = self._data.data[row]
bc = self._data.get_i(row)
return next(
map(
@ -83,7 +83,6 @@ class TableModel(PamhyrTableModel):
value = QVariant()
if 0 <= column < 2:
row = self.get_true_data_row(row)
v = self._data.get_i(row)[column]
if self._data.get_type_column(column) == float:
if type(v) is str:
@ -107,16 +106,13 @@ class TableModel(PamhyrTableModel):
column = index.column()
try:
row = self.get_true_data_row(row)
self._undo.push(
SetDataCommand(
self._data, row,
column, value
self._data, row, column, value
)
)
except Exception as e:
logger.warning(e)
logger.info(e)
logger.debug(traceback.format_exc())
self.update()

View File

@ -83,13 +83,13 @@ class AddCommand(QUndoCommand):
self._new = None
def undo(self):
self._new.set_as_deleted()
self._data.delete_i([self._index])
def redo(self):
if self._new is None:
self._new = self._data.add(self._index)
else:
self._new.set_as_not_deleted()
self._data.insert(self._index, self._new)
class DelCommand(QUndoCommand):
@ -101,16 +101,15 @@ class DelCommand(QUndoCommand):
self._bc = []
for row in rows:
self._bc.append(self._data.get_i(row))
self._bc.append((row, self._data.get_i(row)))
self._bc.sort()
def undo(self):
for el in self._bc:
el.set_as_not_deleted()
for row, el in self._bc:
self._data.insert(row, el)
def redo(self):
for el in self._bc:
el.set_as_deleted()
self._data.delete_i(self._rows)
class SortCommand(QUndoCommand):