many changes :P

This commit is contained in:
kazu
2016-06-06 22:08:53 +02:00
parent db6b479d86
commit 6243165084
56 changed files with 4399 additions and 245 deletions

View File

@@ -22,7 +22,7 @@ ToolBoxWidget::ToolBoxWidget(MapView2D* view, QWidget *parent) : QWidget(parent)
setMinimumWidth(48);
QGridLayout* lay = new QGridLayout(this);
int r = 0;
// OBSTACLES
btnGround = new QPushButton(UIHelper::getIcon("floor"), "");
@@ -57,6 +57,11 @@ ToolBoxWidget::ToolBoxWidget(MapView2D* view, QWidget *parent) : QWidget(parent)
lay->addWidget(btnImage, r++, 0, 1,1,Qt::AlignTop);
connect(btnImage, SIGNAL(clicked(bool)), this, SLOT(onNewImage()));
// POI
btnPOI = new QPushButton(UIHelper::getIcon("poi"), "");
btnPOI->setMinimumSize(s,s);
lay->addWidget(btnPOI, r++, 0, 1,1,Qt::AlignTop);
connect(btnPOI, SIGNAL(clicked(bool)), this, SLOT(onNewPOI()));
// FILL
lay->addItem(new QSpacerItem(0,0,QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), r, 0);
@@ -77,8 +82,9 @@ void ToolBoxWidget::setSelectedLayer(MapLayer *ml) {
btnWifi->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_ACCESS_POINTS));
btnBeacon->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_BEACONS));
btnPOI->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_POIS));
btnImage->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_UNDERLAY));
btnImage->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_UNDERLAYS));
}
@@ -164,11 +170,23 @@ void ToolBoxWidget::onNewBeacon() {
}
void ToolBoxWidget::onNewPOI() {
const Point2 center = view->getScaler().getCenter();
Floorplan::POI* poi = new Floorplan::POI(
Floorplan::POIType::ROOM, "noname", Point2(center.x, center.y)
);
MMFloorPOIs* pois = (MMFloorPOIs*) curLayer;
pois->createPOI(poi);
}
void ToolBoxWidget::onNewImage() {
const Point2 center = view->getScaler().getCenter();
MMFloorUnderlay* underlay = (MMFloorUnderlay*) curLayer;
underlay->createImage(center);
MMFloorUnderlays* underlays = (MMFloorUnderlays*) curLayer;
underlays->createImage(center);
}