Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -55,9 +55,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsTimeline
|
||||
NGLLogger
|
||||
ngltools # DTG
|
||||
LtsWidgets # LtsMessageDialogNew for remove filter track
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
)
|
||||
NGL_INSTALL_TARGET(LtsTimeline)
|
||||
|
||||
@@ -68,7 +68,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsTimelineTest
|
||||
LtsTimeline
|
||||
nglapplication
|
||||
NGLLogger
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
)
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "timeline_header_view.h"
|
||||
#include <utility>
|
||||
#include "timeline_view.h"
|
||||
|
||||
#include <QGuiApplication>
|
||||
@@ -400,7 +401,7 @@ void TimelineHeaderView::paintSection(QPainter *painter, const QRect &rect, int
|
||||
int height = (bottom - rect.top()) / 2;
|
||||
|
||||
|
||||
for (const Tick &tick : qAsConst(m_majorTicks))
|
||||
for (const Tick &tick : std::as_const(m_majorTicks))
|
||||
{
|
||||
painter->setPen(QPen(QGuiApplication::palette().color(QPalette::Text), 1));
|
||||
painter->drawText(QRect(tick.pos - 160 / 2, rect.top(), 160, height), Qt::AlignCenter, tick.label);
|
||||
@@ -413,11 +414,11 @@ void TimelineHeaderView::paintSection(QPainter *painter, const QRect &rect, int
|
||||
painter->setPen(QPen(QGuiApplication::palette().color(QPalette::Text), 1));
|
||||
|
||||
|
||||
for (const Tick &tick : qAsConst(m_mediumTicks))
|
||||
for (const Tick &tick : std::as_const(m_mediumTicks))
|
||||
painter->drawLine(tick.pos, bottom - static_cast<int>(double(height) * 2 / 3), tick.pos, bottom);
|
||||
|
||||
|
||||
for (const Tick &tick : qAsConst(m_minorTicks))
|
||||
for (const Tick &tick : std::as_const(m_minorTicks))
|
||||
painter->drawLine(tick.pos, bottom - static_cast<int>(double(height) / 3), tick.pos, bottom);
|
||||
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "timeline_model.h"
|
||||
#include <utility>
|
||||
#include "timeline_view_drag_handler.h"
|
||||
#include "track.h"
|
||||
|
||||
@@ -159,7 +160,7 @@ const QVector<int> TimelineModel::_copyItemIdsBetween(Track &t, qint64 start, qi
|
||||
itemIds.reserve(t.itemCount());
|
||||
|
||||
|
||||
for (const int itemId : qAsConst(t.copyItemIds()))
|
||||
for (const int itemId : std::as_const(t.copyItemIds()))
|
||||
{
|
||||
const Item &i = item(itemId);
|
||||
if (Track::isItemBetween(i, start, end, strict, complete, minimumDuration))
|
||||
@@ -167,7 +168,7 @@ const QVector<int> TimelineModel::_copyItemIdsBetween(Track &t, qint64 start, qi
|
||||
}
|
||||
|
||||
if (recursive)
|
||||
for (const TrackPtr &trackPtr : qAsConst(t.tracks()))
|
||||
for (const TrackPtr &trackPtr : std::as_const(t.tracks()))
|
||||
itemIds += _copyItemIdsBetween(*trackPtr.get(), start, end, strict, complete, true, false, minimumDuration);
|
||||
|
||||
|
||||
@@ -197,7 +198,7 @@ const QVector<int> TimelineModel::_itemIdsBetween(Track &t, qint64 start, qint64
|
||||
QVector<int> itemIds;
|
||||
itemIds.reserve(t.itemCount());
|
||||
|
||||
for (const ItemPtr &itemPtr : qAsConst(t.items()))
|
||||
for (const ItemPtr &itemPtr : std::as_const(t.items()))
|
||||
{
|
||||
const Item &i = *itemPtr;
|
||||
if (Track::isItemBetween(i, start, end, strict, complete, minimumDuration))
|
||||
@@ -205,7 +206,7 @@ const QVector<int> TimelineModel::_itemIdsBetween(Track &t, qint64 start, qint64
|
||||
}
|
||||
|
||||
if (recursive)
|
||||
for (const TrackPtr &trackPtr : qAsConst(t.tracks()))
|
||||
for (const TrackPtr &trackPtr : std::as_const(t.tracks()))
|
||||
itemIds += _itemIdsBetween(*trackPtr.get(), start, end, strict, complete, true, false, minimumDuration);
|
||||
|
||||
|
||||
@@ -232,7 +233,7 @@ const QVector<int> TimelineModel::_itemIdsBetween(Track &t, qint64 start, qint64
|
||||
|
||||
bool TimelineModel::_isItemsBetween(const Track &t, qint64 start, qint64 end, const QVector<int> &ignoreIds, bool strict, bool complete, bool recursive, qint64 minimumDuration) const
|
||||
{
|
||||
for (const ItemPtr &itemPtr : qAsConst(t.items()))
|
||||
for (const ItemPtr &itemPtr : std::as_const(t.items()))
|
||||
{
|
||||
const Item &i = *itemPtr;
|
||||
if (!ignoreIds.contains(i.id()))
|
||||
@@ -243,7 +244,7 @@ bool TimelineModel::_isItemsBetween(const Track &t, qint64 start, qint64 end, co
|
||||
if (!recursive)
|
||||
return false;
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(t.tracks()))
|
||||
for (const TrackPtr &trackPtr : std::as_const(t.tracks()))
|
||||
if (_isItemsBetween(*trackPtr.get(), start, end, ignoreIds, strict, complete, true, minimumDuration))
|
||||
return true;
|
||||
|
||||
@@ -360,7 +361,7 @@ int TimelineModel::rowOfTrackId(int id) const noexcept(false)
|
||||
|
||||
int row = 0;
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(parent.tracks()))
|
||||
for (const TrackPtr &trackPtr : std::as_const(parent.tracks()))
|
||||
{
|
||||
if (trackPtr->id() == id)
|
||||
return row;
|
||||
@@ -527,7 +528,7 @@ void TimelineModel::copyToClipboard(const QVector<int> &ids) noexcept(false)
|
||||
m_clipboard.clear();
|
||||
m_clipboard.reserve(ids.size());
|
||||
qint64 tStartMin = LLONG_MAX;
|
||||
for (int itemId : qAsConst(ids))
|
||||
for (int itemId : std::as_const(ids))
|
||||
{
|
||||
const Item &i = item(itemId);
|
||||
ItemPtr iPtr = std::make_unique<Item>(Item(i.startTime(), i.duration(), i.color()));
|
||||
@@ -542,7 +543,7 @@ void TimelineModel::copyToClipboard(const QVector<int> &ids) noexcept(false)
|
||||
void TimelineModel::cutToClipboard(const QVector<int> &ids) noexcept(false)
|
||||
{
|
||||
copyToClipboard(ids);
|
||||
for (int itemId : qAsConst(ids))
|
||||
for (int itemId : std::as_const(ids))
|
||||
removeItem(itemId);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "timeline_view.h"
|
||||
#include <utility>
|
||||
#include "item_delegate.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
@@ -340,7 +341,7 @@ void TimelineView::selectItems(const QVector<int> &itemIds, bool reset)
|
||||
{
|
||||
if (reset)
|
||||
m_selectedItemIds.clear();
|
||||
for (const int &itemId : qAsConst(itemIds))
|
||||
for (const int &itemId : std::as_const(itemIds))
|
||||
if (!m_selectedItemIds.contains(itemId))
|
||||
m_selectedItemIds.append(itemId);
|
||||
emit selectedItemsChanged(m_selectedItemIds);
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
#include "timeline_view_drag_handler.h"
|
||||
#include "item.h"
|
||||
#include <utility>
|
||||
#include "track.h"
|
||||
|
||||
#include <QApplication>
|
||||
@@ -79,7 +80,7 @@ void TimelineViewDragHandler::dropEvent(QDropEvent *e)
|
||||
qint64 dt = deltaTime();
|
||||
try
|
||||
{
|
||||
for (const int &itemId : qAsConst(m_dragItemIds))
|
||||
for (const int &itemId : std::as_const(m_dragItemIds))
|
||||
{
|
||||
const Item &item = m_view->timelineModel()->item(itemId);
|
||||
m_view->timelineModel()->moveItemToTrack(itemId, dragItemTrackId(item), item.startTime() + dt);
|
||||
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
#include "timeline_view_selection_handler.h"
|
||||
#include <utility>
|
||||
#include "item_delegate.h"
|
||||
|
||||
#include <QApplication>
|
||||
@@ -197,7 +198,7 @@ void TimelineViewSelectHandler::keyPressEvent(QKeyEvent *e)
|
||||
{
|
||||
if (!m_view->m_selectedItemIds.isEmpty())
|
||||
{
|
||||
for (const int &itemId : qAsConst(m_view->m_selectedItemIds))
|
||||
for (const int &itemId : std::as_const(m_view->m_selectedItemIds))
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "timeline_widget.h"
|
||||
#include <utility>
|
||||
#include "ui_timeline_widget.h"
|
||||
#include "timeline_view.h"
|
||||
#include "timeline_header_view.h"
|
||||
@@ -317,7 +318,7 @@ void TimelineWidget::populateZoomFactorComboBox()
|
||||
this, &TimelineWidget::onZoomSelected);
|
||||
m_ui->cbZoom->clear();
|
||||
QVector<ZoomFactor> availableZooms = Zoom::availableZoomFactors(m_ui->view->minimumZoomFactor(), m_ui->view->upperZoomFactor());
|
||||
for (ZoomFactor factor : qAsConst(availableZooms))
|
||||
for (ZoomFactor factor : std::as_const(availableZooms))
|
||||
{
|
||||
m_ui->cbZoom->addItem(Zoom::toString(factor), QVariant(factor));
|
||||
if (factor == zoomFactor())
|
||||
@@ -392,7 +393,7 @@ void TimelineWidget::onUpdateDebugInfo()
|
||||
m_ui->lblDebugSlider->setText(DateTime::toString(qint64(m_ui->slider->value()) * 1000, DateTimeFormat::DTG));
|
||||
m_ui->lblDebugZoom->setText(Zoom::toString(m_ui->view->zoomFactor()));
|
||||
QString selection;
|
||||
for (int itemId : qAsConst(m_ui->view->selectedItemIds()))
|
||||
for (int itemId : std::as_const(m_ui->view->selectedItemIds()))
|
||||
selection += QString::number(itemId) + QStringLiteral(", ");
|
||||
if (selection.size() > 1)
|
||||
selection.chop(2);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "track.h"
|
||||
#include <utility>
|
||||
|
||||
namespace LtsTimeline
|
||||
{
|
||||
@@ -19,7 +20,7 @@ const Track &Track::track(int id) const noexcept(false)
|
||||
return **it;
|
||||
|
||||
|
||||
for (const TrackPtr &track : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &track : std::as_const(m_childrenTracks))
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -48,7 +49,7 @@ bool Track::hasTrack(int id, bool recursive) const
|
||||
if (!recursive)
|
||||
return false;
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
{
|
||||
if (trackPtr->hasTrack(id, true))
|
||||
return true;
|
||||
@@ -95,7 +96,7 @@ void Track::addCopyItemId(int id)
|
||||
|
||||
const Track &Track::parentOf(int id) const noexcept(false)
|
||||
{
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
{
|
||||
if (trackPtr->hasTrack(id))
|
||||
return *trackPtr;
|
||||
@@ -170,7 +171,7 @@ const QVector<int> Track::copyItemIdsBetween(qint64 start, qint64 end, bool stri
|
||||
|
||||
if (recursive)
|
||||
{
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
{
|
||||
auto itemPtrRefs2 = trackPtr->_copyItems();
|
||||
itemPtrRefs.insert(itemPtrRefs.end(), itemPtrRefs2.begin(), itemPtrRefs2.end());
|
||||
@@ -215,7 +216,7 @@ const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict,
|
||||
QVector<int> itemIds;
|
||||
itemIds.reserve(m_items.size());
|
||||
|
||||
for (const ItemPtr &itemPtr : qAsConst(m_items))
|
||||
for (const ItemPtr &itemPtr : std::as_const(m_items))
|
||||
{
|
||||
const Item &item = *itemPtr;
|
||||
if (isItemBetween(item, start, end, strict, complete, minimumDuration))
|
||||
@@ -228,7 +229,7 @@ const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict,
|
||||
return itemIds;
|
||||
}
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
itemIds += trackPtr->itemIdsBetween(start, end, strict, complete, true, minimumDuration);
|
||||
|
||||
return itemIds;
|
||||
@@ -237,7 +238,7 @@ const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict,
|
||||
|
||||
bool Track::isItemsBetween(qint64 start, qint64 end, const QVector<int> &ignoreIds, bool strict, bool complete, bool recursive, qint64 minimumDuration) const
|
||||
{
|
||||
for (const ItemPtr &itemPtr : qAsConst(m_items))
|
||||
for (const ItemPtr &itemPtr : std::as_const(m_items))
|
||||
{
|
||||
const Item &i = *itemPtr;
|
||||
if (!ignoreIds.contains(i.id()))
|
||||
@@ -246,7 +247,7 @@ bool Track::isItemsBetween(qint64 start, qint64 end, const QVector<int> &ignoreI
|
||||
}
|
||||
|
||||
|
||||
for (const int itemId : qAsConst(m_copyItemIds))
|
||||
for (const int itemId : std::as_const(m_copyItemIds))
|
||||
{
|
||||
const Item &i = item(itemId);
|
||||
if (!ignoreIds.contains(i.id()))
|
||||
@@ -258,7 +259,7 @@ bool Track::isItemsBetween(qint64 start, qint64 end, const QVector<int> &ignoreI
|
||||
if (!recursive)
|
||||
return false;
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
if (trackPtr->isItemsBetween(start, end, ignoreIds, strict, complete, true, minimumDuration))
|
||||
return true;
|
||||
|
||||
@@ -281,7 +282,7 @@ ItemPtrRefs Track::_items(bool recursive) const
|
||||
x.reserve(x.size() + m_copyItemIds.count());
|
||||
|
||||
|
||||
for (const int itemId : qAsConst(m_copyItemIds))
|
||||
for (const int itemId : std::as_const(m_copyItemIds))
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -297,7 +298,7 @@ ItemPtrRefs Track::_items(bool recursive) const
|
||||
return x;
|
||||
|
||||
|
||||
for (const TrackPtr &t : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &t : std::as_const(m_childrenTracks))
|
||||
{
|
||||
const ItemPtrRefs x2(t->_items(true));
|
||||
x.insert(x.end(), x2.begin(), x2.end());
|
||||
@@ -315,7 +316,7 @@ ItemPtrRefs Track::_copyItems() const
|
||||
|
||||
ItemPtrRefs x;
|
||||
|
||||
for (int id : qAsConst(m_copyItemIds))
|
||||
for (int id : std::as_const(m_copyItemIds))
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -361,7 +362,7 @@ const QVector<int> Track::_itemIds(bool recursive) const
|
||||
return itemIds;
|
||||
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
itemIds += trackPtr->_itemIds(true);
|
||||
|
||||
return itemIds;
|
||||
@@ -381,7 +382,7 @@ ItemPtrRef Track::_item(int id) const noexcept(false)
|
||||
return *it;
|
||||
|
||||
|
||||
for (const TrackPtr &track : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &track : std::as_const(m_childrenTracks))
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -405,7 +406,7 @@ void Track::printTrackIds(bool withItems, int level) const
|
||||
if (withItems)
|
||||
{
|
||||
fprintf(stderr, " ( ");
|
||||
for (const ItemPtr &itemPtr : qAsConst(m_items))
|
||||
for (const ItemPtr &itemPtr : std::as_const(m_items))
|
||||
{
|
||||
fprintf(stderr, "%d ", itemPtr->id());
|
||||
}
|
||||
@@ -415,7 +416,7 @@ void Track::printTrackIds(bool withItems, int level) const
|
||||
fprintf(stderr, "\n");
|
||||
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
trackPtr->printTrackIds(level + 1);
|
||||
}
|
||||
|
||||
@@ -446,7 +447,7 @@ QVector<int> Track::itemIds(bool recursive, bool sorted) const
|
||||
return itemIds;
|
||||
|
||||
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
itemIds += trackPtr->_itemIds(true);
|
||||
|
||||
return itemIds;
|
||||
@@ -640,7 +641,7 @@ const Item &Track::item(int id) const noexcept(false)
|
||||
return **it;
|
||||
|
||||
|
||||
for (const TrackPtr &track : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &track : std::as_const(m_childrenTracks))
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -762,7 +763,7 @@ Item &Track::next(int id) noexcept(false)
|
||||
int Track::rowOfTrack(int id) const noexcept(false)
|
||||
{
|
||||
int row = 0;
|
||||
for (const TrackPtr &trackPtr : qAsConst(m_childrenTracks))
|
||||
for (const TrackPtr &trackPtr : std::as_const(m_childrenTracks))
|
||||
{
|
||||
if (trackPtr->id() == id)
|
||||
return row;
|
||||
|
||||
Reference in new issue
Block a user