[TD]CI clang warnings
This commit is contained in:
@@ -120,7 +120,7 @@ void QGISectionLine::makeArrowsISO()
|
||||
{
|
||||
double arrowRotation = 0.0;
|
||||
m_arrowDir.Normalize();
|
||||
double angle = atan2f(m_arrowDir.y,m_arrowDir.x);
|
||||
double angle = atan2f(m_arrowDir.y, m_arrowDir.x);
|
||||
if (angle < 0.0) {
|
||||
angle = 2 * M_PI + angle;
|
||||
}
|
||||
@@ -144,14 +144,14 @@ void QGISectionLine::makeArrowsTrad()
|
||||
{
|
||||
double arrowRotation = 0.0;
|
||||
m_arrowDir.Normalize();
|
||||
double angle = atan2f(m_arrowDir.y,m_arrowDir.x);
|
||||
double angle = atan2f(m_arrowDir.y, m_arrowDir.x);
|
||||
if (angle < 0.0) {
|
||||
angle = 2 * M_PI + angle;
|
||||
}
|
||||
arrowRotation = 360.0 - angle * (180.0/M_PI); //convert to Qt rotation (clockwise degrees)
|
||||
|
||||
QPointF posArrow1,posArrow2;
|
||||
QPointF offsetDir(m_arrowDir.x,-m_arrowDir.y); //remember Y dir is flipped
|
||||
QPointF posArrow1, posArrow2;
|
||||
QPointF offsetDir(m_arrowDir.x, -m_arrowDir.y); //remember Y dir is flipped
|
||||
|
||||
double oblique = 1.0;
|
||||
if ( !DrawUtil::fpCompare((m_arrowDir.x + m_arrowDir.y), 1.0) ) {
|
||||
@@ -199,7 +199,7 @@ void QGISectionLine::makeSymbolsTrad()
|
||||
double symWidth = symRect.width();
|
||||
double symHeight = symRect.height();
|
||||
double symbolFudge = 0.75;
|
||||
double angle = atan2f(m_arrowDir.y,m_arrowDir.x);
|
||||
double angle = atan2f(m_arrowDir.y, m_arrowDir.x);
|
||||
if (angle < 0.0) {
|
||||
angle = 2 * M_PI + angle;
|
||||
}
|
||||
@@ -262,7 +262,7 @@ void QGISectionLine::makeSymbolsISO()
|
||||
|
||||
void QGISectionLine::extensionEndsTrad()
|
||||
{
|
||||
QPointF offsetDir(m_arrowDir.x,-m_arrowDir.y);
|
||||
QPointF offsetDir(m_arrowDir.x, -m_arrowDir.y);
|
||||
|
||||
//extensions for oblique section line needs to be a bit longer
|
||||
double oblique = 1.0;
|
||||
@@ -270,7 +270,7 @@ void QGISectionLine::extensionEndsTrad()
|
||||
oblique = 1.25;
|
||||
}
|
||||
|
||||
//draw from section line endpoint
|
||||
//draw from section line endpoint
|
||||
QPointF offsetEnd = oblique * m_extLen * offsetDir;
|
||||
m_beginExt1 = m_start;
|
||||
m_endExt1 = m_start + offsetEnd;
|
||||
@@ -281,7 +281,7 @@ void QGISectionLine::extensionEndsTrad()
|
||||
void QGISectionLine::extensionEndsISO()
|
||||
{
|
||||
//lines are offset to other side of section line!
|
||||
QPointF offsetDir(m_arrowDir.x,-m_arrowDir.y);
|
||||
QPointF offsetDir(m_arrowDir.x, -m_arrowDir.y);
|
||||
offsetDir = offsetDir * -1.0;
|
||||
|
||||
//extensions for oblique section line needs to be a bit longer?
|
||||
@@ -291,7 +291,7 @@ void QGISectionLine::extensionEndsISO()
|
||||
oblique = 1.10;
|
||||
}
|
||||
|
||||
//draw from section line endpoint less arrow length
|
||||
//draw from section line endpoint less arrow length
|
||||
QPointF offsetStart = offsetDir * Rez::guiX(QGIArrow::getPrefArrowSize());
|
||||
QPointF offsetEnd = oblique * m_extLen * offsetDir;
|
||||
|
||||
@@ -309,10 +309,10 @@ void QGISectionLine::setEnds(Base::Vector3d l1, Base::Vector3d l2)
|
||||
m_end = QPointF(l2.x, l2.y);
|
||||
}
|
||||
|
||||
void QGISectionLine::setBounds(double x1,double y1,double x2,double y2)
|
||||
void QGISectionLine::setBounds(double x1, double y1, double x2, double y2)
|
||||
{
|
||||
m_start = QPointF(x1,y1);
|
||||
m_end = QPointF(x2,y2);
|
||||
m_start = QPointF(x1, y1);
|
||||
m_end = QPointF(x2, y2);
|
||||
}
|
||||
|
||||
void QGISectionLine::setSymbol(char* sym)
|
||||
@@ -320,9 +320,9 @@ void QGISectionLine::setSymbol(char* sym)
|
||||
m_symbol = sym;
|
||||
}
|
||||
|
||||
void QGISectionLine::setDirection(double xDir,double yDir)
|
||||
void QGISectionLine::setDirection(double xDir, double yDir)
|
||||
{
|
||||
Base::Vector3d newDir(xDir,yDir,0.0);
|
||||
Base::Vector3d newDir(xDir, yDir, 0.0);
|
||||
setDirection(newDir);
|
||||
}
|
||||
|
||||
@@ -415,7 +415,7 @@ void QGISectionLine::setTools()
|
||||
// m_arrow2->setPen(m_pen);
|
||||
// m_arrow1->setBrush(m_brush);
|
||||
// m_arrow2->setBrush(m_brush);
|
||||
|
||||
|
||||
m_arrow1->setNormalColor(m_colCurrent);
|
||||
m_arrow1->setFillColor(m_colCurrent);
|
||||
m_arrow1->setPrettyNormal();
|
||||
|
||||
Reference in New Issue
Block a user