Skip to content

Avoid image generation on load. #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulromano merged 4 commits into from
May 4, 2022
Merged

Avoid image generation on load. #90

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cec8dae
Freezing plot image during GUI load to avoid unecessary calls to open…
pshriwise Apr 29, 2022
21b7e78
Removing early call to generatePixmap
pshriwise Apr 30, 2022
18de914
Adding frozen attr to PlotImage constructor
pshriwise Apr 30, 2022
392b69c
Removing print statement and extra imported module
pshriwise May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Freezing plot image during GUI load to avoid unecessary calls to open… 
…mc.lib.id_map.
  • Loading branch information
@pshriwise
pshriwise committed Apr 29, 2022
commit cec8dae44aeb27b2063c6c7f73331ef0ab5664b2
5 changes: 4 additions & 1 deletion openmc_plotter/main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def loadGui(self, use_settings_pkl=True):

# Create plot image
self.plotIm = PlotImage(self.model, self.frame, self)
self.plotIm.frozen = True
self.frame.setWidget(self.plotIm)

# Dock
Expand Down Expand Up @@ -111,9 +112,11 @@ def loadGui(self, use_settings_pkl=True):
self.statusBar().showMessage('')

# Timer allows GUI to render before plot finishes loading
QtCore.QTimer.singleShot(0, self.plotIm.generatePixmap)
# QtCore.QTimer.singleShot(0, self.plotIm.generatePixmap)
QtCore.QTimer.singleShot(0, self.showCurrentView)

self.plotIm.frozen = False

def event(self, event):
# use pinch event to update zoom
if isinstance(event, QGestureEvent):
Expand Down
3 changes: 3 additions & 0 deletions openmc_plotter/plotgui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,9 @@ def contextMenuEvent(self, event):
self.menu.exec_(event.globalPos())

def generatePixmap(self, update=False):
if self.frozen:
return

self.model.generatePlot()
if update:
self.updatePixmap()
Expand Down
2 changes: 1 addition & 1 deletion openmc_plotter/plotmodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import copy
import itertools
import threading
import traceback

from PySide2.QtWidgets import QItemDelegate, QColorDialog, QLineEdit, QMessageBox
from PySide2.QtCore import QAbstractTableModel, QModelIndex, Qt, QSize, QEvent
Expand Down Expand Up @@ -184,7 +185,6 @@ def resetColors(self):

def generatePlot(self):
""" Spawn thread from which to generate new plot image """

t = threading.Thread(target=self.makePlot)
t.start()
t.join()
Expand Down