Skip to content
Snippets Groups Projects
Commit 230f8a5d authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

clang-format

parent aaaf5b9c
No related branches found
No related tags found
1 merge request!569GUI: Replace MainWindows::instance by global pointer; decouple ProjectManager from MainWindow
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include "App/AppOptions.h" #include "App/AppOptions.h"
#include "App/MessageHandler.h" #include "App/MessageHandler.h"
#include "GUI/Application/ApplicationSettings.h" #include "GUI/Application/ApplicationSettings.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/Model/State/SessionData.h" #include "GUI/Model/State/SessionData.h"
#include "GUI/Util/OSInfo.h" #include "GUI/Util/OSInfo.h"
#include "GUI/Util/Path.h" #include "GUI/Util/Path.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Loaders/DataLoaderUtil.h" #include "GUI/View/Loaders/DataLoaderUtil.h"
#include "GUI/View/Main/MainWindow.h" #include "GUI/View/Main/MainWindow.h"
#include "config_build.h" #include "config_build.h"
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#include "GUI/Model/Types/VectorDescriptor.h" #include "GUI/Model/Types/VectorDescriptor.h"
#include "GUI/Util/Error.h" #include "GUI/Util/Error.h"
#include "Sample/Particle/Crystal.h" #include "Sample/Particle/Crystal.h"
#include "Sample/Particle/IBornFF.h"
#include "Sample/Particle/MesoCrystal.h" #include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h" #include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h" #include "Sample/Particle/ParticleCoreShell.h"
#include "Sample/Particle/IBornFF.h"
namespace { namespace {
......
...@@ -118,8 +118,9 @@ void IntensityDataCanvas::rotateData() ...@@ -118,8 +118,9 @@ void IntensityDataCanvas::rotateData()
const QString title("Rotate data"); const QString title("Rotate data");
const QString message("Rotation will break the link between the data and the instrument. " const QString message("Rotation will break the link between the data and the instrument. "
"Detector masks or projections, if they exist, will be removed."); "Detector masks or projections, if they exist, will be removed.");
if (!GUI::View::Helpers::question(GUI::Global::mainWindow, title, message, "Do you wish to rotate the data?", if (!GUI::View::Helpers::question(GUI::Global::mainWindow, title, message,
"Yes, please rotate", "No, cancel data rotation")) "Do you wish to rotate the data?", "Yes, please rotate",
"No, cancel data rotation"))
return; return;
} }
......
...@@ -212,7 +212,9 @@ MultiLayerItem* PyImportAssistant::populateModels(SampleModel* sampleModel, ...@@ -212,7 +212,9 @@ MultiLayerItem* PyImportAssistant::populateModels(SampleModel* sampleModel,
QString message("Exception thrown while trying to build GUI models.\n" QString message("Exception thrown while trying to build GUI models.\n"
"GUI models might be in inconsistent state.\n\n"); "GUI models might be in inconsistent state.\n\n");
QString details = QString::fromStdString(std::string(ex.what())); QString details = QString::fromStdString(std::string(ex.what()));
DetailedMessageBox(GUI::Global::mainWindow, "GUI::Model::ObjectBuilder failure", message, details).exec(); DetailedMessageBox(GUI::Global::mainWindow, "GUI::Model::ObjectBuilder failure", message,
details)
.exec();
return nullptr; return nullptr;
} }
} }
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#define BORNAGAIN_SAMPLE_PARTICLE_PARTICLE_H #define BORNAGAIN_SAMPLE_PARTICLE_PARTICLE_H
#include "Sample/Material/Material.h" #include "Sample/Material/Material.h"
#include "Sample/Particle/IParticle.h"
#include "Sample/Particle/IBornFF.h" #include "Sample/Particle/IBornFF.h"
#include "Sample/Particle/IParticle.h"
//! A particle with a form factor and refractive index. //! A particle with a form factor and refractive index.
//! @ingroup samples //! @ingroup samples
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment