Skip to content

Commit

Permalink
Included levels of logging for all prints statments & window title
Browse files Browse the repository at this point in the history 
Refs #12702
  • Loading branch information
Shahroz Ahmed committed Aug 17, 2015
1 parent 0f9327c commit 6c0d152
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/scripts/FilterEvents/ErrorMessage.ui
View file
Expand Up @@ -17,7 +17,7 @@
</size>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Error</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/scripts/FilterEvents/MainWindow.ui
View file
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
<string>Filter Events Interface</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QPushButton" name="helpBtn">
Expand Down
63 changes: 42 additions & 21 deletions Code/Mantid/scripts/FilterEvents/eventFilterGUI.py
View file
Expand Up @@ -11,6 +11,7 @@
import mantid
import mantid.simpleapi as api
import mantid.kernel
from mantid.kernel import Logger
from mantid.simpleapi import AnalysisDataService

from mantid.kernel import ConfigService
Expand Down Expand Up @@ -350,7 +351,8 @@ def set_startTime(self):
""" Set the starting time and left slide bar
"""
inps = str(self.ui.lineEdit_3.text())
print "Starting time = %s" % (inps)
info_msg = "Starting time = %s" % (inps)
Logger("Filter_Events").information(info_msg)

xlim = self.ui.mainplot.get_xlim()
if inps == "":
Expand All @@ -361,7 +363,8 @@ def set_startTime(self):

# Convert to integer slide value
ileftvalue = int( (newtime0-xlim[0])/(xlim[1] - xlim[0])*100 )
print "iLeftSlide = %d" % (ileftvalue)
info_msg = "iLeftSlide = %s" % str(ileftvalue)
Logger("Filter_Events").information(info_msg)

# Skip if same as origina
if ileftvalue == self._leftSlideValue:
Expand All @@ -380,7 +383,8 @@ def set_startTime(self):

if resetT is True:
newtime0 = xlim[0] + ileftvalue*(xlim[1]-xlim[0])*0.01
print "Corrected iLeftSlide = %d (vs. right = %d)" % (ileftvalue, self._rightSlideValue)
info_msg = "Corrected iLeftSlide = %s (vs. right = %s)" % (str(ileftvalue), str(self._rightSlideValue))
Logger("Filter_Events").information(info_msg)

# Move the slide bar (left)
self._leftSlideValue = ileftvalue
Expand Down Expand Up @@ -431,7 +435,8 @@ def set_stopTime(self):
""" Set the starting time and left slide bar
"""
inps = str(self.ui.lineEdit_4.text())
print "Stopping time = %s" % (inps)
info_msg = "Stopping time = %s" % (inps)
Logger("Filter_Events").information(info_msg)

xlim = self.ui.mainplot.get_xlim()
if inps == "":
Expand All @@ -443,7 +448,8 @@ def set_stopTime(self):

# Convert to integer slide value
irightvalue = int( (newtimef-xlim[0])/(xlim[1] - xlim[0])*100 )
print "iRightSlide = %d" % (irightvalue)
info_msg = "iRightSlide = %s" % str(irightvalue)
Logger("Filter_Events").information(info_msg)

# Return if no change
if irightvalue == self._rightSlideValue:
Expand Down Expand Up @@ -485,7 +491,8 @@ def move_lowerSlider(self):
Triggered by a change in Qt Widget. NO EVENT is required.
"""
inewy = self.ui.verticalSlider_2.value()
print "LowerSlider is set with value %d vs. class variable %d" % (inewy, self._lowerSlideValue)
debug_msg = "LowerSlFider is set with value %s vs. class variable %s" % (str(inewy), str(self._lowerSlideValue))
Logger("Filter_Events").debug(debug_msg)

# Return with no change
if inewy == self._lowerSlideValue:
Expand Down Expand Up @@ -522,7 +529,8 @@ def move_lowerSlider(self):
def set_minLogValue(self):
""" Set the starting time and left slide bar
"""
print "Minimum Log Value = %s" %(str(self.ui.lineEdit_5.text()))
error_msg = "Minimum Log Value = %s" %(str(self.ui.lineEdit_5.text()))
Logger("Filter_Events").error(error_msg)

ylim = self.ui.mainplot.get_ylim()

Expand All @@ -535,7 +543,8 @@ def set_minLogValue(self):

# Convert to integer slide value
iminlogval = int( (newminY-ylim[0])/(ylim[1] - ylim[0])*100 )
print "ilowerSlide = %d" % (iminlogval)
debug_msg = "ilowerSlide = %s" % str(iminlogval)
Logger("Filter_Events").debug(debug_msg)

# Return if no change
if iminlogval == self._lowerSlideValue:
Expand All @@ -560,7 +569,8 @@ def set_minLogValue(self):

# Move the slide bar (lower)
self._lowerSlideValue = iminlogval
print "LineEdit5 set slide to %d" % (self._lowerSlideValue)
debug_msg = "LineEdit5 set slide to %s" % str(self._lowerSlideValue)
Logger("Filter_Events").debug(debug_msg)
self.ui.verticalSlider_2.setValue(self._lowerSlideValue)

# Reset line Edit if using default
Expand Down Expand Up @@ -609,7 +619,8 @@ def set_maxLogValue(self):
""" Set maximum log value from line-edit
"""
inps = str(self.ui.lineEdit_6.text())
print "Maximum Log Value = %s" %(inps)
debug_msg = "Maximum Log Value = %s" %(inps)
Logger("Filter_Events").debug(debug_msg)

ylim = self.ui.mainplot.get_ylim()
if inps == "":
Expand All @@ -621,7 +632,8 @@ def set_maxLogValue(self):

# Convert to integer slide value
imaxlogval = int( (newmaxY-ylim[0])/(ylim[1] - ylim[0])*100 )
print "iUpperSlide = %d" % (imaxlogval)
debug_msg = "iUpperSlide = %s" % str(imaxlogval)
Logger("Filter_Events").debug(debug_msg)

# Return if no change
if imaxlogval == self._upperSlideValue:
Expand Down Expand Up @@ -665,7 +677,9 @@ def browse_File(self):

self.ui.lineEdit.setText(str(filename))

# print "Selected file: ", filename
info_msg = "Selected file: %s." % str(filename)
Logger("Filter_Events").information(info_msg)


return

Expand All @@ -683,9 +697,9 @@ def load_File(self):

dataws = self._loadFile(str(filename))
if dataws is None:
errmsg = "Unable to locate run %s in default directory %s." % (filename, self._defaultdir)
print errmsg
self._setErrorMsg(errmsg)
error_msg = "Unable to locate run %s in default directory %s." % (filename, self._defaultdir)
Logger("Filter_Events").error(error_msg)
self._setErrorMsg(error_msg)
else:
self._importDataWorkspace(dataws)
self._defaultdir = os.path.dirname(str(filename))
Expand Down Expand Up @@ -728,9 +742,10 @@ def plotLogValue(self):

# check
if len(vectimes) == 0:
print "Empty log!"
error_msg = "Empty log!"
Logger("Filter_Events").error(error_msg)

# Convert absolute time to relative time in seconds
#Convert absolute time to relative time in seconds
t0 = self._dataWS.getRun().getProperty("proton_charge").times[0]
t0ns = t0.totalNanoseconds()

Expand Down Expand Up @@ -894,7 +909,8 @@ def _loadFile(self, filename):
# Construct a file name from run number
runnumber = int(filename)
if runnumber <= 0:
print "Run number cannot be less or equal to zero. User gives %s. " % (filename)
error_msg = "Run number cannot be less or equal to zero. User gives %s. " % (filename)
Logger("Filter_Events").error(error_msg)
return None
else:
ishort = config.getInstrument(self._instrument).shortName()
Expand All @@ -915,12 +931,16 @@ def _loadFile(self, filename):
wsname = "%s_%s_event" % (ishort, str_runnumber)
else:
# Non-supported
print "File name / run number in such format %s is not supported. " % (filename)
error_msg = "File name / run number in such format %s is not supported. " % (filename)
Logger("Filter_Events").error(error_msg)

return None

else:
# Unsupported format
print "File name / run number in such format %s is not supported. " % (filename)
error_msg = "File name / run number in such format %s is not supported. " % (filename)
Logger("Filter_Events").error(error_msg)

return None

# Load
Expand Down Expand Up @@ -1043,7 +1063,8 @@ def filterByLogValue(self):
kwargs = {}
samplelog = str(self.ui.comboBox_2.currentText())
if len(samplelog) == 0:
print "No sample log is selected!"
error_msg = "No sample log is selected!"
Logger("Filter_Events").error(error_msg)
return


Expand Down

0 comments on commit 6c0d152

Please sign in to comment.