razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #131 from janisozaur/abs

Browse source 
Fixes for abs()
This commit is contained in:
Shinya Kitaoka 2016-04-13 14:12:56 +09:00
commit 6dca1d3a6d
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/ext/plasticvisualsettings.h
View file

@ -33,4 +33,4 @@ public:
: m_applyPlasticDeformation(true), m_showOriginalColumn(), m_drawMeshesWireframe(true), m_drawRigidity(false), m_drawSO(false) {} : m_applyPlasticDeformation(true), m_showOriginalColumn(), m_drawMeshesWireframe(true), m_drawRigidity(false), m_drawSO(false) {}
}; };
#endif PLASTICVISUALSETTINGS_H #endif //PLASTICVISUALSETTINGS_H

2
toonz/sources/include/toonz/doubleparamcmd.h
View file

@ -109,4 +109,4 @@ public:
static void enableCycle(TDoubleParam *curve, bool enabled); static void enableCycle(TDoubleParam *curve, bool enabled);
}; };
#endif; #endif

2
toonz/sources/include/toonz/ikengine.h
View file

@ -69,4 +69,4 @@ private:
}; };
//#endif //#endif
#endif IKENGINE_H #endif //IKENGINE_H

2
toonz/sources/include/toonz/ikjacobian.h
View file

@ -736,4 +736,4 @@ private:
static const double BaseMaxTargetDist; static const double BaseMaxTargetDist;
}; };
#endif JACOBIAN_H #endif //JACOBIAN_H

2
toonz/sources/include/toonz/iknode.h
View file

@ -98,4 +98,4 @@ private:
bool freezed; // Se vero l'angolo è blocccato bool freezed; // Se vero l'angolo è blocccato
}; };
#endif IKNODE_H #endif //IKNODE_H

2
toonz/sources/include/toonz/ikskeleton.h
View file

@ -89,4 +89,4 @@ private:
void computeSkeleton(IKNode *); void computeSkeleton(IKNode *);
}; };
#endif IKSKELETON_H #endif //IKSKELETON_H

2
toonz/sources/include/toonzqt/styleindexlineedit.h
View file

@ -40,4 +40,4 @@ protected:
}; };
} //namspace } //namspace
#endif; #endif

6
toonz/sources/toonzqt/functionpanel.cpp
View file

@ -150,7 +150,7 @@ void Ruler::compute()
// and m_labelPeriod (number of ticks between two adjacent labels) // and m_labelPeriod (number of ticks between two adjacent labels)
// the distance (world units) between two labels must be >= minLabelWorldDistance // the distance (world units) between two labels must be >= minLabelWorldDistance
const double absUnit = abs(m_unit); const double absUnit = std::abs(m_unit);
const double minLabelWorldDistance = m_minLabelDistance / absUnit; const double minLabelWorldDistance = m_minLabelDistance / absUnit;
const double minWorldDistance = m_minDistance / absUnit; const double minWorldDistance = m_minDistance / absUnit;
@ -363,7 +363,7 @@ int FunctionPanel::getCurveDistance(TDoubleParam *curve, const QPoint &winPos)
double frame = xToFrame(winPos.x()); double frame = xToFrame(winPos.x());
double value = curve->getValue(frame); double value = curve->getValue(frame);
double curveY = valueToY(curve, value); double curveY = valueToY(curve, value);
return abs(curveY - winPos.y()); return std::abs(curveY - winPos.y());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1308,7 +1308,7 @@ void FunctionPanel::mouseMoveEvent(QMouseEvent *e)
} }
double currentFrame = m_frameHandle ? m_frameHandle->getFrame() : 0; double currentFrame = m_frameHandle ? m_frameHandle->getFrame() : 0;
if (m_highlighted.handle == None && abs(e->pos().x() - frameToX(currentFrame)) < 5) if (m_highlighted.handle == None && std::abs(e->pos().x() - frameToX(currentFrame)) < 5)
m_currentFrameStatus = 1; m_currentFrameStatus = 1;
else else
m_currentFrameStatus = 0; m_currentFrameStatus = 0;