marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Browse Source 
Conflicts:
	pylot/RELEASE-VERSION
This commit is contained in:
Ludger Küperkoch 2017-05-18 12:02:07 +02:00
commit d9f087cb72
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icons_rc.py
View File

@ -7,7 +7,7 @@
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore from PySide import QtCore
qt_resource_data = "\ qt_resource_data = "\
\x00\x00\x9e\x04\ \x00\x00\x9e\x04\

1
pylot/RELEASE-VERSION
View File

@ -1 +0,0 @@
6405-dirty

9
pylot/core/util/widgets.py
View File

@ -1804,8 +1804,11 @@ class AutoPickParaBox(QtGui.QWidget):
self.parameter.setParamKV(param, value) self.parameter.setParamKV(param, value)
return self.parameter return self.parameter
def params_to_gui(self): def params_to_gui(self, tuneMode=False):
for param in self.parameter.get_all_para_names(): for param in self.parameter.get_all_para_names():
if param == 'eventID':
if tuneMode:
continue
box = self.boxes[param] box = self.boxes[param]
value = self.parameter[param] value = self.parameter[param]
#self.parameter.checkValue(param, value) #self.parameter.checkValue(param, value)
@ -1847,7 +1850,7 @@ class AutoPickParaBox(QtGui.QWidget):
if fname[0]: if fname[0]:
try: try:
self.parameter.from_file(fname[0]) self.parameter.from_file(fname[0])
self.params_to_gui() self.params_to_gui(tuneMode=True)
except Exception as e: except Exception as e:
self._warn('Could not open file {}:\n{}'.format(fname[0], e)) self._warn('Could not open file {}:\n{}'.format(fname[0], e))
return return
@ -1866,7 +1869,7 @@ class AutoPickParaBox(QtGui.QWidget):
def restoreDefaults(self): def restoreDefaults(self):
try: try:
self.parameter.reset_defaults() self.parameter.reset_defaults()
self.params_to_gui() self.params_to_gui(tuneMode=True)
except Exception as e: except Exception as e:
self._warn('Could not restore defaults:\n{}'.format(e)) self._warn('Could not restore defaults:\n{}'.format(e))
return return