kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-07 22:22:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix: segfault when load project with folio report linked but without the same potential text

Browse Source 
(Assert QList(), in conductor.cpp)


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2815 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-02-06 21:35:13 +00:00
parent 0e46586892
commit 801a2d298f
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/qetgraphicsitem/conductor.cpp
View File

@@ -1395,6 +1395,7 @@ Terminal * Conductor::relatedPotentialTerminal (Terminal *t) {
* @return l'editeur de schemas parent ou 0
*/
QETDiagramEditor* Conductor::diagramEditor() const {
if (diagram()->views().isEmpty()) return 0;
QWidget *w = const_cast<QGraphicsView *>(diagram() -> views().at(0));
while (w -> parentWidget() && !w -> isWindow()) {
w = w -> parentWidget();

7
sources/qetgraphicsitem/reportelement.cpp
View File

@@ -19,7 +19,6 @@
#include "elementtextitem.h"
#include "diagramposition.h"
#include "qetproject.h"
#include "conductorautonumerotation.h"
ReportElement::ReportElement(const ElementsLocation &location, QString link_type,QGraphicsItem *qgi, Diagram *s, int *state) :
CustomElement(location, qgi, s, state)
@@ -50,7 +49,7 @@ void ReportElement::linkToElement(Element * elmt) {
if (connected_elements.first() == elmt) i = false;
}
//ensure elmt is a inverse report of this element
//ensure elmt is an inverse report of this element
if ((elmt->linkType() == inverse_report) && i) {
unlinkAllElements();
connected_elements << elmt;
@@ -58,10 +57,6 @@ void ReportElement::linkToElement(Element * elmt) {
connect(diagram()->project(), SIGNAL(projectDiagramsOrderChanged(QETProject*,int,int)), this, SLOT(updateLabel()));
updateLabel();
elmt->linkToElement(this);
//Check if text of this potential is identical.
if (conductors().count() && elmt->conductors().count()) {
ConductorAutoNumerotation::checkPotential(conductors().first());
}
}
}