LayerWidget::~LayerWidget()
{
delete listBox;
- //delete pxmVisible;
- //delete pxmHidden;
}
/**
RS_Layer * activeLayer = NULL;
- if (layerList != NULL)
+ if (layerList)
activeLayer = layerList->getActive();
RS_DEBUG->print("LayerWidget::update() clearing listBox");
-
listBox->clear();
- if (layerList == NULL)
+ if (!layerList)
{
RS_DEBUG->print("LayerWidget::update() abort");
return;
RS_Layer * layer = layerList->at(i);
// hide layer "ByBlock"?
- if (showByBlock || layer->getName()!="ByBlock")
+ if (showByBlock || layer->getName() != "ByBlock")
{
QPixmap * pm = NULL;
if (!layer->isFrozen())
- {
- if (!layer->isLocked())
- {
- pm = &pxmLayerStatus10;
- }
- else
- {
- pm = &pxmLayerStatus11;
- }
- }
+ pm = (!layer->isLocked() ? &pxmLayerStatus10 : &pxmLayerStatus11);
else
- {
- if (!layer->isLocked())
- {
- pm = &pxmLayerStatus00;
- }
- else
- {
- pm = &pxmLayerStatus01;
- }
- }
-
- if (pm != NULL)
- {
-// listBox->insertItem(*pm, layer->getName());
- listBox->addItem(new QListWidgetItem(*pm, layer->getName()));
- }
+ pm = (!layer->isLocked() ? &pxmLayerStatus00 : &pxmLayerStatus01);
+
+// listBox->insertItem(*pm, layer->getName());
+ listBox->addItem(new QListWidgetItem(*pm, layer->getName()));
}
}
RS_DEBUG->print("LayerWidget::update() sorting");
-
// listBox->sort();
listBox->sortItems(Qt::AscendingOrder);
-
RS_DEBUG->print("LayerWidget::update() reactivating current layer");
RS_Layer * l = lastLayer;
lastLayer = l;
#warning "!!!"
// listBox->setContentsPos(0, yPos);
-
RS_DEBUG->print("LayerWidget::update() end");
}
{
RS_DEBUG->print("LayerWidget::highlightLayer() begin");
- if (layer == NULL || layerList == NULL)
+ if (!layer || !layerList)
{
RS_DEBUG->print("LayerWidget::highlightLayer() abort");
return;
QString name = layer->getName();
highlightLayer(name);
-
RS_DEBUG->print("LayerWidget::highlightLayer() end");
}
{
RS_DEBUG->print("LayerWidget::highlightLayer(name) begin");
- if (layerList == NULL)
+ if (!layerList)
{
RS_DEBUG->print("LayerWidget::highlightLayer(name) abort");
return;
RS_DEBUG->print("LayerWidget::highlightLayer(name) end");
}
-/*virtual*/ void LayerWidget::layerActivated(RS_Layer * layer)
+void LayerWidget::layerActivated(RS_Layer * layer)
{
highlightLayer(layer);
}
-/*virtual*/ void LayerWidget::layerAdded(RS_Layer * layer)
+void LayerWidget::layerAdded(RS_Layer * layer)
{
update();
highlightLayer(layer);
}
-/*virtual*/ void LayerWidget::layerEdited(RS_Layer *)
+void LayerWidget::layerEdited(RS_Layer *)
{
update();
}
-/*virtual*/ void LayerWidget::layerRemoved(RS_Layer *)
+void LayerWidget::layerRemoved(RS_Layer *)
{
update();
highlightLayer(layerList->at(0));
}
-/*virtual*/ void LayerWidget::layerToggled(RS_Layer *)
+void LayerWidget::layerToggled(RS_Layer *)
{
update();
}
QString layerName = listBox->currentItem()->text();
RS_DEBUG->print("LayerWidget::slotActivated(): %s", layerName.toLatin1().data());
- if (layerList == NULL)
+ if (!layerList)
return;
lastLayer = layerList->getActive();
// only change state / no activation
RS_Layer * l = lastLayer;
+#warning "!!! Bad implementation of lock/freeze functionality !!!"
if (p.x() < 23)
{
actionHandler->slotLayersToggleView();
}
else
{
- if (item != NULL && layerList != NULL)
+ if (item && layerList)
lastLayer = layerList->find(item->text());
}
}
break;
}
}
-