Skip to content

ignore plot_settings.pkl file if model is changed #94

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 5 commits into from
May 31, 2022
Merged

ignore plot_settings.pkl file if model is changed #94

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de02ff3
ignore pkl file if model is changed
kkiesling May 13, 2022
8e481fe
check hashes of files instead
kkiesling May 25, 2022
d518f99
move function, increase chunk size
kkiesling May 26, 2022
335ef86
move restore plot_settings.pkl back to original location
kkiesling May 26, 2022
cfbc5a8
use warnings framework
kkiesling May 31, 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
Prev Previous commit
Next Next commit
move function, increase chunk size
  • Loading branch information
@kkiesling
kkiesling committed May 26, 2022
commit d518f996d5b08c7c75a1007ae4ea73948e749cfb
30 changes: 15 additions & 15 deletions openmc_plotter/main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@ def _openmcReload():
openmc.lib.init(["-c"])
openmc.lib.settings.verbosity = 1

def hash_file(filename):
# return the md5 hash of a file
h = hashlib.md5()
with open(filename,'rb') as file:
chunk = 0
while chunk != b'':
# read 32768 bytes at a time
chunk = file.read(32768)
h.update(chunk)
return h.hexdigest()

class MainWindow(QMainWindow):
def __init__(self,
font=QtGui.QFontMetrics(QtGui.QFont()),
Expand Down Expand Up @@ -1068,8 +1079,8 @@ def restoreModelSettings(self):
model = pickle.load(file)

# check if loaded cell/mat ids hash match the pkl file:
current_mat_xml_hash = self.hash_file('materials.xml')
current_geom_xml_hash = self.hash_file('geometry.xml')
current_mat_xml_hash = hash_file('materials.xml')
current_geom_xml_hash = hash_file('geometry.xml')
if (current_mat_xml_hash != model.mat_xml_hash) or \
(current_geom_xml_hash != model.geom_xml_hash):
# hashes do not match so ignore plot_settings.pkl file
Expand Down Expand Up @@ -1200,8 +1211,8 @@ def saveSettings(self):
self.model.subsequentViews = self.model.subsequentViews[-10:]

# get hashes for geometry.xml and material.xml at close
self.model.mat_xml_hash = self.hash_file('materials.xml')
self.model.geom_xml_hash = self.hash_file('geometry.xml')
self.model.mat_xml_hash = hash_file('materials.xml')
self.model.geom_xml_hash = hash_file('geometry.xml')

with open('plot_settings.pkl', 'wb') as file:
if self.model.statepoint:
Expand All @@ -1212,14 +1223,3 @@ def exportTallyData(self):
# show export tool dialog
self.showExportDialog()

@staticmethod
def hash_file(filename):
# return the md5 hash of a file
h = hashlib.md5()
with open(filename,'rb') as file:
chunk = 0
while chunk != b'':
# read 1024 bytes at a time
chunk = file.read(1024)
h.update(chunk)
return h.hexdigest()