Merge pull request #132 from janisozaur/parentheses
Encapsulate expressions in parentheses
This commit is contained in:
commit
9c6c0f1688
10 changed files with 18 additions and 15 deletions
|
@ -396,11 +396,12 @@ int intersect(const TQuadratic &q,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (q.getP2() - q.getP1() == q.getP1() - q.getP0()) //pure il secondo e' unsegmento....
|
||||
if (q.getP2() - q.getP1() == q.getP1() - q.getP0()) {//pure il secondo e' unsegmento....
|
||||
if (firstIsQuad)
|
||||
return intersect(TSegment(q.getP0(), q.getP2()), s, intersections);
|
||||
else
|
||||
return intersect(s, TSegment(q.getP0(), q.getP2()), intersections);
|
||||
}
|
||||
|
||||
vector<TPointD> bez, pol;
|
||||
bez.push_back(q.getP0());
|
||||
|
|
|
@ -885,7 +885,7 @@ template <>
|
|||
inline TRectT<double>::TRectT(const TDimensionT<double> &d)
|
||||
: x0(0.0), y0(0.0), x1(d.lx), y1(d.ly){};
|
||||
template <>
|
||||
inline bool TRectT<double>::isEmpty() const { return x0 == x1 && y0 == y1 || x0 > x1 || y0 > y1; }
|
||||
inline bool TRectT<double>::isEmpty() const { return (x0 == x1 && y0 == y1) || x0 > x1 || y0 > y1; }
|
||||
template <>
|
||||
inline void TRectT<double>::empty() { x0 = y0 = x1 = y1 = 0; }
|
||||
template <>
|
||||
|
|
|
@ -248,7 +248,7 @@ public:
|
|||
: r(rr), g(gg), b(bb), m(mm){};
|
||||
|
||||
inline bool operator==(const TPixelD &p) const { return r == p.r && g == p.g && b == p.b && m == p.m; };
|
||||
inline bool operator<(const TPixelD &p) const { return r < p.r || r == p.r && (g < p.g || g == p.g && (b < p.b || b == p.b && (m < p.m))); };
|
||||
inline bool operator<(const TPixelD &p) const { return r < p.r || (r == p.r && (g < p.g || (g == p.g && (b < p.b || (b == p.b && (m < p.m)))))); };
|
||||
|
||||
inline bool operator>=(const TPixelD &p) const { return !operator<(p); };
|
||||
inline bool operator!=(const TPixelD &p) const { return !operator==(p); };
|
||||
|
|
|
@ -825,7 +825,7 @@ void IKTool::initEngine(const TPointD &pos)
|
|||
Skeleton::Bone *next = m_skeleton->getBoneByColumnIndex(*it++);
|
||||
for (; it != links.end(); ++it)
|
||||
stack.push_back(std::make_pair(*it, prev));
|
||||
if (links.size() > 1 || prev && next && prev->getParent() == bone && next->getParent() == bone) {
|
||||
if (links.size() > 1 || (prev && next && (prev->getParent() == bone && next->getParent() == bone))) {
|
||||
bone = next;
|
||||
} else {
|
||||
m_joints.push_back(Joint(bone, prev, sign));
|
||||
|
|
|
@ -1218,13 +1218,14 @@ void TypeTool::leftButtonDown(const TPointD &pos, const TMouseEvent &)
|
|||
if (!vi && !ti)
|
||||
return;
|
||||
|
||||
if (m_isFrameCreated)
|
||||
if (m_isFrameCreated) {
|
||||
if (vi)
|
||||
m_undo = new UndoTypeTool(0, 0, getApplication()->getCurrentLevel()->getSimpleLevel(),
|
||||
getCurrentFid(), m_isFrameCreated, m_isLevelCreated);
|
||||
else
|
||||
m_undo = new RasterUndoTypeTool(0, 0, getApplication()->getCurrentLevel()->getSimpleLevel(),
|
||||
getCurrentFid(), m_isFrameCreated, m_isLevelCreated);
|
||||
}
|
||||
|
||||
// closeImeWindow();
|
||||
// if(m_viewer) m_viewer->enableIme(true);
|
||||
|
|
|
@ -570,7 +570,7 @@ void substituteLevel(TXsheet *xsh, TXshLevel *srcLevel, TXshLevel *dstLevel)
|
|||
xsh->getCells(r0, c, rowCount, &cells[0]);
|
||||
bool changed = false;
|
||||
for (int i = 0; i < rowCount; i++) {
|
||||
if (!cells[i].isEmpty())
|
||||
if (!cells[i].isEmpty()) {
|
||||
if (cells[i].m_level.getPointer() == srcLevel) {
|
||||
cells[i].m_level = dstLevel;
|
||||
changed = true;
|
||||
|
@ -584,6 +584,7 @@ void substituteLevel(TXsheet *xsh, TXshLevel *srcLevel, TXshLevel *dstLevel)
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (changed)
|
||||
xsh->setCells(r0, c, rowCount, &cells[0]);
|
||||
}
|
||||
|
|
|
@ -250,14 +250,14 @@ void KeyframeSetter::getRotatingSpeedHandles(
|
|||
}
|
||||
}
|
||||
// SpeedInOut * Linear *
|
||||
if (ty[0] == 2 && ty[1] == 1 || ty[1] == 2 && ty[2] == 1) {
|
||||
if ((ty[0] == 2 && ty[1] == 1) || (ty[1] == 2 && ty[2] == 1)) {
|
||||
int k = ty[1] == 1 ? kIndex - 1 : kIndex;
|
||||
double speed = getNorm(param->getSpeedIn(k));
|
||||
if (speed > epsilon)
|
||||
rotatingSpeeds.push_back(std::make_pair(-speed, k));
|
||||
}
|
||||
// * Linear * SpeedInOut
|
||||
if (ty[1] == 1 && ty[2] == 2 || ty[2] == 1 && ty[3] == 2) {
|
||||
if ((ty[1] == 1 && ty[2] == 2) || (ty[2] == 1 && ty[3] == 2)) {
|
||||
int k = ty[2] == 2 ? kIndex : kIndex + 1;
|
||||
double speed = getNorm(param->getSpeedOut(k));
|
||||
if (speed > epsilon)
|
||||
|
@ -623,7 +623,7 @@ void KeyframeSetter::setSpeedIn(const TPointD &speedIn)
|
|||
double outNorm = getNorm(m_keyframe.m_speedOut);
|
||||
if (m_kIndex + 1 == m_param->getKeyframeCount() ||
|
||||
isSpeedInOut(m_kIndex) ||
|
||||
m_keyframe.m_type == TDoubleKeyframe::Expression && m_keyframe.m_expressionText.find("cycle") != string::npos) {
|
||||
(m_keyframe.m_type == TDoubleKeyframe::Expression && m_keyframe.m_expressionText.find("cycle") != string::npos)) {
|
||||
// update next segment speed vector
|
||||
double inNorm = getNorm(m_keyframe.m_speedIn);
|
||||
if (inNorm < eps)
|
||||
|
|
|
@ -1925,11 +1925,11 @@ void TStageObject::loadData(TIStream &is)
|
|||
if (tnzVersion < VersionNumber(1, 16) && !keyframes.empty()) {
|
||||
std::map<int, TStageObject::Keyframe>::iterator itKf = keyframes.begin();
|
||||
std::set<int> keyframeIndexSet;
|
||||
for (itKf; itKf != keyframes.end(); itKf++)
|
||||
for (; itKf != keyframes.end(); itKf++)
|
||||
if (is52FullKeyframe(itKf->first))
|
||||
keyframeIndexSet.insert(itKf->first);
|
||||
std::set<int>::iterator itKfInd = keyframeIndexSet.begin();
|
||||
for (itKfInd; itKfInd != keyframeIndexSet.end(); itKfInd++)
|
||||
for (; itKfInd != keyframeIndexSet.end(); itKfInd++)
|
||||
setkey(m_scale, *itKfInd);
|
||||
}
|
||||
updateKeyframes();
|
||||
|
|
|
@ -382,10 +382,10 @@ void MoveHandleDragTool::drag(QMouseEvent *e)
|
|||
if (m_nSpeed != QPointF(0, 0)) {
|
||||
QPointF delta = posF - p0;
|
||||
posF -= m_nSpeed * (delta.x() * m_nSpeed.x() + delta.y() * m_nSpeed.y());
|
||||
if (m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x() || m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x())
|
||||
if ((m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x()) || (m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x()))
|
||||
posF = p0;
|
||||
} else {
|
||||
if (m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x() || m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x())
|
||||
if ((m_handle == FunctionPanel::SpeedIn && posF.x() > p0.x()) || (m_handle == FunctionPanel::SpeedOut && posF.x() < p0.x()))
|
||||
posF.setX(p0.x());
|
||||
}
|
||||
|
||||
|
|
|
@ -590,8 +590,8 @@ void FunctionSelection::doCut()
|
|||
if (i + 1 < n && kk.contains(i + 1) && !cellsSelection)
|
||||
delta += curve->keyframeIndexToFrame(i) - curve->keyframeIndexToFrame(i + 1);
|
||||
} else {
|
||||
if (cellsSelection && bottomRow <= curve->keyframeIndexToFrame(i) ||
|
||||
!cellsSelection && delta != 0)
|
||||
if ((cellsSelection && bottomRow <= curve->keyframeIndexToFrame(i)) ||
|
||||
(!cellsSelection && delta != 0))
|
||||
moveUndo->addMovement(curve, j, delta);
|
||||
j++;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue