kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a bug preventing the user from dropping an already-integrated titleblock template onto a diagram.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1628 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-04 16:13:08 +00:00
parent 3d9f1a876c
commit d995d9e6a9
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/diagramview.cpp
View File

@@ -752,7 +752,7 @@ bool DiagramView::mustIntegrateElement(const ElementsLocation &location) const {
can be directly applied can be directly applied
*/ */
bool DiagramView::mustIntegrateTitleBlockTemplate(const TitleBlockTemplateLocation &tbt_loc) const { bool DiagramView::mustIntegrateTitleBlockTemplate(const TitleBlockTemplateLocation &tbt_loc) const {
// unlike elements, the integration of title block templates is mandatory, so we simply check whether the parent project of the // unlike elements, the integration of title block templates is mandatory, so we simply check whether the parent project of the template is also the parent project of the diagram
QETProject *tbt_parent_project = tbt_loc.parentProject(); QETProject *tbt_parent_project = tbt_loc.parentProject();
if (!tbt_parent_project) return(true); if (!tbt_parent_project) return(true);

6
sources/qetproject.cpp
View File

@@ -675,7 +675,7 @@ QString QETProject::integrateElement(const QString &elmt_path, MoveElementsHandl
/** /**
Integrate a title block template into this project. Integrate a title block template into this project.
@param src_tbt The locaiton of the title block template to be integrated into this project @param src_tbt The location of the title block template to be integrated into this project
@param handler @param handler
@return the name of the template after integration, or an empty QString if a problem occured. @return the name of the template after integration, or an empty QString if a problem occured.
*/ */
@@ -690,10 +690,12 @@ QString QETProject::integrateTitleBlockTemplate(const TitleBlockTemplateLocation
continue; continue;
} else if (action == QET::Erase) { } else if (action == QET::Erase) {
break; break;
} else if (action == QET::Ignore || action == QET::Abort || action == QET::Managed) { } else if (action == QET::Abort || action == QET::Ignore) {
return(QString()); return(QString());
} else if (action == QET::Rename) { } else if (action == QET::Rename) {
target_name = handler -> nameForRenamingOperation(); target_name = handler -> nameForRenamingOperation();
} else if (action == QET::Managed) {
return(target_name);
} }
} }

4
sources/titleblock/integrationmovetemplateshandler.cpp
View File

@@ -68,7 +68,7 @@ QET::Action IntegrationMoveTitleBlockTemplatesHandler::templateAlreadyExists(con
if (src_tbt_document.toString(0) == dst_tbt_document.toString(0)) { if (src_tbt_document.toString(0) == dst_tbt_document.toString(0)) {
// the templates are the same, consider the integration is done // the templates are the same, consider the integration is done
qDebug() << Q_FUNC_INFO << "Not integrating" << src.parentCollection() << "/" << src.name()<< "because it is already present in the project"; qDebug() << Q_FUNC_INFO << "Not integrating" << src.parentCollection() << "/" << src.name()<< "because it is already present in the project";
return(QET::Ignore); return(QET::Managed);
} else { } else {
return(askUser(src, dst)); return(askUser(src, dst));
} }
@@ -127,7 +127,7 @@ QET::Action IntegrationMoveTitleBlockTemplatesHandler::askUser(const TitleBlockT
int result = integ_dialog_ -> exec(); int result = integ_dialog_ -> exec();
if (result == QDialog::Accepted) { if (result == QDialog::Accepted) {
if (use_existing_template_ -> isChecked()) { if (use_existing_template_ -> isChecked()) {
return(QET::Ignore); return(QET::Managed);
} else if (erase_template_ -> isChecked()) { } else if (erase_template_ -> isChecked()) {
return(QET::Erase); return(QET::Erase);
} else { } else {