namespace mmp {
diff --git a/src/core/core.pri b/src/core/core.pri
index eecfdddc..8dd8355e 100644
--- a/src/core/core.pri
+++ b/src/core/core.pri
@@ -5,12 +5,12 @@ HEADERS += $$PWD/Commands.h \
$$PWD/CameraImpl.h \
$$PWD/CameraSurface.h \
$$PWD/Element.h \
- $$PWD/Mapping.h \
+ $$PWD/Layer.h \
$$PWD/MappingManager.h \
$$PWD/Maths.h \
$$PWD/MetaObjectRegistry.h \
$$PWD/MM.h \
- $$PWD/Paint.h \
+ $$PWD/Source.h \
$$PWD/ProjectLabels.h \
$$PWD/ProjectReader.h \
$$PWD/ProjectWriter.h \
@@ -24,11 +24,11 @@ SOURCES += $$PWD/Commands.cpp \
$$PWD/CameraImpl.cpp \
$$PWD/CameraSurface.cpp \
$$PWD/Element.cpp \
- $$PWD/Mapping.cpp \
+ $$PWD/Layer.cpp \
$$PWD/MappingManager.cpp \
$$PWD/MetaObjectRegistry.cpp \
$$PWD/MM.cpp \
- $$PWD/Paint.cpp \
+ $$PWD/Source.cpp \
$$PWD/ProjectLabels.cpp \
$$PWD/ProjectReader.cpp \
$$PWD/ProjectWriter.cpp \
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index c1dd03a0..ca13da11 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -75,6 +75,17 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
void AboutDialog::createAboutTab()
{
+ QWidget *aboutWidget = new QWidget;
+ QVBoxLayout *aboutLayout = new QVBoxLayout(aboutWidget);
+
+ // Add splash image at the top.
+ QLabel *splashLabel = new QLabel;
+ QPixmap splashPixmap(":/mapmap-splash");
+ int targetWidth = qMin(splashPixmap.width(), ABOUT_WINDOW_WIDTH - 40);
+ splashLabel->setPixmap(splashPixmap.scaledToWidth(targetWidth, Qt::SmoothTransformation));
+ splashLabel->setAlignment(Qt::AlignCenter);
+ aboutLayout->addWidget(splashLabel);
+
QTextBrowser *aboutTextBrowser = new QTextBrowser;
aboutTextBrowser->setOpenExternalLinks(true);
@@ -84,14 +95,14 @@ void AboutDialog::createAboutTab()
QString copyrightText = "" + tr("Copyright © 2013 %1.").arg(MM::COPYRIGHT_OWNERS) + "
";
// License short notice
QFile licenseShortFile(":/license-short");
- licenseShortFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ (void)licenseShortFile.open(QIODevice::ReadOnly | QIODevice::Text);
QString licenseNoticeText = Qt::convertFromPlainText(QString::fromUtf8(licenseShortFile.readAll()), Qt::WhiteSpaceNormal);
// About projection mapping
QFile aboutMappingFile(":/projection-mapping");
- aboutMappingFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ (void)aboutMappingFile.open(QIODevice::ReadOnly | QIODevice::Text);
QString aboutMappingText = QString::fromUtf8(aboutMappingFile.readAll());
// Visit our website for more information
- QString projectWebsiteText = "" + tr("See the ") + QString("").arg(MM::ORGANIZATION_DOMAIN) +
+ QString projectWebsiteText = "" + tr("See the ") + QString("").arg(MM::WEBSITE_URL) +
tr("%1 website").arg(MM::APPLICATION_NAME) + " for more information on this software.
";
// Append texts
@@ -104,8 +115,9 @@ void AboutDialog::createAboutTab()
// Set about text
aboutTextBrowser->setText(aboutText);
+ aboutLayout->addWidget(aboutTextBrowser);
- _tabWidget->addTab(aboutTextBrowser, tr("About"));
+ _tabWidget->addTab(aboutWidget, tr("About"));
}
void AboutDialog::createChangelogTab()
@@ -114,7 +126,7 @@ void AboutDialog::createChangelogTab()
changelogTextBrowser->setOpenExternalLinks(true);
QFile changelogFile(":/changelog_md");
- changelogFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ (void)changelogFile.open(QIODevice::ReadOnly | QIODevice::Text);
changelogTextBrowser->setMarkdown(QString::fromUtf8(changelogFile.readAll()));
_tabWidget->addTab(changelogTextBrowser, tr("Changelog"));
}
@@ -140,7 +152,7 @@ void AboutDialog::createContributorsTab()
contributorsTextBrowser->setOpenExternalLinks(true);
QFile contributorsFile(":/contributors_md");
- contributorsFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ (void)contributorsFile.open(QIODevice::ReadOnly | QIODevice::Text);
contributorsTextBrowser->setMarkdown(QString::fromUtf8(contributorsFile.readAll()));
_tabWidget->addTab(contributorsTextBrowser, tr("Contributors"));
}
@@ -151,7 +163,7 @@ void AboutDialog::createLicenseTab()
licenseTextBrowser->setOpenExternalLinks(true);
QFile licenseFile(":/license");
- licenseFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ (void)licenseFile.open(QIODevice::ReadOnly | QIODevice::Text);
licenseTextBrowser->setText(QString::fromUtf8(licenseFile.readAll()));
_tabWidget->addTab(licenseTextBrowser, tr("License"));
@@ -164,7 +176,7 @@ void AboutDialog::createOscTab()
oscBrowser->setOpenExternalLinks(true);
QFile oscFile(":/osc-documentation_md");
- oscFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ (void)oscFile.open(QIODevice::ReadOnly | QIODevice::Text);
oscBrowser->setMarkdown(QString::fromUtf8(oscFile.readAll()));
_tabWidget->addTab(oscBrowser, tr("OSC Commands"));
}
diff --git a/src/gui/ConsoleWindow.cpp b/src/gui/ConsoleWindow.cpp
index ab815133..e22ccea0 100644
--- a/src/gui/ConsoleWindow.cpp
+++ b/src/gui/ConsoleWindow.cpp
@@ -86,7 +86,7 @@ void ConsoleWindow::writeLogFile(const QString &message)
{
QString logFilePath = QDir(QDir::tempPath()).filePath("mapmap.log");
QFile logFile(logFilePath);
- logFile.open(QIODevice::Append);
+ (void)logFile.open(QIODevice::Append);
QTextStream stream(&logFile);
stream << message << Qt::endl;
}
diff --git a/src/gui/MappingGui.cpp b/src/gui/LayerGui.cpp
similarity index 62%
rename from src/gui/MappingGui.cpp
rename to src/gui/LayerGui.cpp
index 249fb566..024aad8b 100644
--- a/src/gui/MappingGui.cpp
+++ b/src/gui/LayerGui.cpp
@@ -1,5 +1,5 @@
/*
- * MappingGui.cpp
+ * LayerGui.cpp
*
* (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
* (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net
@@ -18,17 +18,17 @@
* along with this program. If not, see .
*/
-#include "MappingGui.h"
+#include "LayerGui.h"
#include "MainWindow.h"
namespace mmp {
-MappingGui::MappingGui(Mapping::ptr mapping)
- : _mapping(mapping),
+LayerGui::LayerGui(Layer::ptr layer)
+ : _layer(layer),
_graphicsItem(NULL),
_inputGraphicsItem(NULL)
{
- outputShape = mapping->getShape();
+ outputShape = layer->getShape();
Q_CHECK_PTR(outputShape);
// Create editor.
@@ -38,31 +38,31 @@ MappingGui::MappingGui(Mapping::ptr mapping)
_propertyBrowser->setFactoryForManager(_variantManager, _variantFactory);
- _paintEnumManager = new QtEnumPropertyManager(this);
+ _sourceEnumManager = new QtEnumPropertyManager(this);
// Mapping UID.
- _idItem = _variantManager->addProperty(QVariant::Int, QObject::tr("ID"));
+ _idItem = _variantManager->addProperty(QMetaType::Int, QObject::tr("ID"));
_idItem->setEnabled(false);
- _idItem->setValue(_mapping->getId());
+ _idItem->setValue(_layer->getId());
_propertyBrowser->addProperty(_idItem);
// Mapping basic properties.
- _opacityItem = _variantManager->addProperty(QVariant::Double, QObject::tr("Opacity (%)"));
+ _opacityItem = _variantManager->addProperty(QMetaType::Double, QObject::tr("Opacity (%)"));
_opacityItem->setAttribute("minimum", 0.0);
_opacityItem->setAttribute("maximum", 100.0);
_opacityItem->setAttribute("decimals", 1);
- _opacityItem->setValue(_mapping->getOpacity()*100.0);
+ _opacityItem->setValue(_layer->getOpacity()*100.0);
_propertyBrowser->addProperty(_opacityItem);
- _paintItem = _variantManager->addProperty(QtVariantPropertyManager::enumTypeId(), "Source");
- _propertyBrowser->addProperty(_paintItem);
- updatePaints();
+ _sourceItem = _variantManager->addProperty(QtVariantPropertyManager::enumTypeId(), "Source");
+ _propertyBrowser->addProperty(_sourceItem);
+ updateSources();
// Output shape.
_outputItem = _variantManager->addProperty(QtVariantPropertyManager::groupTypeId(),
QObject::tr("Output shape"));
- _buildShapeProperty(_outputItem, mapping->getShape().data());
+ _buildShapeProperty(_outputItem, layer->getShape().data());
_propertyBrowser->addProperty(_outputItem);
// Collapse output shape.
@@ -74,25 +74,25 @@ MappingGui::MappingGui(Mapping::ptr mapping)
}
-void MappingGui::setValue(QtProperty* property, const QVariant& value)
+void LayerGui::setValue(QtProperty* property, const QVariant& value)
{
if (property == _opacityItem)
{
double opacity = qBound(value.toDouble() / 100.0, 0.0, 1.0);
- if (opacity != _mapping->getOpacity())
+ if (opacity != _layer->getOpacity())
{
- _mapping->setOpacity(opacity);
+ _layer->setOpacity(opacity);
emit valueChanged();
}
}
- else if (property == _paintItem)
+ else if (property == _sourceItem)
{
- int paintIndex = value.toInt();
- Paint::ptr newPaint = MainWindow::window()->getMappingManager().getPaint(paintIndex);
- if (newPaint != _mapping->getPaint() && _mapping->paintIsCompatible(newPaint)) {
- _mapping->setPaint(newPaint);
+ int sourceIndex = value.toInt();
+ Source::ptr newSource = MainWindow::window()->getMappingManager().getSource(sourceIndex);
+ if (newSource != _layer->getSource() && _layer->sourceIsCompatible(newSource)) {
+ _layer->setSource(newSource);
emit valueChanged();
- emit paintChanged();
+ emit sourceChanged();
}
}
else
@@ -112,42 +112,42 @@ void MappingGui::setValue(QtProperty* property, const QVariant& value)
}
}
-void MappingGui::setValue(QString propertyName, QVariant value)
+void LayerGui::setValue(QString propertyName, QVariant value)
{
if (propertyName == "opacity")
_opacityItem->setValue(value.toDouble() * 100);
}
-void MappingGui::updateShape(MShape* shape)
+void LayerGui::updateShape(MShape* shape)
{
- if (shape == _mapping->getShape().data())
+ if (shape == _layer->getShape().data())
{
_updateShapeProperty(_outputItem, shape);
}
}
-void MappingGui::updatePaints()
+void LayerGui::updateSources()
{
- int currentPaint = -1;
+ int currentSource = -1;
MappingManager& manager = MainWindow::window()->getMappingManager();
- QStringList paintList;
- QVector paints = manager.getPaintsCompatibleWith(_mapping);
- for (int i=0; i sources = manager.getSourcesCompatibleWith(_layer);
+ for (int i=0; i