oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed timerangelist removing bug

Browse Source
This commit is contained in:
itsmattkc
2020-11-16 01:33:53 +11:00
parent 2c086ce9fb
commit fe4e45e386
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/timerange.cpp
+12 -13
View File
@@ -78,11 +78,11 @@ bool TimeRange::operator!=(const TimeRange &r) const
bool TimeRange::OverlapsWith(const TimeRange &a, bool in_inclusive, bool out_inclusive) const bool TimeRange::OverlapsWith(const TimeRange &a, bool in_inclusive, bool out_inclusive) const
{ {
bool overlaps_in = (in_inclusive) ? (a.out() < in()) : (a.out() <= in()); bool doesnt_overlap_in = (in_inclusive) ? (a.out() < in()) : (a.out() <= in());
bool overlaps_out = (out_inclusive) ? (a.in() > out()) : (a.in() >= out()); bool doesnt_overlap_out = (out_inclusive) ? (a.in() > out()) : (a.in() >= out());
return !(overlaps_in || overlaps_out); return !doesnt_overlap_in && !doesnt_overlap_out;
} }
TimeRange TimeRange::Combined(const TimeRange &a) const TimeRange TimeRange::Combined(const TimeRange &a) const
@@ -211,8 +211,10 @@ void TimeRangeList::remove(const TimeRange &remove)
sz--; sz--;
} else if (compare.Contains(remove, false, false)) { } else if (compare.Contains(remove, false, false)) {
// The remove range is within this element, only choice is to split the element into two // The remove range is within this element, only choice is to split the element into two
array_.append(TimeRange(remove.out(), compare.out())); TimeRange new_range(remove.out(), compare.out());
compare.set_out(remove.in()); compare.set_out(remove.in());
insert(new_range);
break;
} else if (compare.in() < remove.in() && compare.out() > remove.in()) { } else if (compare.in() < remove.in() && compare.out() > remove.in()) {
// This element's out point overlaps the range's in, we'll trim it // This element's out point overlaps the range's in, we'll trim it
compare.set_out(remove.in()); compare.set_out(remove.in());
@@ -289,15 +291,6 @@ TimeRangeList TimeRangeList::Intersects(const TimeRange &range) const
return intersect_list; return intersect_list;
} }
void TimeRangeList::PrintTimeList()
{
qDebug() << "TimeRangeList now contains:";
for (int i=0;i<size();i++) {
qDebug() << " " << array_.at(i);
}
}
uint qHash(const TimeRange &r, uint seed) uint qHash(const TimeRange &r, uint seed)
{ {
return qHash(r.in(), seed) ^ qHash(r.out(), seed); return qHash(r.in(), seed) ^ qHash(r.out(), seed);
@@ -310,3 +303,9 @@ QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange &r)
debug.nospace() << r.in().toDouble() << " - " << r.out().toDouble(); debug.nospace() << r.in().toDouble() << " - " << r.out().toDouble();
return debug.space(); return debug.space();
} }
QDebug operator<<(QDebug debug, const olive::TimeRangeList &r)
{
debug << r.internal_array();
return debug.space();
}
app/common/timerange.h
+6 -2
View File
@@ -127,9 +127,12 @@ public:
return array_.last(); return array_.last();
} }
private: const QVector<TimeRange>& internal_array() const
void PrintTimeList(); {
return array_;
}
private:
QVector<TimeRange> array_; QVector<TimeRange> array_;
}; };
@@ -139,6 +142,7 @@ uint qHash(const TimeRange& r, uint seed);
OLIVE_NAMESPACE_EXIT OLIVE_NAMESPACE_EXIT
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange& r); QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange& r);
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRangeList& r);
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TimeRange) Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TimeRange)