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

massive rewrite of project data system

Browse Source
This commit is contained in:
itsmattkc
2018-12-13 14:29:09 +11:00
parent 6c3197aac6
commit ac1cb9d14f
44 changed files with 2562 additions and 2158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/loaddialog.cpp
+19 -4
View File
@@ -6,25 +6,40 @@
#include <QProgressBar>
#include <QPushButton>
LoadDialog::LoadDialog(QWidget *parent) : QDialog(parent) {
#include "panels/panels.h"
#include "panels/project.h"
#include "io/loadthread.h"
#include "playback/playback.h"
#include "ui/sourcetable.h"
LoadDialog::LoadDialog(QWidget *parent, bool autorecovery) : QDialog(parent) {
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
QVBoxLayout* layout = new QVBoxLayout();
setLayout(layout);
layout->addWidget(new QLabel("Loading ''..."));
layout->addWidget(new QLabel("Loading '" + project_url.mid(project_url.lastIndexOf('/')+1) + "'..."));
bar = new QProgressBar();
bar->setValue(50);
layout->addWidget(bar);
QPushButton* cancel_button = new QPushButton("Cancel");
cancel_button = new QPushButton("Cancel");
connect(cancel_button, SIGNAL(clicked(bool)), this, SLOT(reject()));
QHBoxLayout* hboxLayout = new QHBoxLayout();
hboxLayout = new QHBoxLayout();
hboxLayout->addStretch();
hboxLayout->addWidget(cancel_button);
hboxLayout->addStretch();
layout->addLayout(hboxLayout);
LoadThread* lt = new LoadThread(this, autorecovery);
QObject::connect(lt, SIGNAL(success()), this, SLOT(thread_done()));
lt->start();
}
void LoadDialog::thread_done() {
// project_model.update_data();
close();
}
dialogs/loaddialog.h
+10 -1
View File
@@ -4,13 +4,22 @@
#include <QDialog>
class QProgressBar;
class Sequence;
class Media;
class Footage;
class QHBoxLayout;
class LoadDialog : public QDialog
{
Q_OBJECT
public:
LoadDialog(QWidget* parent = 0);
LoadDialog(QWidget* parent, bool autorecovery);
private slots:
void thread_done();
private:
QProgressBar* bar;
QPushButton* cancel_button;
QHBoxLayout* hboxLayout;
};
#endif // LOADDIALOG_H
dialogs/mediapropertiesdialog.cpp
+14 -16
View File
@@ -7,34 +7,35 @@
#include <QDialogButtonBox>
#include <QTreeWidgetItem>
#include "io/media.h"
#include "project/footage.h"
#include "project/media.h"
#include "panels/project.h"
#include "project/undo.h"
MediaPropertiesDialog::MediaPropertiesDialog(QWidget *parent, QTreeWidgetItem *i, Media *m) :
MediaPropertiesDialog::MediaPropertiesDialog(QWidget *parent, Media *i) :
QDialog(parent),
item(i),
media(m)
item(i)
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QGridLayout* grid = new QGridLayout();
setLayout(grid);
if (m->video_tracks.size() > 0) {
Footage* f = item->to_footage();
if (f->video_tracks.size() > 0) {
interlacing_box = new QComboBox();
interlacing_box->addItem("Auto (" + get_interlacing_name(media->video_tracks.at(0)->video_auto_interlacing) + ")");
interlacing_box->addItem("Auto (" + get_interlacing_name(f->video_tracks.at(0)->video_auto_interlacing) + ")");
interlacing_box->addItem(get_interlacing_name(VIDEO_PROGRESSIVE));
interlacing_box->addItem(get_interlacing_name(VIDEO_TOP_FIELD_FIRST));
interlacing_box->addItem(get_interlacing_name(VIDEO_BOTTOM_FIELD_FIRST));
interlacing_box->setCurrentIndex((media->video_tracks.at(0)->video_auto_interlacing == media->video_tracks.at(0)->video_interlacing) ? 0 : media->video_tracks.at(0)->video_interlacing + 1);
interlacing_box->setCurrentIndex((f->video_tracks.at(0)->video_auto_interlacing == f->video_tracks.at(0)->video_interlacing) ? 0 : f->video_tracks.at(0)->video_interlacing + 1);
grid->addWidget(new QLabel("Interlacing:"), 0, 0);
grid->addWidget(interlacing_box, 0, 1);
}
name_box = new QLineEdit(m->name);
name_box = new QLineEdit(item->get_name());
grid->addWidget(new QLabel("Name:"), 1, 0);
grid->addWidget(name_box, 1, 1);
@@ -50,22 +51,19 @@ void MediaPropertiesDialog::accept() {
ComboAction* ca = new ComboAction();
//set interlacing
Footage* f = item->to_footage();
if (interlacing_box->currentIndex() > 0) {
ca->append(new SetInt(&media->video_tracks.at(0)->video_interlacing, interlacing_box->currentIndex() - 1));
ca->append(new SetInt(&f->video_tracks.at(0)->video_interlacing, interlacing_box->currentIndex() - 1));
} else {
ca->append(new SetInt(&media->video_tracks.at(0)->video_interlacing, media->video_tracks.at(0)->video_auto_interlacing));
ca->append(new SetInt(&f->video_tracks.at(0)->video_interlacing, f->video_tracks.at(0)->video_auto_interlacing));
}
//set name
MediaRename* mr = new MediaRename();
mr->from = media->name;
mr->item = item;
mr->to = name_box->text();
item->setText(0, name_box->text());
MediaRename* mr = new MediaRename(item, name_box->text());
ca->append(mr);
ca->appendPost(new CloseAllClipsCommand());
ca->appendPost(new UpdateFootageTooltip(item, media));
ca->appendPost(new UpdateFootageTooltip(item));
undo_stack.push(ca);
dialogs/mediapropertiesdialog.h
+4 -5
View File
@@ -3,20 +3,19 @@
#include <QDialog>
struct Media;
struct Footage;
class QComboBox;
class QLineEdit;
class QTreeWidgetItem;
class Media;
class MediaPropertiesDialog : public QDialog {
Q_OBJECT
public:
MediaPropertiesDialog(QWidget *parent, QTreeWidgetItem* i, Media *m);
MediaPropertiesDialog(QWidget *parent, Media* i);
private:
QComboBox* interlacing_box;
QLineEdit* name_box;
QTreeWidgetItem* item;
Media* media;
Media* item;
private slots:
void accept();
};
dialogs/newsequencedialog.h
+2 -2
View File
@@ -4,7 +4,7 @@
#include <QDialog>
class Project;
class QTreeWidgetItem;
class Media;
struct Sequence;
namespace Ui {
@@ -19,7 +19,7 @@ public:
explicit NewSequenceDialog(QWidget *parent = 0);
~NewSequenceDialog();
Sequence* existing_sequence;
QTreeWidgetItem* existing_item;
Media* existing_item;
void set_sequence_name(const QString& s);
protected:
dialogs/replaceclipmediadialog.cpp
+18 -51
View File
@@ -8,17 +8,18 @@
#include "project/clip.h"
#include "playback/playback.h"
#include "playback/cacher.h"
#include "io/media.h"
#include "project/footage.h"
#include "project/undo.h"
#include "project/media.h"
#include <QVBoxLayout>
#include <QTreeWidget>
#include <QTreeView>
#include <QLabel>
#include <QPushButton>
#include <QMessageBox>
#include <QCheckBox>
ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, SourceTable *table, QTreeWidgetItem *old_media) :
ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, SourceTable *table, Media *old_media) :
QDialog(parent),
source_table(table),
media(old_media)
@@ -29,12 +30,11 @@ ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, SourceTable *tab
layout->addWidget(new QLabel("Select which media you want to replace this media's clips with:"));
tree = new QTreeWidget();
tree->setHeaderHidden(true);
tree = new QTreeView();
layout->addWidget(tree);
use_same_media_in_points = new QCheckBox("Keep the same media in points");
use_same_media_in_points = new QCheckBox("Keep the same media in-points");
use_same_media_in_points->setChecked(true);
layout->addWidget(use_same_media_in_points);
@@ -56,36 +56,34 @@ ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, SourceTable *tab
setLayout(layout);
copy_tree(NULL, NULL);
tree->setModel(&project_model);
//copy_tree(NULL, NULL);
}
void ReplaceClipMediaDialog::replace() {
if (tree->selectedItems().size() != 1) {
QModelIndexList selected_items = tree->selectionModel()->selectedRows();
if (selected_items.size() != 1) {
QMessageBox::critical(this, "No media selected", "Please select a media to replace with or click 'Cancel'.", QMessageBox::Ok);
} else {
QTreeWidgetItem* selected_item = tree->selectedItems().at(0);
QTreeWidgetItem* new_item = reinterpret_cast<QTreeWidgetItem*>(selected_item->data(0, Qt::UserRole + 1).value<quintptr>());
Media* new_item = static_cast<Media*>(selected_items.at(0).internalPointer());
if (media == new_item) {
QMessageBox::critical(this, "Same media selected", "You selected the same media that you're replacing. Please select a different one or click 'Cancel'.", QMessageBox::Ok);
} else if (get_type_from_tree(new_item) == MEDIA_TYPE_FOLDER) {
} else if (new_item->get_type() == MEDIA_TYPE_FOLDER) {
QMessageBox::critical(this, "Folder selected", "You cannot replace footage with a folder.", QMessageBox::Ok);
} else {
if (get_type_from_tree(new_item) == MEDIA_TYPE_SEQUENCE && sequence == get_sequence_from_tree(new_item)) {
if (new_item->get_type() == MEDIA_TYPE_SEQUENCE && sequence == new_item->to_sequence()) {
QMessageBox::critical(this, "Active sequence selected", "You cannot insert a sequence into itself.", QMessageBox::Ok);
} else {
void* old_media = get_media_from_tree(media);
} else {
ReplaceClipMediaCommand* rcmc = new ReplaceClipMediaCommand(
old_media,
get_media_from_tree(new_item),
get_type_from_tree(media),
get_type_from_tree(new_item),
media,
new_item,
use_same_media_in_points->isChecked()
);
for (int i=0;i<sequence->clips.size();i++) {
Clip* c = sequence->clips.at(i);
if (c != NULL && c->media == old_media) {
if (c != NULL && c->media == media) {
rcmc->clips.append(c);
}
}
@@ -98,34 +96,3 @@ void ReplaceClipMediaDialog::replace() {
}
}
}
void ReplaceClipMediaDialog::copy_tree(QTreeWidgetItem* parent, QTreeWidgetItem* target) {
QVector<QTreeWidgetItem*> items;
if (parent == NULL) {
for (int i=0;i<source_table->topLevelItemCount();i++) {
items.append(source_table->topLevelItem(i));
}
} else {
for (int i=0;i<parent->childCount();i++) {
items.append(parent->child(i));
}
}
for (int i=0;i<items.size();i++) {
QTreeWidgetItem* original = items.at(i);
QTreeWidgetItem* item = new QTreeWidgetItem();
item->setText(0, original->text(0));
item->setData(0, Qt::UserRole + 1, reinterpret_cast<quintptr>(original));
if (target == NULL) {
tree->addTopLevelItem(item);
} else {
target->addChild(item);
}
if (original->childCount() > 0) {
copy_tree(original, item);
}
}
}
dialogs/replaceclipmediadialog.h
+6 -7
View File
@@ -4,22 +4,21 @@
#include <QDialog>
class SourceTable;
class QTreeWidget;
class QTreeWidgetItem;
class QTreeView;
class Media;
class QCheckBox;
class ReplaceClipMediaDialog : public QDialog {
Q_OBJECT
public:
ReplaceClipMediaDialog(QWidget* parent, SourceTable* table, QTreeWidgetItem *old_media);
ReplaceClipMediaDialog(QWidget* parent, SourceTable* table, Media *old_media);
private slots:
void replace();
private:
SourceTable* source_table;
QTreeWidget* tree;
QTreeWidgetItem* media;
QCheckBox* use_same_media_in_points;
void copy_tree(QTreeWidgetItem* parent, QTreeWidgetItem *target);
QTreeView* tree;
Media* media;
QCheckBox* use_same_media_in_points;
};
#endif // REPLACECLIPMEDIADIALOG_H
dialogs/speeddialog.cpp
+8 -9
View File
@@ -10,12 +10,13 @@
#include "ui/labelslider.h"
#include "project/clip.h"
#include "project/sequence.h"
#include "io/media.h"
#include "project/footage.h"
#include "playback/playback.h"
#include "panels/panels.h"
#include "panels/timeline.h"
#include "project/undo.h"
#include "project/effect.h"
#include "project/media.h"
SpeedDialog::SpeedDialog(QWidget *parent) : QDialog(parent) {
QVBoxLayout* main_layout = new QVBoxLayout();
@@ -83,14 +84,12 @@ void SpeedDialog::run() {
clip_percent = c->speed;
if (c->track < 0) {
bool process_video = true;
if (c->media_type == MEDIA_TYPE_FOOTAGE) {
Media* m = static_cast<Media*>(c->media);
if (m != NULL) {
MediaStream* ms = m->get_stream_from_file_index(true, c->media_stream);
if (ms != NULL && ms->infinite_length) {
process_video = false;
}
}
if (c->media != NULL && c->media->get_type() == MEDIA_TYPE_FOOTAGE) {
Footage* m = c->media->to_footage();
FootageStream* ms = m->get_stream_from_file_index(true, c->media_stream);
if (ms != NULL && ms->infinite_length) {
process_video = false;
}
}
if (process_video) {