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
191ed0ed
Commit
191ed0ed
authored
8 years ago
by
Moore
Browse files
Options
Downloads
Patches
Plain Diff
clang-format and comments re #17315
parent
a7edbd4a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
MantidPlot/src/Mantid/MantidUI.h
+4
-4
4 additions, 4 deletions
MantidPlot/src/Mantid/MantidUI.h
MantidQt/MantidWidgets/src/WorkspacePresenter/WorkspacePresenter.cpp
+2
-0
2 additions, 0 deletions
...ntidWidgets/src/WorkspacePresenter/WorkspacePresenter.cpp
with
6 additions
and
4 deletions
MantidPlot/src/Mantid/MantidUI.h
+
4
−
4
View file @
191ed0ed
...
...
@@ -626,8 +626,8 @@ private:
boost
::
shared_ptr
<
MantidQt
::
MantidWidgets
::
QWorkspaceDockView
>
m_exploreMantid
;
// Dock window for manipulating workspaces
AlgorithmDockWidget
*
m_exploreAlgorithms
;
// Dock window for using algorithms
RemoteClusterDockWidget
*
m_exploreRemoteTasks
;
// Dock window for using remote tasks
RemoteClusterDockWidget
*
m_exploreRemoteTasks
;
// Dock window for using remote tasks
/// Current fit property browser being used
MantidQt
::
MantidWidgets
::
FitPropertyBrowser
*
m_fitFunction
;
/// Default fit property browser (the one docked on the left)
...
...
@@ -668,8 +668,8 @@ private:
// Stores dependent mdi windows. If the 'key' window closes, all 'value' ones
// must be closed as well.
std
::
unordered_multimap
<
MdiSubWindow
*
,
MdiSubWindow
*>
m_mdiDependency
;
QMdiSubWindow
*
m_vatesSubWindow
;
///< Holder for the Vates interface sub-window
QMdiSubWindow
*
m_vatesSubWindow
;
///< Holder for the Vates interface sub-window
// prevents some repeated code realtating to log names
void
formatLogName
(
QString
&
label
,
const
QString
&
wsName
);
...
...
This diff is collapsed.
Click to expand it.
MantidQt/MantidWidgets/src/WorkspacePresenter/WorkspacePresenter.cpp
+
2
−
0
View file @
191ed0ed
...
...
@@ -397,6 +397,8 @@ void WorkspacePresenter::clearUBMatrix() {
if
(
alg
)
{
alg
->
initialize
();
alg
->
setPropertyValue
(
"Workspace"
,
ws
);
// Run in this manner due to Qt dependencies within this method.
// otherwise it would have been implemented here.
view
->
executeAlgorithmAsync
(
alg
);
}
else
break
;
...
...
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