Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
48a1bd40
Commit
48a1bd40
authored
3 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
decoupled Project from mainwindow
parent
68813a78
No related branches found
No related tags found
1 merge request
!427
Reduce include dependences in GUI; break cyclic dependence between View and Model
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Project/OutputDataIOHistory.cpp
+2
-2
2 additions, 2 deletions
GUI/Project/OutputDataIOHistory.cpp
GUI/Project/OutputDataIOHistory.h
+4
-4
4 additions, 4 deletions
GUI/Project/OutputDataIOHistory.h
GUI/Project/OutputDataIOService.h
+1
-1
1 addition, 1 deletion
GUI/Project/OutputDataIOService.h
with
7 additions
and
7 deletions
GUI/
mainwindow
/OutputDataIOHistory.cpp
→
GUI/
Project
/OutputDataIOHistory.cpp
+
2
−
2
View file @
48a1bd40
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
//
//
// BornAgain: simulate and fit reflection and scattering
// BornAgain: simulate and fit reflection and scattering
//
//
//! @file GUI/
mainwindow
/OutputDataIOHistory.cpp
//! @file GUI/
Project
/OutputDataIOHistory.cpp
//! @brief Defines OutputDataIOHistory classes
//! @brief Defines OutputDataIOHistory classes
//!
//!
//! @homepage http://www.bornagainproject.org
//! @homepage http://www.bornagainproject.org
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
//
//
// ************************************************************************************************
// ************************************************************************************************
#include
"GUI/
mainwindow
/OutputDataIOHistory.h"
#include
"GUI/
Project
/OutputDataIOHistory.h"
#include
"Base/Utils/Assert.h"
#include
"Base/Utils/Assert.h"
#include
"GUI/utils/Error.h"
#include
"GUI/utils/Error.h"
#include
"GUI/utils/SaveLoadInterface.h"
#include
"GUI/utils/SaveLoadInterface.h"
...
...
This diff is collapsed.
Click to expand it.
GUI/
mainwindow
/OutputDataIOHistory.h
→
GUI/
Project
/OutputDataIOHistory.h
+
4
−
4
View file @
48a1bd40
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
//
//
// BornAgain: simulate and fit reflection and scattering
// BornAgain: simulate and fit reflection and scattering
//
//
//! @file GUI/
mainwindow
/OutputDataIOHistory.h
//! @file GUI/
Project
/OutputDataIOHistory.h
//! @brief Defines OutputDataIOHistory classes
//! @brief Defines OutputDataIOHistory classes
//!
//!
//! @homepage http://www.bornagainproject.org
//! @homepage http://www.bornagainproject.org
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
//
//
// ************************************************************************************************
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_
MAINWINDOW
_OUTPUTDATAIOHISTORY_H
#ifndef BORNAGAIN_GUI_
PROJECT
_OUTPUTDATAIOHISTORY_H
#define BORNAGAIN_GUI_
MAINWINDOW
_OUTPUTDATAIOHISTORY_H
#define BORNAGAIN_GUI_
PROJECT
_OUTPUTDATAIOHISTORY_H
#include
<QDateTime>
#include
<QDateTime>
#include
<QMap>
#include
<QMap>
...
@@ -80,4 +80,4 @@ private:
...
@@ -80,4 +80,4 @@ private:
QMap
<
QString
,
OutputDataDirHistory
>
m_dir_history
;
QMap
<
QString
,
OutputDataDirHistory
>
m_dir_history
;
};
};
#endif // BORNAGAIN_GUI_
MAINWINDOW
_OUTPUTDATAIOHISTORY_H
#endif // BORNAGAIN_GUI_
PROJECT
_OUTPUTDATAIOHISTORY_H
This diff is collapsed.
Click to expand it.
GUI/Project/OutputDataIOService.h
+
1
−
1
View file @
48a1bd40
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOSERVICE_H
#ifndef BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOSERVICE_H
#define BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOSERVICE_H
#define BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOSERVICE_H
#include
"GUI/
mainwindow
/OutputDataIOHistory.h"
#include
"GUI/
Project
/OutputDataIOHistory.h"
#include
<QObject>
#include
<QObject>
class
ApplicationModels
;
class
ApplicationModels
;
...
...
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