Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit cb3bdf8

Browse files
committed
improved and fixed data updates/sync
1 parent 31ef785 commit cb3bdf8

17 files changed

+55
-50
lines changed

src/ramdatainterface/localdatainterface.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,9 @@ void LocalDataInterface::saveSync(SyncData syncData)
706706
query( q );
707707

708708
// Emit insertions
709-
foreach(QStringList io, insertedObjects ) emit inserted( io.at(0), io.at(1), io.at(2) );
709+
foreach(QStringList io, insertedObjects ) {
710+
emit inserted( io.at(0), io.at(1), io.at(2) );
711+
}
710712
}
711713

712714
// Updates

src/rameditwidgets/asseteditwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ void AssetEditWidget::reInit(RamObject *o)
4747

4848
void AssetEditWidget::setTags()
4949
{
50-
if (!m_asset) return;
50+
if (!m_asset || m_reinit) return;
5151
m_asset->setTags(ui_tagsEdit->text());
5252
}
5353

5454
void AssetEditWidget::setAssetGroup(RamObject *ag)
5555
{
56-
if(!m_asset) return;
56+
if(!m_asset || m_reinit) return;
5757
m_asset->setAssetGroup(RamAssetGroup::c(ag));
5858
}
5959

src/rameditwidgets/assetgroupeditwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void AssetGroupEditWidget::reInit(RamObject *o)
4444

4545
void AssetGroupEditWidget::setColor(QColor c)
4646
{
47-
if (!m_assetGroup) return;
47+
if (!m_assetGroup || m_reinit) return;
4848
m_assetGroup->setColor(c);
4949
}
5050

src/rameditwidgets/filetypeeditwidget.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ void FileTypeEditWidget::reInit(RamObject *o)
3838

3939
void FileTypeEditWidget::setExtensions()
4040
{
41+
if (m_fileType || m_reinit) return;
4142
QStringList extensions = ui_extensionsEdit->text().split(",");
4243
QStringList fixedExtensions;
4344
for (int i = 0; i < extensions.count(); i++)
@@ -48,12 +49,12 @@ void FileTypeEditWidget::setExtensions()
4849
}
4950
ui_extensionsEdit->setText( fixedExtensions.join(", "));
5051

51-
if (m_fileType) m_fileType->setExtensions( ui_extensionsEdit->text() );
52+
m_fileType->setExtensions( ui_extensionsEdit->text() );
5253
}
5354

5455
void FileTypeEditWidget::setPreviewable(bool p)
5556
{
56-
if (!m_fileType) return;
57+
if (!m_fileType || m_reinit) return;
5758
m_fileType->setPreviewable(p);
5859
}
5960

src/rameditwidgets/pipeeditwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ void PipeEditWidget::createPipeFile()
7272

7373
void PipeEditWidget::setInputStep(RamObject *step)
7474
{
75-
if (!m_pipe) return;
75+
if (!m_pipe || m_reinit) return;
7676
if (!step) return;
7777
m_pipe->setInputStep( step );
7878
}
7979

8080
void PipeEditWidget::setOutputStep(RamObject *step)
8181
{
82-
if (!m_pipe) return;
82+
if (!m_pipe || m_reinit) return;
8383
if (!step) return;
8484
m_pipe->setOutputStep( step );
8585
}

src/rameditwidgets/pipefileeditwidget.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ void PipeFileEditWidget::reInit(RamObject *o)
4545

4646
void PipeFileEditWidget::setFileType(RamObject *ft)
4747
{
48-
if (!m_pipeFile) return;
48+
if (!m_pipeFile || m_reinit) return;
4949
if (ft) m_pipeFile->setFileType( RamFileType::c( ft ) );
5050
//ui_customSettingsEdit->setPlainText( m_pipeFile->customSettings() );
5151
}
5252

5353
void PipeFileEditWidget::setCustomSettings()
5454
{
55+
if (!m_pipeFile || m_reinit) return;
5556
m_pipeFile->setCustomSettings(ui_customSettingsEdit->toPlainText());
5657
}
5758

src/rameditwidgets/projecteditwidget.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ void ProjectEditWidget::reInit(RamObject *o)
6161

6262
void ProjectEditWidget::setResolution(int w, int h)
6363
{
64-
if(!m_project) return;
64+
if(!m_project || m_reinit) return;
6565
m_project->setWidth(w);
6666
m_project->setHeight(h);
6767
}
6868

6969
void ProjectEditWidget::setFramerate(double f)
7070
{
71-
if (!m_project) return;
71+
if (!m_project || m_reinit) return;
7272
m_project->setFramerate(f);
7373
}
7474

@@ -80,13 +80,13 @@ void ProjectEditWidget::updateFolderLabel(QString path)
8080

8181
void ProjectEditWidget::setPath(QString p)
8282
{
83-
if (!m_project) return;
83+
if (!m_project || m_reinit) return;
8484
m_project->setFolderPath(p);
8585
}
8686

8787
void ProjectEditWidget::setDeadline(QDate d)
8888
{
89-
if (!m_project) return;
89+
if (!m_project || m_reinit) return;
9090
m_project->setDeadline(d);
9191
}
9292

@@ -110,7 +110,7 @@ void ProjectEditWidget::createUser()
110110

111111
void ProjectEditWidget::savePath()
112112
{
113-
if (!m_project) return;
113+
if (!m_project || m_reinit) return;
114114

115115
QMessageBox::StandardButton confirm = QMessageBox::question( this,
116116
"Confirm overwrite",

src/rameditwidgets/sequenceeditwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ void SequenceEditWidget::reInit(RamObject *o)
4141

4242
void SequenceEditWidget::setColor(QColor c)
4343
{
44-
if (!m_sequence) return;
44+
if (!m_sequence || m_reinit) return;
4545
m_sequence->setColor(c);
4646
}
4747

4848
void SequenceEditWidget::createShot()
4949
{
50-
if (!m_sequence) return;
50+
if (!m_sequence || m_reinit) return;
5151
RamShot *shot = new RamShot(
5252
"NEW",
5353
"New Shot",

src/rameditwidgets/shoteditwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ void ShotEditWidget::reInit(RamObject *o)
6060

6161
void ShotEditWidget::setDuration()
6262
{
63-
if(!m_shot) return;
63+
if(!m_shot || m_reinit) return;
6464
m_shot->setDuration(ui_secondsBox->value());
6565
}
6666

6767
void ShotEditWidget::setSequence(RamObject *seq)
6868
{
69-
if (!m_shot) return;
69+
if (!m_shot || m_reinit) return;
7070
m_shot->setSequence(seq);
7171
}
7272

src/rameditwidgets/stateeditwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ void StateEditWidget::reInit(RamObject *o)
3838

3939
void StateEditWidget::setCompletion(int c)
4040
{
41-
if(!m_state) return;
41+
if(!m_state || m_reinit) return;
4242
m_state->setCompletionRatio(c);
4343
}
4444

4545
void StateEditWidget::setColor(QColor c)
4646
{
47-
if(!m_state) return;
47+
if(!m_state || m_reinit) return;
4848
m_state->setColor(c);
4949
}
5050

0 commit comments

Comments
 (0)