Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
7e9ac8f6
Commit
7e9ac8f6
authored
10 years ago
by
Dan Nixon
Browse files
Options
Downloads
Patches
Plain Diff
Only emit the signal when the data has changed
Refs #11377
parent
ed7b8688
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Mantid/MantidQt/MantidWidgets/src/DataSelector.cpp
+10
-10
10 additions, 10 deletions
Code/Mantid/MantidQt/MantidWidgets/src/DataSelector.cpp
with
10 additions
and
10 deletions
Code/Mantid/MantidQt/MantidWidgets/src/DataSelector.cpp
+
10
−
10
View file @
7e9ac8f6
...
...
@@ -24,7 +24,7 @@ namespace MantidQt
connect
(
m_uiForm
.
pbLoadFile
,
SIGNAL
(
clicked
()),
this
,
SIGNAL
(
loadClicked
()));
//data selected changes
connect
(
m_uiForm
.
rfFileInput
,
SIGNAL
(
filesFound
()),
this
,
SLOT
(
handleFileInput
()));
connect
(
m_uiForm
.
rfFileInput
,
SIGNAL
(
filesFound
Changed
()),
this
,
SLOT
(
handleFileInput
()));
connect
(
m_uiForm
.
wsWorkspaceInput
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
handleWorkspaceInput
()));
connect
(
m_uiForm
.
pbLoadFile
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
handleFileInput
()));
...
...
@@ -66,7 +66,7 @@ namespace MantidQt
/**
* Get if the file selector is currently being shown.
*
* @return :: true if it is visible, otherwise false
* @return :: true if it is visible, otherwise false
*/
bool
DataSelector
::
isFileSelectorVisible
()
const
{
...
...
@@ -77,7 +77,7 @@ namespace MantidQt
/**
* Get if the workspace selector is currently being shown.
*
* @return :: true if it is visible, otherwise false
* @return :: true if it is visible, otherwise false
*/
bool
DataSelector
::
isWorkspaceSelectorVisible
()
const
{
...
...
@@ -107,7 +107,7 @@ namespace MantidQt
if
(
isValid
&&
m_autoLoad
)
{
const
QString
wsName
=
getCurrentDataName
();
if
(
!
AnalysisDataService
::
Instance
().
doesExist
(
wsName
.
toStdString
()))
{
//attempt to reload if we can
...
...
@@ -118,9 +118,9 @@ namespace MantidQt
loadAlg
->
setProperty
(
"Filename"
,
filepath
.
toStdString
());
loadAlg
->
setProperty
(
"OutputWorkspace"
,
wsName
.
toStdString
());
loadAlg
->
execute
();
isValid
=
AnalysisDataService
::
Instance
().
doesExist
(
wsName
.
toStdString
());
if
(
!
isValid
)
{
m_uiForm
.
rfFileInput
->
setFileProblem
(
"The specified workspace is missing from the analysis data service"
);
...
...
@@ -448,18 +448,18 @@ namespace MantidQt
*/
void
DataSelector
::
dropEvent
(
QDropEvent
*
de
)
{
const
QMimeData
*
mimeData
=
de
->
mimeData
();
const
QMimeData
*
mimeData
=
de
->
mimeData
();
auto
before_action
=
de
->
dropAction
();
if
(
de
->
mimeData
()
&&
mimeData
->
text
().
contains
(
" = mtd[
\"
"
)){
m_uiForm
.
wsWorkspaceInput
->
dropEvent
(
de
);
if
(
de
->
dropAction
()
==
before_action
){
if
(
de
->
dropAction
()
==
before_action
){
m_uiForm
.
cbInputType
->
setCurrentIndex
(
1
);
return
;
}
de
->
setDropAction
(
before_action
);
de
->
setDropAction
(
before_action
);
}
m_uiForm
.
rfFileInput
->
dropEvent
(
de
);
if
(
de
->
dropAction
()
==
before_action
){
m_uiForm
.
cbInputType
->
setCurrentIndex
(
0
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment