eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-08 16:50:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable addTriangle/Mesh for when no paint is selected

Browse Source
This commit is contained in:
Tats
2014-01-11 22:01:07 -05:00
parent 62492a9c41
commit daaceef671
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MainWindow.cpp
View File

@@ -31,8 +31,9 @@ MainWindow::MainWindow()
mappingManager = new MappingManager;
// _facade = new Facade(mappingManager, this);
currentPaintId = 0;
currentMappingId = 0;
currentPaintId = NULL_UID;
currentMappingId = NULL_UID;
// TODO: not sure we need this anymore since we have NULL_UID
_hasCurrentPaint = false;
_hasCurrentMapping = false;
@@ -78,6 +79,10 @@ void MainWindow::handlePaintItemSelectionChanged()
setCurrentPaint(idx);
removeCurrentMapping();
// Enable creation of mappings when a paint is selected.
addQuadAction->setEnabled(true);
addTriangleAction->setEnabled(true);
// Update canvases.
updateAll();
//sourceCanvas->switchImage(idx);
@@ -225,7 +230,9 @@ void MainWindow::addMesh()
void MainWindow::addTriangle()
{
// FIXME: crashes if there is no current paint id. (if no paint exists)
// A paint must be selected to add a mapping.
if (getCurrentPaintId() == NULL_UID)
return;
// Create default quad.
@@ -295,10 +302,20 @@ uid MainWindow::createImagePaint(uid paintId, QString uri, float x, float y)
// Add it to the manager.
Paint::ptr paint(img);
// Add image to paintList widget.
QListWidgetItem* item = new QListWidgetItem(strippedName(uri));
item->setData(Qt::UserRole, paint->getId()); // TODO: could possibly be replaced by a Paint pointer
item->setIcon(QIcon(uri));
item->setSizeHint(QSize(item->sizeHint().width(), MainWindow::PAINT_LIST_ITEM_HEIGHT));
paintList->addItem(item);
paintList->setCurrentItem(item);
return mappingManager->addPaint(paint);
}
}
}
void MainWindow::windowModified()
{
setWindowModified(true);
@@ -471,11 +488,13 @@ void MainWindow::createActions()
addQuadAction->setIcon(QIcon(":/images/draw-rectangle-2.png"));
addQuadAction->setStatusTip(tr("Add quad"));
connect(addQuadAction, SIGNAL(triggered()), this, SLOT(addMesh()));
addQuadAction->setEnabled(false);
addTriangleAction = new QAction(tr("&Add triangle"), this);
addTriangleAction->setIcon(QIcon(":/images/draw-triangle.png"));
addTriangleAction->setStatusTip(tr("Add triangle"));
connect(addTriangleAction, SIGNAL(triggered()), this, SLOT(addTriangle()));
addTriangleAction->setEnabled(false);
}
void MainWindow::createMenus()