Skip to content
Snippets Groups Projects
Commit 9ddbcd42 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov Committed by Wuttke, Joachim
Browse files

clang-format

parent 06e9f4d0
No related branches found
No related tags found
1 merge request!852Reimplement RotMatrix using quaternions instead of generic 3x3 matrices
...@@ -335,10 +335,12 @@ void ProjectManager::createNewProject() ...@@ -335,10 +335,12 @@ void ProjectManager::createNewProject()
const QVariant defFunctionalities = const QVariant defFunctionalities =
appSettings->defaultFunctionalities(toVariant(ProjectDocument::All)); appSettings->defaultFunctionalities(toVariant(ProjectDocument::All));
gSessionData->projectDocument.value()->setFunctionalities(toFunctionalities(defFunctionalities)); gSessionData->projectDocument.value()->setFunctionalities(
toFunctionalities(defFunctionalities));
gSessionData->projectDocument.value()->setSingleInstrumentMode( gSessionData->projectDocument.value()->setSingleInstrumentMode(
appSettings->defaultIsSingleInstrumentMode()); appSettings->defaultIsSingleInstrumentMode());
gSessionData->projectDocument.value()->setSingleSampleMode(appSettings->defaultIsSingleSampleMode()); gSessionData->projectDocument.value()->setSingleSampleMode(
appSettings->defaultIsSingleSampleMode());
gSessionData->projectDocument.value()->setProjectName("Untitled"); gSessionData->projectDocument.value()->setProjectName("Untitled");
gSessionData->projectDocument.value()->clearModified(); gSessionData->projectDocument.value()->clearModified();
...@@ -355,7 +357,6 @@ void ProjectManager::deleteCurrentProject() ...@@ -355,7 +357,6 @@ void ProjectManager::deleteCurrentProject()
m_saveService->stopService(); m_saveService->stopService();
gSessionData->projectDocument.reset(); gSessionData->projectDocument.reset();
} }
//! Load project data from file name. If autosave info exists, opens dialog for project restore. //! Load project data from file name. If autosave info exists, opens dialog for project restore.
...@@ -370,7 +371,8 @@ ProjectDocument::ReadResult ProjectManager::loadProject(const QString& projectFi ...@@ -370,7 +371,8 @@ ProjectDocument::ReadResult ProjectManager::loadProject(const QString& projectFi
const QString autosaveName = GUI::Project::Utils::autosaveName(projectFileName); const QString autosaveName = GUI::Project::Utils::autosaveName(projectFileName);
if (useAutosave && restoreProjectDialog(projectFileName, autosaveName)) { if (useAutosave && restoreProjectDialog(projectFileName, autosaveName)) {
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
readResult = gSessionData->projectDocument.value()->loadProjectFile(autosaveName, messageService); readResult =
gSessionData->projectDocument.value()->loadProjectFile(autosaveName, messageService);
gSessionData->projectDocument.value()->setProjectFileName(projectFileName); gSessionData->projectDocument.value()->setProjectFileName(projectFileName);
gSessionData->projectDocument.value()->setModified(); gSessionData->projectDocument.value()->setModified();
} else { } else {
......
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