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.
This commit is contained in:
Laurent Trinques
2020-04-12 18:43:35 +02:00
parent cdf610b669
commit 5e2da1d937

View File

@@ -16,25 +16,12 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qetdiagrameditor.h" #include "qetdiagrameditor.h"
#include "qetapp.h"
#include "diagramcontent.h"
#include "diagramview.h" #include "diagramview.h"
#include "diagram.h"
#include "qetgraphicsitem/element.h"
#include "elementspanelwidget.h" #include "elementspanelwidget.h"
#include "conductorpropertieswidget.h"
#include "qetproject.h"
#include "projectview.h"
#include "recentfiles.h" #include "recentfiles.h"
#include "qeticons.h" #include "qeticons.h"
#include "qetelementeditor.h"
#include "qetmessagebox.h" #include "qetmessagebox.h"
#include "qetresult.h"
#include "genericpanel.h"
#include "nomenclature.h"
#include "diagramfoliolist.h" #include "diagramfoliolist.h"
#include "qetshapeitem.h"
#include "reportproperties.h"
#include "diagrampropertieseditordockwidget.h" #include "diagrampropertieseditordockwidget.h"
#include "diagrameventaddshape.h" #include "diagrameventaddshape.h"
#include "diagrameventaddimage.h" #include "diagrameventaddimage.h"
@@ -50,15 +37,11 @@
#include "addelementtextcommand.h" #include "addelementtextcommand.h"
#include "conductornumexport.h" #include "conductornumexport.h"
#include "qetgraphicstableitem.h" #include "qetgraphicstableitem.h"
#include "bomexportdialog.h"
#include "nomenclaturemodel.h" #include "nomenclaturemodel.h"
#include <QMessageBox>
#include <QStandardPaths>
#include <KAutoSaveFile> #include <KAutoSaveFile>
#include "elementscollectionmodel.h"
#include "bomexportdialog.h"
/** /**
* @brief QETDiagramEditor::QETDiagramEditor * @brief QETDiagramEditor::QETDiagramEditor
@@ -917,24 +900,17 @@ void QETDiagramEditor::saveAs() {
/** /**
* @brief QETDiagramEditor::newProject * @brief QETDiagramEditor::newProject
* Create an empty project * Create a new project with an empty diagram
* @return * @return
*/ */
bool QETDiagramEditor::newProject() { bool QETDiagramEditor::newProject()
// create new project without diagram {
QETProject *new_project = new QETProject(this); auto 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());
// add new diagram // add new diagram
new_project -> addNewDiagram(); new_project -> addNewDiagram();
return(addProject(new_project)); return addProject(new_project);
} }
/** /**