palo
/
valentina
mirror of https://gitlab.com/smart-pattern/valentina.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change in equidistant.

master
dismine 2013-09-12 19:46:29 +03:00
parent fb99e19f27
commit 2edb62eb9b
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
container/calculator.cpp
View File

@ -1,12 +1,6 @@
#include "calculator.h"
#include <cmath>
#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 <QDebug>
#pragma GCC diagnostic pop
#define DELIMITER 1
#define VARIABLE 2

6
container/calculator.h
View File

@ -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 <QtGlobal>
#include <QString>
#include <QMap>
#include <QLineF>
#include <QPointF>
#pragma GCC diagnostic pop
#include "vcontainer.h"
/**

14
container/vcontainer.cpp
View File

@ -354,11 +354,15 @@ QVector<QPointF> 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;