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

Minor code improvent in creation of diagram folio list

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3313 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-09-18 18:12:05 +00:00
parent f3aeb872c3
commit 0b5c110b8f
4 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
sources/qetproject.cpp
View File

@@ -914,29 +914,39 @@ Diagram *QETProject::addNewDiagram() {
* Add new diagram folio list
* @return the created diagram
*/
Diagram *QETProject::addNewDiagramFolioList() {
// do nothing if project is read only
if (isReadOnly()) return(0);
QList <Diagram *> QETProject::addNewDiagramFolioList() {
// do nothing if project is read only or folio sheet is alredy created
QList <Diagram *> diagram_list;
//create new diagram
Diagram *diagram_folio_list = new DiagramFolioList(this);
if (!isReadOnly() && getFolioSheetsQuantity() == 0) {
// setup default properties
diagram_folio_list -> border_and_titleblock.importBorder(defaultBorderProperties());
diagram_folio_list -> border_and_titleblock.importTitleBlock(defaultTitleBlockProperties());
diagram_folio_list -> defaultConductorProperties = defaultConductorProperties();
//reset the number of folio sheet
setFolioSheetsQuantity(0);
diagram_folio_list -> border_and_titleblock.setTitle(tr("Liste des Sch\351mas"));
// no need to display rows and columns
diagram_folio_list -> border_and_titleblock.displayRows(false);
diagram_folio_list -> border_and_titleblock.displayColumns(false);
int diagCount = diagrams().size();
for (int i = 0; i <= diagCount/58; i++) {
//create new diagram
Diagram *diagram_folio_list = new DiagramFolioList(this);
addDiagram(diagram_folio_list);
setFolioSheetsQuantity( getFolioSheetsQuantity()+1 );
// setup default properties
diagram_folio_list -> border_and_titleblock.importBorder(defaultBorderProperties());
diagram_folio_list -> border_and_titleblock.importTitleBlock(defaultTitleBlockProperties());
diagram_folio_list -> defaultConductorProperties = defaultConductorProperties();
emit(diagramAdded(this, diagram_folio_list));
return(diagram_folio_list);
diagram_folio_list -> border_and_titleblock.setTitle(tr("Liste des Sch\351mas"));
// no need to display rows and columns
diagram_folio_list -> border_and_titleblock.displayRows(false);
diagram_folio_list -> border_and_titleblock.displayColumns(false);
addDiagram(diagram_folio_list);
setFolioSheetsQuantity( getFolioSheetsQuantity()+1 );
emit(diagramAdded(this, diagram_folio_list));
diagram_list << diagram_folio_list;
}
}
return(diagram_list);
}
/**
@@ -1027,7 +1037,6 @@ void QETProject::readProjectXml() {
// la racine du document XML est sensee etre un element "project"
if (root_elmt.tagName() == "project") {
// mode d'ouverture normal
if (root_elmt.hasAttribute("version")) {
bool conv_ok;
@@ -1063,15 +1072,10 @@ void QETProject::readProjectXml() {
// load the project-wide properties
readProjectPropertiesXml();
// charge les proprietes par defaut pour les nouveaux schemas
readDefaultPropertiesXml();
// if there is an attribute for folioSheetQuantity, then set it accordingly.
// If not, then the value remains at the initial value of zero.
if (root_elmt.hasAttribute("folioSheetQuantity"))
addNewDiagramFolioList();
// load the embedded titleblock templates
readEmbeddedTemplatesXml();
@@ -1081,6 +1085,12 @@ void QETProject::readProjectXml() {
// charge les schemas
readDiagramsXml();
// if there is an attribute for folioSheetQuantity, then set it accordingly.
// If not, then the value remains at the initial value of zero.
if (root_elmt.attribute("folioSheetQuantity","0").toInt()) {
addNewDiagramFolioList();
}
state_ = Ok;
}