eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-06 23:49:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed signal/slot loop: on property changes model emits signals that are collected by the MainWindow and sent back to the PaintGui/MappingGui (this fixes OSC changes of model objects).

Browse Source
This commit is contained in:
Tats
2016-03-03 22:25:00 -05:00
parent 5fe89ab9ac
commit e87de3d3e9
10 changed files with 213 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
MainWindow.cpp
View File

@@ -272,6 +272,30 @@ void MainWindow::handlePaintChanged(Paint::ptr paint) {
setCurrentMapping(curMappingId);
}
void MainWindow::mappingPropertyChanged(uid id, QString propertyName, QVariant value)
{
// Retrieve mapping.
Mapping::ptr mapping = mappingManager->getMappingById(id);
Q_CHECK_PTR(mapping);
MappingGui::ptr mappingGui = getMappingGuiByMappingId(id);
Q_CHECK_PTR(mappingGui);
mappingGui->setValue(propertyName, value);
}
void MainWindow::paintPropertyChanged(uid id, QString propertyName, QVariant value)
{
// Retrieve paint.
Paint::ptr paint = mappingManager->getPaintById(id);
Q_CHECK_PTR(paint);
PaintGui::ptr paintGui = getPaintGuiByPaintId(id);
Q_CHECK_PTR(paintGui);
paintGui->setValue(propertyName, value);
}
void MainWindow::closeEvent(QCloseEvent *event)
{
// Stop video playback to avoid lags. XXX Hack
@@ -2315,6 +2339,13 @@ void MainWindow::addPaintItem(uid paintId, const QIcon& icon, const QString& nam
connect(paintGui.data(), SIGNAL(valueChanged(Paint::ptr)),
this, SLOT(handlePaintChanged(Paint::ptr)));
connect(paint.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
this, SLOT(paintPropertyChanged(uid, QString, QVariant)));
// TODO: attention: if mapping is invisible canvases will be updated for no reason
connect(paint.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
this, SLOT(updateCanvases()));
// Add paint item to paintList widget.
QListWidgetItem* item = new QListWidgetItem(icon, name);
setItemId(*item, paintId); // TODO: could possibly be replaced by a Paint pointer
@@ -2414,15 +2445,19 @@ void MainWindow::addMappingItem(uid mappingId)
mappingPropertyPanel->setEnabled(true);
// When mapper value is changed, update canvases.
connect(mapper.data(), SIGNAL(valueChanged()),
this, SLOT(updateCanvases()));
connect(sourceCanvas, SIGNAL(shapeChanged(MShape*)),
mapper.data(), SLOT(updateShape(MShape*)));
connect(destinationCanvas, SIGNAL(shapeChanged(MShape*)),
mapper.data(), SLOT(updateShape(MShape*)));
connect(mapping.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
this, SLOT(mappingPropertyChanged(uid, QString, QVariant)));
// TODO: attention: if mapping is invisible canvases will be updated for no reason
connect(mapping.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
this, SLOT(updateCanvases()));
// Switch to mapping tab.
contentTab->setCurrentWidget(mappingSplitter);