Skip to content

Commit 728f055

Browse files
committed
Fixed a bug with image loading.
1 parent 02f7c0c commit 728f055

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

command_line.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,16 @@ def get_setting(self, name):
371371
setting = setting_group[name]
372372
return setting
373373

374+
def get_settings_type(self, type):
375+
settings = []
376+
for setting_group in (self.settings['setting_groups'] +
377+
[self.settings['export_settings']] +
378+
[self.settings['compression']]):
379+
for name, setting in setting_group.items():
380+
if setting.type == type:
381+
settings.append(setting)
382+
return settings
383+
374384
def show_error(self, error):
375385
if self.logger is not None:
376386
self.logger.error(error)

main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ def load_package_json(self, json_path=None):
13291329
if index != -1:
13301330
setting_field.setCurrentIndex(index)
13311331
if setting.type == 'range':
1332-
setting_field.setValue(setting.value)
1332+
setting_field.setValue(int(setting.value))
13331333
self.ex_button.setEnabled(self.required_settings_filled())
13341334

13351335
def show_and_raise(self):

utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ def get_temp_dir():
1919
return tempfile.gettempdir()
2020

2121
def path_join(base, *rest):
22-
return base + u'/' + u'/'.join(rest)
22+
rpath = u'/'.join(rest)
23+
if os.path.isabs(rpath):
24+
return rpath
25+
else:
26+
return base + u'/' + rpath
2327

2428
def get_data_path(dir_path):
2529
parts = dir_path.split('/')

0 commit comments

Comments
 (0)