prehistoric-systems/beeref
1
0
Fork 0
mirror of https://github.com/rbreu/beeref.git synced 2026-03-11 08:54:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fix during file loading; more logging

Browse source
This commit is contained in:
Rebecca Breu 2021-05-27 17:34:20 +02:00
parent d25f911561
commit e2dd0339d7
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
beeref/__main__.py
View file

@ -90,6 +90,7 @@ def main():
app.exec()
del bee
del app
logger.debug('BeeRef closed')
if __name__ == '__main__':

2
beeref/fileio/sql.py
View file

@ -139,12 +139,12 @@ class SQLiteIO:
item.save_id = row[0]
item.pixmap_from_bytes(row[8])
item.setPos(row[1], row[2])
self.scene.add_item_later(item)
item.setZValue(row[3])
item.setScale(row[4])
item.setRotation(row[5])
if row[6] == -1:
item.do_flip()
self.scene.add_item_later(item)
if self.worker:
self.worker.progress.emit(i)
if self.worker.canceled:

15
beeref/gui.py
View file

@ -48,23 +48,32 @@ class WelcomeOverlay(QtWidgets.QWidget):
class BeeProgressDialog(QtWidgets.QProgressDialog):
def __init__(self, label, worker, maximum=100, parent=None):
def __init__(self, label, worker, maximum=0, parent=None):
super().__init__(label, 'Cancel', 0, maximum, parent=parent)
logger.debug('Initialised progress bar')
self.setMinimumDuration(0)
self.setWindowModality(Qt.WindowModality.WindowModal)
self.setAutoReset(False)
self.setAutoClose(False)
worker.begin_processing.connect(self.on_begin_processing)
worker.progress.connect(self.on_progress)
worker.finished.connect(self.on_finished)
self.canceled.connect(worker.on_canceled)
def on_progress(self, value):
self.setValue(value + 1)
logger.debug(f'Progress dialog: {value}')
self.setValue(value)
def on_begin_processing(self, value):
logger.debug(f'Beginn progress dialog: {value}')
self.setMaximum(value)
def on_finished(self, filename, errors):
self.close()
logger.debug('Finished progress dialog')
self.setValue(self.maximum())
self.reset()
self.hide()
self.deleteLater()
class HelpDialog(QtWidgets.QDialog):

3
beeref/view.py
View file

@ -281,7 +281,6 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin):
else:
self.scene.add_queued_items()
self.on_action_fit_scene()
self.progress.deleteLater()
def open_from_file(self, filename):
logger.info(f'Opening file {filename}')
@ -315,7 +314,6 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin):
'Problem saving file',
('<p>Problem saving file %s</p>'
'<p>File/directory not accessible</p>') % filename)
self.progress.deleteLater()
def do_save(self, filename, create_new):
if not filename.endswith('.bee'):
@ -379,7 +377,6 @@ class BeeGraphicsView(QtWidgets.QGraphicsView, ActionsMixin):
self.scene.add_queued_items()
self.scene.arrange_optimal()
self.undo_stack.endMacro()
self.progress.deleteLater()
def do_insert_images(self, filenames, pos=None):
if not pos: