Fixed a bug with image loading.

This commit is contained in:
Joey Payne 2015-11-12 08:49:16 -07:00
commit 728f05513a
3 changed files with 16 additions and 2 deletions

View file

@ -371,6 +371,16 @@ class CommandBase(object):
setting = setting_group[name]
return setting
def get_settings_type(self, type):
settings = []
for setting_group in (self.settings['setting_groups'] +
[self.settings['export_settings']] +
[self.settings['compression']]):
for name, setting in setting_group.items():
if setting.type == type:
settings.append(setting)
return settings
def show_error(self, error):
if self.logger is not None:
self.logger.error(error)

View file

@ -1329,7 +1329,7 @@ class MainWindow(QtGui.QMainWindow, CommandBase):
if index != -1:
setting_field.setCurrentIndex(index)
if setting.type == 'range':
setting_field.setValue(setting.value)
setting_field.setValue(int(setting.value))
self.ex_button.setEnabled(self.required_settings_filled())
def show_and_raise(self):

View file

@ -19,7 +19,11 @@ def get_temp_dir():
return tempfile.gettempdir()
def path_join(base, *rest):
return base + u'/' + u'/'.join(rest)
rpath = u'/'.join(rest)
if os.path.isabs(rpath):
return rpath
else:
return base + u'/' + rpath
def get_data_path(dir_path):
parts = dir_path.split('/')