Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
9515a3ee
Commit
9515a3ee
authored
Jun 09, 2016
by
Martyn Gigg
Browse files
Use newer QAction::triggered signal in Mantid Qt code
Removes warnings about using a COMPAT signal on startup.
parent
fcc1d020
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
MantidPlot/src/ApplicationWindow.cpp
View file @
9515a3ee
This diff is collapsed.
Click to expand it.
MantidPlot/src/ApplicationWindow.h
View file @
9515a3ee
...
...
@@ -643,7 +643,7 @@ public slots:
void
updateCurves
(
Table
*
t
,
const
QString
&
name
);
void
showTable
(
const
QString
&
curve
);
void
showTable
(
int
i
);
void
showTable
(
QAction
*
action
);
void
addColToTable
();
void
cutSelection
();
...
...
MantidPlot/src/Mantid/MantidDock.cpp
View file @
9515a3ee
...
...
@@ -98,8 +98,8 @@ MantidDockWidget::MantidDockWidget(MantidUI *mui, ApplicationWindow *parent)
m_loadMapper
=
new
QSignalMapper
(
this
);
m_loadMapper
->
setMapping
(
liveDataAction
,
"StartLiveData"
);
m_loadMapper
->
setMapping
(
loadFileAction
,
"Load"
);
connect
(
liveDataAction
,
SIGNAL
(
activat
ed
()),
m_loadMapper
,
SLOT
(
map
()));
connect
(
loadFileAction
,
SIGNAL
(
activat
ed
()),
m_loadMapper
,
SLOT
(
map
()));
connect
(
liveDataAction
,
SIGNAL
(
trigger
ed
()),
m_loadMapper
,
SLOT
(
map
()));
connect
(
loadFileAction
,
SIGNAL
(
trigger
ed
()),
m_loadMapper
,
SLOT
(
map
()));
connect
(
m_loadMapper
,
SIGNAL
(
mapped
(
const
QString
&
)),
m_mantidUI
,
SLOT
(
showAlgorithmDialog
(
const
QString
&
)));
m_loadMenu
->
addAction
(
loadFileAction
);
...
...
@@ -196,11 +196,11 @@ void MantidDockWidget::createWorkspaceMenuActions() {
connect
(
m_colorFill
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
drawColorFillPlot
()));
m_showDetectors
=
new
QAction
(
tr
(
"Show Detectors"
),
this
);
connect
(
m_showDetectors
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_showDetectors
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
showDetectorTable
()));
m_showBoxData
=
new
QAction
(
tr
(
"Show Box Data Table"
),
this
);
connect
(
m_showBoxData
,
SIGNAL
(
activat
ed
()),
m_mantidUI
,
connect
(
m_showBoxData
,
SIGNAL
(
trigger
ed
()),
m_mantidUI
,
SLOT
(
importBoxDataTable
()));
m_showVatesGui
=
new
QAction
(
tr
(
"Show Vates Simple Interface"
),
this
);
...
...
@@ -211,18 +211,18 @@ void MantidDockWidget::createWorkspaceMenuActions() {
QSize
(),
QIcon
::
Normal
,
QIcon
::
Off
);
m_showVatesGui
->
setIcon
(
icon
);
}
connect
(
m_showVatesGui
,
SIGNAL
(
activat
ed
()),
m_mantidUI
,
connect
(
m_showVatesGui
,
SIGNAL
(
trigger
ed
()),
m_mantidUI
,
SLOT
(
showVatesSimpleInterface
()));
m_showMDPlot
=
new
QAction
(
tr
(
"Plot MD"
),
this
);
connect
(
m_showMDPlot
,
SIGNAL
(
activat
ed
()),
m_mantidUI
,
SLOT
(
showMDPlot
()));
connect
(
m_showMDPlot
,
SIGNAL
(
trigger
ed
()),
m_mantidUI
,
SLOT
(
showMDPlot
()));
m_showListData
=
new
QAction
(
tr
(
"List Data"
),
this
);
connect
(
m_showListData
,
SIGNAL
(
activat
ed
()),
m_mantidUI
,
connect
(
m_showListData
,
SIGNAL
(
trigger
ed
()),
m_mantidUI
,
SLOT
(
showListData
()));
m_showSpectrumViewer
=
new
QAction
(
tr
(
"Show Spectrum Viewer"
),
this
);
connect
(
m_showSpectrumViewer
,
SIGNAL
(
activat
ed
()),
m_mantidUI
,
connect
(
m_showSpectrumViewer
,
SIGNAL
(
trigger
ed
()),
m_mantidUI
,
SLOT
(
showSpectrumViewer
()));
m_showSliceViewer
=
new
QAction
(
tr
(
"Show Slice Viewer"
),
this
);
...
...
@@ -233,7 +233,7 @@ void MantidDockWidget::createWorkspaceMenuActions() {
QSize
(),
QIcon
::
Normal
,
QIcon
::
Off
);
m_showSliceViewer
->
setIcon
(
icon
);
}
connect
(
m_showSliceViewer
,
SIGNAL
(
activat
ed
()),
m_mantidUI
,
connect
(
m_showSliceViewer
,
SIGNAL
(
trigger
ed
()),
m_mantidUI
,
SLOT
(
showSliceViewer
()));
m_showLogs
=
new
QAction
(
tr
(
"Sample Logs..."
),
this
);
...
...
@@ -249,11 +249,11 @@ void MantidDockWidget::createWorkspaceMenuActions() {
SLOT
(
showAlgorithmHistory
()));
m_saveNexus
=
new
QAction
(
tr
(
"Save Nexus"
),
this
);
connect
(
m_saveNexus
,
SIGNAL
(
activat
ed
()),
m_mantidUI
,
connect
(
m_saveNexus
,
SIGNAL
(
trigger
ed
()),
m_mantidUI
,
SLOT
(
saveNexusWorkspace
()));
m_rename
=
new
QAction
(
tr
(
"Rename"
),
this
);
connect
(
m_rename
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
renameWorkspace
()));
connect
(
m_rename
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
renameWorkspace
()));
m_delete
=
new
QAction
(
tr
(
"Delete"
),
this
);
connect
(
m_delete
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
deleteWorkspaces
()));
...
...
@@ -276,7 +276,7 @@ void MantidDockWidget::createWorkspaceMenuActions() {
SLOT
(
convertMDHistoToMatrixWorkspace
()));
m_clearUB
=
new
QAction
(
tr
(
"Clear UB Matrix"
),
this
);
connect
(
m_clearUB
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
clearUB
()));
connect
(
m_clearUB
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
clearUB
()));
m_plotSurface
=
new
QAction
(
tr
(
"Plot Surface from Group"
),
this
);
connect
(
m_plotSurface
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
plotSurface
()));
...
...
@@ -321,12 +321,12 @@ void MantidDockWidget::createSortMenuActions() {
m_sortChoiceGroup
->
setExclusive
(
true
);
m_byNameChoice
->
setChecked
(
true
);
connect
(
m_ascendingSortAction
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_ascendingSortAction
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
sortAscending
()));
connect
(
m_descendingSortAction
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_descendingSortAction
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
sortDescending
()));
connect
(
m_byNameChoice
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
chooseByName
()));
connect
(
m_byLastModifiedChoice
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_byNameChoice
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
chooseByName
()));
connect
(
m_byLastModifiedChoice
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
chooseByLastModified
()));
m_sortMenu
->
addActions
(
sortDirectionGroup
->
actions
());
...
...
@@ -1295,7 +1295,7 @@ void MantidDockWidget::popupMenu(const QPoint &pos) {
QString
name
=
QString
::
fromStdString
(
programNames
[
i
]);
// Setup new menu option for the program
m_program
=
new
QAction
(
name
,
this
);
connect
(
m_program
,
SIGNAL
(
activat
ed
()),
m_programMapper
,
SLOT
(
map
()));
connect
(
m_program
,
SIGNAL
(
trigger
ed
()),
m_programMapper
,
SLOT
(
map
()));
// Send name of program when clicked
m_programMapper
->
setMapping
(
m_program
,
name
);
m_saveToProgram
->
addAction
(
m_program
);
...
...
MantidPlot/src/Mantid/MantidUI.cpp
View file @
9515a3ee
...
...
@@ -138,46 +138,46 @@ MantidUI::MantidUI(ApplicationWindow *aw)
actionCopyRowToTable
=
new
QAction
(
this
);
actionCopyRowToTable
->
setIcon
(
QIcon
(
getQPixmap
(
"table_xpm"
)));
connect
(
actionCopyRowToTable
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionCopyRowToTable
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyRowToTable
()));
actionCopyRowToGraph
=
new
QAction
(
this
);
actionCopyRowToGraph
->
setIcon
(
QIcon
(
getQPixmap
(
"graph_xpm"
)));
connect
(
actionCopyRowToGraph
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionCopyRowToGraph
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyRowToGraph
()));
actionCopyRowToGraphErr
=
new
QAction
(
this
);
actionCopyRowToGraphErr
->
setIcon
(
QIcon
(
getQPixmap
(
"graph_xpm"
)));
connect
(
actionCopyRowToGraphErr
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionCopyRowToGraphErr
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyRowToGraphErr
()));
actionWaterfallPlot
=
new
QAction
(
QIcon
(
":/waterfall_plot.png"
),
tr
(
"Plot spectra as waterfall"
),
this
);
connect
(
actionWaterfallPlot
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionWaterfallPlot
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyRowsToWaterfall
()));
actionCopyDetectorsToTable
=
new
QAction
(
tr
(
"View detectors table"
),
this
);
actionCopyDetectorsToTable
->
setIcon
(
QIcon
(
getQPixmap
(
"table_xpm"
)));
connect
(
actionCopyDetectorsToTable
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionCopyDetectorsToTable
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyDetectorsToTable
()));
actionCopyValues
=
new
QAction
(
tr
(
"Copy"
),
this
);
actionCopyValues
->
setIcon
(
QIcon
(
getQPixmap
(
"copy_xpm"
)));
connect
(
actionCopyValues
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
copyValues
()));
connect
(
actionCopyValues
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyValues
()));
actionCopyColumnToTable
=
new
QAction
(
this
);
actionCopyColumnToTable
->
setIcon
(
QIcon
(
getQPixmap
(
"table_xpm"
)));
connect
(
actionCopyColumnToTable
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionCopyColumnToTable
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyColumnToTable
()));
actionCopyColumnToGraph
=
new
QAction
(
this
);
actionCopyColumnToGraph
->
setIcon
(
QIcon
(
getQPixmap
(
"graph_xpm"
)));
connect
(
actionCopyColumnToGraph
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionCopyColumnToGraph
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyColumnToGraph
()));
actionCopyColumnToGraphErr
=
new
QAction
(
this
);
actionCopyColumnToGraphErr
->
setIcon
(
QIcon
(
getQPixmap
(
"graph_xpm"
)));
connect
(
actionCopyColumnToGraphErr
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
actionCopyColumnToGraphErr
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copyColumnToGraphErr
()));
connect
(
this
,
SIGNAL
(
needToCreateLoadDAEMantidMatrix
(
const
QString
&
)),
this
,
...
...
@@ -2176,11 +2176,11 @@ void MantidUI::menuMantidMatrixAboutToShow() {
menuMantidMatrix
->
addAction
(
action
);
action
=
new
QAction
(
"Save Nexus"
,
this
);
connect
(
action
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
saveNexusWorkspace
()));
connect
(
action
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveNexusWorkspace
()));
menuMantidMatrix
->
addAction
(
action
);
action
=
new
QAction
(
"Rename"
,
this
);
connect
(
action
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
renameWorkspace
()));
connect
(
action
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
renameWorkspace
()));
menuMantidMatrix
->
addAction
(
action
);
// separate delete
...
...
MantidQt/CustomInterfaces/src/DynamicPDF/DPDFFitControl.cpp
View file @
9515a3ee
...
...
@@ -376,7 +376,7 @@ void FitControl::loadBuiltInModels(QMenu *menuModels) {
for
(
int
i
=
0
;
i
<
modelNames
.
size
();
i
++
)
{
QAction
*
actionModel
=
new
QAction
(
modelNames
.
at
(
i
),
this
);
mapperModel
->
setMapping
(
actionModel
,
modelNames
.
at
(
i
));
connect
(
actionModel
,
SIGNAL
(
activat
ed
()),
mapperModel
,
SLOT
(
map
()));
connect
(
actionModel
,
SIGNAL
(
trigger
ed
()),
mapperModel
,
SLOT
(
map
()));
menuModels
->
addAction
(
actionModel
);
}
connect
(
mapperModel
,
SIGNAL
(
mapped
(
const
QString
&
)),
this
,
...
...
MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFEditLocalParameterDialog.cpp
View file @
9515a3ee
...
...
@@ -173,13 +173,13 @@ void EditLocalParameterDialog::showContextMenu() {
{
QAction
*
action
=
new
QAction
(
"Copy"
,
this
);
action
->
setToolTip
(
"Copy data to clipboard."
);
connect
(
action
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
copy
()));
connect
(
action
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
copy
()));
menu
->
addAction
(
action
);
}
{
QAction
*
action
=
new
QAction
(
"Paste"
,
this
);
action
->
setToolTip
(
"Paste data from clipboard."
);
connect
(
action
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
paste
()));
connect
(
action
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
paste
()));
auto
text
=
QApplication
::
clipboard
()
->
text
();
action
->
setEnabled
(
!
text
.
isEmpty
());
menu
->
addAction
(
action
);
...
...
MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
View file @
9515a3ee
...
...
@@ -245,12 +245,12 @@ void SANSRunWindow::initLayout() {
m_uiForm
.
batch_table
->
setContextMenuPolicy
(
Qt
::
ActionsContextMenu
);
m_batch_paste
=
new
QAction
(
tr
(
"&Paste"
),
m_uiForm
.
batch_table
);
m_batch_paste
->
setShortcut
(
tr
(
"Ctrl+P"
));
connect
(
m_batch_paste
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
pasteToBatchTable
()));
connect
(
m_batch_paste
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
pasteToBatchTable
()));
m_uiForm
.
batch_table
->
addAction
(
m_batch_paste
);
m_batch_clear
=
new
QAction
(
tr
(
"&Clear"
),
m_uiForm
.
batch_table
);
m_uiForm
.
batch_table
->
addAction
(
m_batch_clear
);
connect
(
m_batch_clear
,
SIGNAL
(
activat
ed
()),
this
,
SLOT
(
clearBatchTable
()));
connect
(
m_batch_clear
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
clearBatchTable
()));
// Main Logging
m_uiForm
.
logging_field
->
attachLoggingChannel
();
...
...
MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp
View file @
9515a3ee
...
...
@@ -305,10 +305,10 @@ void FitPropertyBrowser::initLayout(QWidget *w) {
m_fitMapper
->
setMapping
(
m_fitActionSeqFit
,
"SeqFit"
);
m_fitMapper
->
setMapping
(
m_fitActionUndoFit
,
"UndoFit"
);
m_fitMapper
->
setMapping
(
m_fitActionEvaluate
,
"Evaluate"
);
connect
(
m_fitActionFit
,
SIGNAL
(
activat
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitActionSeqFit
,
SIGNAL
(
activat
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitActionUndoFit
,
SIGNAL
(
activat
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitActionEvaluate
,
SIGNAL
(
activat
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitActionFit
,
SIGNAL
(
trigger
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitActionSeqFit
,
SIGNAL
(
trigger
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitActionUndoFit
,
SIGNAL
(
trigger
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitActionEvaluate
,
SIGNAL
(
trigger
ed
()),
m_fitMapper
,
SLOT
(
map
()));
connect
(
m_fitMapper
,
SIGNAL
(
mapped
(
const
QString
&
)),
this
,
SLOT
(
executeFitMenu
(
const
QString
&
)));
m_fitMenu
->
addAction
(
m_fitActionFit
);
...
...
@@ -331,11 +331,11 @@ void FitPropertyBrowser::initLayout(QWidget *w) {
displayMapper
->
setMapping
(
m_displayActionPlotGuess
,
"PlotGuess"
);
displayMapper
->
setMapping
(
m_displayActionQuality
,
"Quality"
);
displayMapper
->
setMapping
(
m_displayActionClearAll
,
"ClearAll"
);
connect
(
m_displayActionPlotGuess
,
SIGNAL
(
activat
ed
()),
displayMapper
,
connect
(
m_displayActionPlotGuess
,
SIGNAL
(
trigger
ed
()),
displayMapper
,
SLOT
(
map
()));
connect
(
m_displayActionQuality
,
SIGNAL
(
activat
ed
()),
displayMapper
,
connect
(
m_displayActionQuality
,
SIGNAL
(
trigger
ed
()),
displayMapper
,
SLOT
(
map
()));
connect
(
m_displayActionClearAll
,
SIGNAL
(
activat
ed
()),
displayMapper
,
connect
(
m_displayActionClearAll
,
SIGNAL
(
trigger
ed
()),
displayMapper
,
SLOT
(
map
()));
connect
(
displayMapper
,
SIGNAL
(
mapped
(
const
QString
&
)),
this
,
SLOT
(
executeDisplayMenu
(
const
QString
&
)));
...
...
MantidQt/MantidWidgets/src/InstrumentView/InstrumentWidget.cpp
View file @
9515a3ee
...
...
@@ -148,7 +148,7 @@ InstrumentWidget::InstrumentWidget(const QString &wsName, QWidget *parent,
// Init actions
m_clearPeakOverlays
=
new
QAction
(
"Clear peaks"
,
this
);
connect
(
m_clearPeakOverlays
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_clearPeakOverlays
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
clearPeakOverlays
()));
// confirmClose(app->confirmCloseInstrWindow);
...
...
MantidQt/MantidWidgets/src/InstrumentView/InstrumentWidgetMaskTab.cpp
View file @
9515a3ee
...
...
@@ -208,38 +208,38 @@ InstrumentWidgetMaskTab::InstrumentWidgetMaskTab(InstrumentWidget *instrWidget)
new
QAction
(
"As Detector Mask to workspace"
,
this
);
m_save_as_workspace_exclude
->
setToolTip
(
"Save current detector mask to mask workspace."
);
connect
(
m_save_as_workspace_exclude
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_as_workspace_exclude
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveMaskToWorkspace
()));
m_save_as_workspace_include
=
new
QAction
(
"As Detector ROI to workspace"
,
this
);
m_save_as_workspace_include
->
setToolTip
(
"Save current detector mask as ROI to mask workspace."
);
connect
(
m_save_as_workspace_include
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_as_workspace_include
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveInvertedMaskToWorkspace
()));
m_save_as_file_exclude
=
new
QAction
(
"As Detector Mask to file"
,
this
);
m_save_as_file_exclude
->
setToolTip
(
"Save current detector mask to mask file."
);
connect
(
m_save_as_file_exclude
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_as_file_exclude
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveMaskToFile
()));
m_save_as_file_include
=
new
QAction
(
"As Detector ROI to file"
,
this
);
m_save_as_file_include
->
setToolTip
(
"Save current mask as ROI to mask file."
);
connect
(
m_save_as_file_include
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_as_file_include
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveInvertedMaskToFile
()));
m_save_as_cal_file_exclude
=
new
QAction
(
"As Detector Mask to cal file"
,
this
);
m_save_as_cal_file_exclude
->
setToolTip
(
"Save current detector mask to cal file."
);
connect
(
m_save_as_cal_file_exclude
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_as_cal_file_exclude
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveMaskToCalFile
()));
m_save_as_cal_file_include
=
new
QAction
(
"As Detector ROI to cal file"
,
this
);
m_save_as_cal_file_include
->
setToolTip
(
"Save current detector mask as ROI to cal file."
);
connect
(
m_save_as_cal_file_include
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_as_cal_file_include
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveInvertedMaskToCalFile
()));
m_save_as_table_xrange_exclude
=
...
...
@@ -249,29 +249,29 @@ InstrumentWidgetMaskTab::InstrumentWidgetMaskTab(InstrumentWidget *instrWidget)
"The name of output table workspace is 'MaskBinTable'. "
"If the output table workspace has alrady exist, then "
"the newly masked detectors will be added to output workspace."
);
connect
(
m_save_as_table_xrange_exclude
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_as_table_xrange_exclude
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveMaskToTable
()));
m_save_group_file_include
=
new
QAction
(
"As include group to file"
,
this
);
m_save_group_file_include
->
setToolTip
(
"Save current mask as include group to a file."
);
connect
(
m_save_group_file_include
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_group_file_include
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveIncludeGroupToFile
()));
m_save_group_file_exclude
=
new
QAction
(
"As exclude group to file"
,
this
);
m_save_group_file_exclude
->
setToolTip
(
"Save current mask as exclude group to a file."
);
connect
(
m_save_group_file_exclude
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_save_group_file_exclude
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
saveExcludeGroupToFile
()));
m_extract_to_workspace
=
new
QAction
(
"Extract detectors to workspace"
,
this
);
m_extract_to_workspace
->
setToolTip
(
"Extract detectors to workspace."
);
connect
(
m_extract_to_workspace
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_extract_to_workspace
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
extractDetsToWorkspace
()));
m_sum_to_workspace
=
new
QAction
(
"Sum detectors to workspace"
,
this
);
m_sum_to_workspace
->
setToolTip
(
"Sum detectors to workspace."
);
connect
(
m_sum_to_workspace
,
SIGNAL
(
activat
ed
()),
this
,
connect
(
m_sum_to_workspace
,
SIGNAL
(
trigger
ed
()),
this
,
SLOT
(
sumDetsToWorkspace
()));
// Save button and its menus
...
...
MantidQt/MantidWidgets/src/MessageDisplay.cpp
View file @
9515a3ee
...
...
@@ -322,11 +322,11 @@ void MessageDisplay::initActions() {
m_logLevelMapping
->
setMapping
(
m_information
,
Poco
::
Message
::
PRIO_INFORMATION
);
m_logLevelMapping
->
setMapping
(
m_debug
,
Poco
::
Message
::
PRIO_DEBUG
);
connect
(
m_error
,
SIGNAL
(
activat
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_warning
,
SIGNAL
(
activat
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_notice
,
SIGNAL
(
activat
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_information
,
SIGNAL
(
activat
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_debug
,
SIGNAL
(
activat
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_error
,
SIGNAL
(
trigger
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_warning
,
SIGNAL
(
trigger
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_notice
,
SIGNAL
(
trigger
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_information
,
SIGNAL
(
trigger
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_debug
,
SIGNAL
(
trigger
ed
()),
m_logLevelMapping
,
SLOT
(
map
()));
connect
(
m_logLevelMapping
,
SIGNAL
(
mapped
(
int
)),
this
,
SLOT
(
setGlobalLogLevel
(
int
)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment