Folio List: DXF folio corrected, Delete folio sheet bug corrected,

Folio New Sheets are inserted in the beginning but after the previous folio sheets


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2846 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
abhishekm71
2014-02-10 11:48:05 +00:00
parent d04c03afa4
commit c96036b7fa
4 changed files with 38 additions and 32 deletions

View File

@@ -652,7 +652,7 @@ bool QETDiagramEditor::newProject() {
new_project -> setDefaultReportProperties(defaultReportProperties());
// add summary and new diagram
new_project -> addNewDiagramFolioList();
//new_project -> addNewDiagramFolioList();
new_project -> addNewDiagram();
return(addProject(new_project));
@@ -1804,7 +1804,24 @@ void QETDiagramEditor::removeDiagramFromProject() {
if (ProjectView *current_project = currentProject()) {
if (DiagramView *current_diagram = current_project -> currentDiagram()) {
can_update_actions = false;
bool isFolioList = false;
if (DiagramFolioList *ptr = dynamic_cast<DiagramFolioList *>(current_diagram -> diagram()))
isFolioList = true;
current_project -> removeDiagram(current_diagram);
if (isFolioList) {
foreach (DiagramView *diag, current_project -> diagrams()) {
if (DiagramFolioList *ptr = dynamic_cast<DiagramFolioList *>(diag -> diagram())) {
current_project -> removeDiagram(diag);
}
}
} else if (current_project -> diagrams().size() % 58 == 0) {
foreach (DiagramView *diag, current_project -> diagrams()) {
DiagramFolioList *ptr = dynamic_cast<DiagramFolioList *>(diag -> diagram());
if (ptr && ptr -> getId() == DiagramFolioList::folioList_quantity-1) {
current_project -> removeDiagram(diag);
}
}
}
}
}
}