Skip to content
Snippets Groups Projects
Commit 61cf8eca authored by Zhou, Wenduo's avatar Zhou, Wenduo
Browse files

Refs #14025. Fixed a bug deep in reduction gui framework.

Property method instrument_name and facility_name returned False if
instrument_name or facilty_name had been set up and True if they
haven't.  It does not seem right and by then there is no way to get
correct facility and instrument name from this class.

Changes to be committed:
 - modified:   settings/application_settings.py
parent 483bd5e7
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,12 @@ class GeneralSettings(QtCore.QObject): ...@@ -90,7 +90,12 @@ class GeneralSettings(QtCore.QObject):
@property @property
def instrument_name(self): def instrument_name(self):
self._instrument_name = unicode(self._settings.value("instrument_name", 'true')).lower()=='true' """ Get instrument name
:return: instrument name or False
"""
self._instrument_name = unicode(self._settings.value("instrument_name", 'true'))
if self._instrument_name.lower() == 'true':
self._instrument_name = False
return self._instrument_name return self._instrument_name
@instrument_name.setter @instrument_name.setter
...@@ -101,7 +106,9 @@ class GeneralSettings(QtCore.QObject): ...@@ -101,7 +106,9 @@ class GeneralSettings(QtCore.QObject):
@property @property
def facility_name(self): def facility_name(self):
self._facility_name = unicode(self._settings.value("facility_name", 'true')).lower()=='true' self._facility_name = unicode(self._settings.value("facility_name", 'true'))
if self._facility_name.lower() == 'true':
self._facility_name = False
return self._facility_name return self._facility_name
@facility_name.setter @facility_name.setter
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment