Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BornAgain
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

d847ed73

Commit d847ed73 authored 10 years ago by Pospelov, Gennady

Downloads
- Plain Diff

Merge branch 'PhifGuiBug' into develop

parents bf42e54b 85f65320

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Core/Algorithms/src/Simulation.cpp 6 additions, 0 deletions

Core/Algorithms/src/Simulation.cpp
GUI/coregui/Models/BeamItem.cpp 2 additions, 2 deletions

GUI/coregui/Models/BeamItem.cpp
GUI/coregui/Models/GUIExamplesFactory.cpp 1 addition, 1 deletion

GUI/coregui/Models/GUIExamplesFactory.cpp
GUI/coregui/Models/ParameterModelBuilder.cpp 6 additions, 2 deletions

GUI/coregui/Models/ParameterModelBuilder.cpp
GUI/coregui/Views/Components/InstrumentWidgets/BeamEditorWidget.cpp 2 additions, 1 deletion

...i/Views/Components/InstrumentWidgets/BeamEditorWidget.cpp
GUI/coregui/Views/Components/JobQueueWidgets/ModelTuningDelegate.cpp 14 additions, 2 deletions

.../Views/Components/JobQueueWidgets/ModelTuningDelegate.cpp
GUI/coregui/Views/Components/OutputDataWidgets/centralplot.cpp 1 addition, 1 deletion

...oregui/Views/Components/OutputDataWidgets/centralplot.cpp
GUI/coregui/Views/Components/widgetbox/widgetbox.cpp 2 additions, 2 deletions

GUI/coregui/Views/Components/widgetbox/widgetbox.cpp
GUI/coregui/mainwindow/SplashScreen.cpp 0 additions, 25 deletions

GUI/coregui/mainwindow/SplashScreen.cpp

with 34 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment