diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 6ce5037b4..1a3a0e57e 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -126,6 +126,8 @@ Model::Model(QObject *parentIn, const Gui::Document &documentIn) : QGraphicsScen passPixmap = passIcon.pixmap(iconSize, iconSize); QIcon failIcon(Gui::BitmapFactory().pixmap("dagViewFail")); failPixmap = failIcon.pixmap(iconSize, iconSize); + QIcon pendingIcon(Gui::BitmapFactory().pixmap("dagViewPending")); + pendingPixmap = pendingIcon.pixmap(iconSize, iconSize); renameAction = new QAction(this); renameAction->setText(tr("Rename")); @@ -844,19 +846,25 @@ void Model::updateStates() (*theGraph)[currentVertex].lastVisibleState = currentVisibilityState; } - FeatureState currentFeatureState = (record.DObject->isError()) ? FeatureState::Fail : FeatureState::Pass; + FeatureState currentFeatureState = FeatureState::Pass; + if (record.DObject->isError()) + currentFeatureState = FeatureState::Fail; + else if ((record.DObject->mustExecute() == 1)) + currentFeatureState = FeatureState::Pending; if (currentFeatureState != (*theGraph)[currentVertex].lastFeatureState) { if (currentFeatureState == FeatureState::Pass) { (*theGraph)[currentVertex].stateIcon->setPixmap(passPixmap); - (*theGraph)[currentVertex].stateIcon->setToolTip(QString()); } else { - (*theGraph)[currentVertex].stateIcon->setPixmap(failPixmap); - (*theGraph)[currentVertex].stateIcon->setToolTip(QString::fromAscii(record.DObject->getStatusString())); + if (currentFeatureState == FeatureState::Fail) + (*theGraph)[currentVertex].stateIcon->setPixmap(failPixmap); + else + (*theGraph)[currentVertex].stateIcon->setPixmap(pendingPixmap); } + (*theGraph)[currentVertex].stateIcon->setToolTip(QString::fromAscii(record.DObject->getStatusString())); (*theGraph)[currentVertex].lastFeatureState = currentFeatureState; } } diff --git a/src/Gui/DAGView/DAGModel.h b/src/Gui/DAGView/DAGModel.h index 4825b750c..635ca87fe 100644 --- a/src/Gui/DAGView/DAGModel.h +++ b/src/Gui/DAGView/DAGModel.h @@ -149,6 +149,7 @@ namespace Gui QPixmap visiblePixmapDisabled; QPixmap passPixmap; QPixmap failPixmap; + QPixmap pendingPixmap; QAction *renameAction; QAction *editingFinishedAction; diff --git a/src/Gui/DAGView/DAGModelGraph.h b/src/Gui/DAGView/DAGModelGraph.h index 069cb993b..894c6c284 100644 --- a/src/Gui/DAGView/DAGModelGraph.h +++ b/src/Gui/DAGView/DAGModelGraph.h @@ -57,7 +57,8 @@ namespace Gui { None = 0, //dagViewVisible.svg dagViewPass.svg dagViewFail.svg + dagViewPending.svg Part_Measure_Clear_All.svg Part_Measure_Toggle_All.svg spaceball_button.svg