Skip to content

Commit

Permalink
Refs #8763 Whitespace stripped, actions connected
Browse files Browse the repository at this point in the history
Latest_isis_runs now strips the whitespace off any search string given to it

Last commit didn't actually connect the new signals. Helps if I write connect statements. I've also wired them directy to the same functions as the buttons, rather than giving them their own functions.
  • Loading branch information
keithnbrown committed Jan 29, 2014
1 parent 3420602 commit ecb04ec
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
Expand Up @@ -144,4 +144,4 @@ def getxmlway(self, eID, maxDepth):
def getJournalRuns(self, eID, maxDepth = 1):
if maxDepth < 1:
maxDepth = 1
return self.getxmlway(eID, maxDepth)
return self.getxmlway(eID.strip(), maxDepth)
18 changes: 7 additions & 11 deletions Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
Expand Up @@ -56,16 +56,6 @@ def on_actionSave_As_triggered(self):
self.saveAs()
def on_actionSave_Workspaces_triggered(self):
self.saveWorkspaces()
def on_actionAutofill_triggered(self):
self.autoFill()
def on_actionProcess_triggered(self):
self.process()
def on_actionTransfer_triggered(self):
self.transfer()
def on_actionClear_Table_triggered(self):
self.initTable()
def on_actionSearch_RB_triggered(self):
self.populateList()
def actionClose_Refl_Gui_triggered(self):
self.showHelp()
def on_actionMantid_Help_triggered(self):
Expand Down Expand Up @@ -121,10 +111,10 @@ def initTable(self):
item.setText('')
self.tableMain.setItem(row, column, item)
def connectSlots(self):
self.buttonAuto.clicked.connect(self.on_buttonAuto_clicked)
self.checkTickAll.stateChanged.connect(self.on_checkTickAll_stateChanged)
self.comboInstrument.activated.connect(self.on_comboInstrument_activated)
self.textRB.returnPressed.connect(self.on_textRB_editingFinished)
self.buttonAuto.clicked.connect(self.on_buttonAuto_clicked)
self.buttonSearch.clicked.connect(self.on_textRB_editingFinished)
self.buttonClear.clicked.connect(self.on_buttonClear_clicked)
self.buttonProcess.clicked.connect(self.on_buttonProcess_clicked)
Expand All @@ -136,7 +126,13 @@ def connectSlots(self):
self.actionSave_Workspaces.triggered.connect(self.on_actionSave_Workspaces_triggered)
self.actionClose_Refl_Gui.triggered.connect(self.windowRefl.close)
self.actionMantid_Help.triggered.connect(self.on_actionMantid_Help_triggered)
self.actionAutofill.triggered.connect(self.on_buttonAuto_clicked)
self.actionSearch_RB.triggered.connect(self.on_textRB_editingFinished)
self.actionClear_Table.triggered.connect(self.on_buttonClear_clicked)
self.actionProcess.triggered.connect(self.on_buttonProcess_clicked)
self.actionTransfer.triggered.connect(self.on_buttonTransfer_clicked)
self.tableMain.cellChanged.connect(self.on_tableMain_modified)

def populateList(self):
# Clear existing
self.listMain.clear()
Expand Down

0 comments on commit ecb04ec

Please sign in to comment.