diff --git a/container/calculator.cpp b/container/calculator.cpp index bb7e34588..dd00eae3f 100644 --- a/container/calculator.cpp +++ b/container/calculator.cpp @@ -1,12 +1,6 @@ #include "calculator.h" #include -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wconversion" -#pragma GCC diagnostic ignored "-Wsign-conversion" -#pragma GCC diagnostic ignored "-Wctor-dtor-privacy" #include -#pragma GCC diagnostic pop #define DELIMITER 1 #define VARIABLE 2 diff --git a/container/calculator.h b/container/calculator.h index 78c9c246f..87a125290 100644 --- a/container/calculator.h +++ b/container/calculator.h @@ -1,17 +1,11 @@ #ifndef CALCULATOR_H #define CALCULATOR_H -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" -#pragma GCC diagnostic ignored "-Wconversion" -#pragma GCC diagnostic ignored "-Wsign-conversion" -#pragma GCC diagnostic ignored "-Wctor-dtor-privacy" #include #include #include #include #include -#pragma GCC diagnostic pop #include "vcontainer.h" /** diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 979c3f6c1..764dd140d 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -354,11 +354,15 @@ QVector VContainer::EkvPoint(const QLineF &line1, const QLineF &line2, break; case(QLineF::UnboundedIntersection):{ QLineF line( line1.p2(), CrosPoint ); - if(line.length() > width + toPixel(3)){ - points.append(bigLine1.p2()); - line.setLength( width ); - points.append(line.p2() ); - points.append(bigLine2.p1()); + if(line.length() > width + toPixel(8)){ + QLineF l; + l = QLineF(bigLine1.p2(), CrosPoint); + l.setLength(width); + points.append(l.p2()); + + l = QLineF(bigLine2.p1(), CrosPoint); + l.setLength(width); + points.append(l.p2()); } else { points.append(CrosPoint); return points;