From 5e2da1d9370a2441781891491e4d35bec6e62e1e Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sun, 12 Apr 2020 18:43:35 +0200 Subject: [PATCH] Merge Minor revamp Remove unused include. QETproject : Default titleblock are set in the default constructor instead of set by qetdiagrameditor. conductor, border, report and xref propertie are now set in the header of QETProject instead of set by the qetdiagrameditor just after the creation of a new project. --- sources/qetdiagrameditor.cpp | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 2f4983b3d..31ec13f83 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -16,25 +16,12 @@ along with QElectroTech. If not, see . */ #include "qetdiagrameditor.h" -#include "qetapp.h" -#include "diagramcontent.h" #include "diagramview.h" -#include "diagram.h" -#include "qetgraphicsitem/element.h" #include "elementspanelwidget.h" -#include "conductorpropertieswidget.h" -#include "qetproject.h" -#include "projectview.h" #include "recentfiles.h" #include "qeticons.h" -#include "qetelementeditor.h" #include "qetmessagebox.h" -#include "qetresult.h" -#include "genericpanel.h" -#include "nomenclature.h" #include "diagramfoliolist.h" -#include "qetshapeitem.h" -#include "reportproperties.h" #include "diagrampropertieseditordockwidget.h" #include "diagrameventaddshape.h" #include "diagrameventaddimage.h" @@ -50,15 +37,11 @@ #include "addelementtextcommand.h" #include "conductornumexport.h" #include "qetgraphicstableitem.h" +#include "bomexportdialog.h" #include "nomenclaturemodel.h" -#include -#include #include -#include "elementscollectionmodel.h" -#include "bomexportdialog.h" - /** * @brief QETDiagramEditor::QETDiagramEditor @@ -917,24 +900,17 @@ void QETDiagramEditor::saveAs() { /** * @brief QETDiagramEditor::newProject - * Create an empty project + * Create a new project with an empty diagram * @return */ -bool QETDiagramEditor::newProject() { - // create new project without diagram - QETProject *new_project = new QETProject(this); - - // Set default properties for new diagram - new_project -> setDefaultBorderProperties (BorderProperties:: defaultProperties()); - new_project -> setDefaultConductorProperties (ConductorProperties:: defaultProperties()); - new_project -> setDefaultTitleBlockProperties (TitleBlockProperties::defaultProperties()); - new_project -> setDefaultReportProperties (ReportProperties:: defaultProperties()); - new_project -> setDefaultXRefProperties (XRefProperties:: defaultProperties()); +bool QETDiagramEditor::newProject() +{ + auto new_project = new QETProject(this); // add new diagram new_project -> addNewDiagram(); - return(addProject(new_project)); + return addProject(new_project); } /**