kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Constraints' widget deactivated constraints commands and representation

Browse Source
This commit is contained in:
Abdullah Tahiri
2019-06-22 06:51:11 +02:00
committed by abdullahtahiriyo
parent 4de857a471
commit 70081d739b
2 changed files with 77 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
View File

@@ -212,54 +212,70 @@ public:
static QIcon angl_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAngle_Driven") );
static QIcon snell_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_SnellsLaw_Driven") );
auto selicon = [](const Sketcher::Constraint * constr, const QIcon & normal, const QIcon & driven) -> QIcon {
if(!constr->isActive) {
QIcon darkIcon;
int w = QApplication::style()->pixelMetric(QStyle::PM_ListViewIconSize);
darkIcon.addPixmap(normal.pixmap(w, w, QIcon::Disabled, QIcon::Off), QIcon::Normal, QIcon::Off);
darkIcon.addPixmap(normal.pixmap(w, w, QIcon::Disabled, QIcon::On ), QIcon::Normal, QIcon::On );
return darkIcon;
}
else if (constr->isDriving) {
return normal;
}
else {
return driven;
}
};
switch(constraint->Type){
case Sketcher::Horizontal:
return horiz;
return selicon(constraint,horiz,horiz);
case Sketcher::Vertical:
return vert;
return selicon(constraint,vert,vert);
case Sketcher::Coincident:
return coinc;
return selicon(constraint,coinc,coinc);
case Sketcher::Block:
return block;
return selicon(constraint,block,block);
case Sketcher::PointOnObject:
return pntoo;
return selicon(constraint,pntoo,pntoo);
case Sketcher::Parallel:
return para;
return selicon(constraint,para,para);
case Sketcher::Perpendicular:
return perp;
return selicon(constraint,perp,perp);
case Sketcher::Tangent:
return tang;
return selicon(constraint,tang,tang);
case Sketcher::Equal:
return equal;
return selicon(constraint,equal,equal);
case Sketcher::Symmetric:
return symm;
return selicon(constraint,symm,symm);
case Sketcher::Distance:
return constraint->isDriving ? dist : dist_driven;
return selicon(constraint,dist,dist_driven);
case Sketcher::DistanceX:
return constraint->isDriving ? hdist : hdist_driven;
return selicon(constraint,hdist,hdist_driven);
case Sketcher::DistanceY:
return constraint->isDriving ? vdist : vdist_driven;
return selicon(constraint,vdist,vdist_driven);
case Sketcher::Radius:
return constraint->isDriving ? radi : radi_driven;
return selicon(constraint,radi,radi_driven);
case Sketcher::Diameter:
return constraint->isDriving ? dia : dia_driven;
return selicon(constraint,dia,dia_driven);
case Sketcher::Angle:
return constraint->isDriving ? angl : angl_driven;
return selicon(constraint,angl,angl_driven);
case Sketcher::SnellsLaw:
return constraint->isDriving ? snell : snell_driven;
return selicon(constraint,snell,snell_driven);
case Sketcher::InternalAlignment:
switch(constraint->AlignmentType){
case Sketcher::EllipseMajorDiameter:
return iaellipsemajoraxis;
return selicon(constraint,iaellipsemajoraxis,iaellipsemajoraxis);
case Sketcher::EllipseMinorDiameter:
return iaellipseminoraxis;
return selicon(constraint,iaellipseminoraxis,iaellipseminoraxis);
case Sketcher::EllipseFocus1:
return iaellipsefocus1;
return selicon(constraint,iaellipsefocus1,iaellipsefocus1);
case Sketcher::EllipseFocus2:
return iaellipsefocus2;
return selicon(constraint,iaellipsefocus2,iaellipsefocus2);
case Sketcher::Undef:
default:
return iaellipseother;
return selicon(constraint,iaellipseother,iaellipseother);
}
default:
return QVariant();
@@ -336,6 +352,12 @@ public:
return sketch->Constraints[ConstraintNbr]->isInVirtualSpace;
}
bool isActive() const {
assert(ConstraintNbr >= 0 && ConstraintNbr < sketch->Constraints.getSize());
return sketch->Constraints[ConstraintNbr]->isActive;
}
void updateVirtualSpaceStatus() {
this->setCheckState((this->isInVirtualSpace() != sketchView->getIsShownVirtualSpace())?Qt::Unchecked:Qt::Checked);
}
@@ -423,6 +445,7 @@ void ConstraintView::contextMenuEvent (QContextMenuEvent* event)
bool isQuantity = false;
bool isToggleDriving = false;
bool isActive = true;
// Non-driving-constraints/measurements
ConstraintItem *it = dynamic_cast<ConstraintItem*>(item);
@@ -434,6 +457,8 @@ void ConstraintView::contextMenuEvent (QContextMenuEvent* event)
if (it->isEnforceable())
isToggleDriving = true;
}
isActive = it->isActive();
}
// This does the same as a double-click and thus it should be the first action and with bold text
@@ -444,6 +469,9 @@ void ConstraintView::contextMenuEvent (QContextMenuEvent* event)
QAction* driven = menu.addAction(tr("Toggle to/from reference"), this, SLOT(updateDrivingStatus()));
driven->setEnabled(isToggleDriving);
QAction* activate = menu.addAction(isActive ? tr("Deactivate") : tr("Activate"), this, SLOT(updateActiveStatus()));
activate->setEnabled(!items.isEmpty());
menu.addSeparator();
QAction* show = menu.addAction(tr("Show constraints"), this, SLOT(showConstraints()));
show->setEnabled(!items.isEmpty());
@@ -485,6 +513,16 @@ void ConstraintView::updateDrivingStatus()
}
}
void ConstraintView::updateActiveStatus()
{
QListWidgetItem* item = currentItem();
ConstraintItem *it = dynamic_cast<ConstraintItem*>(item);
if (it) {
onUpdateActiveStatus(item, !it->isActive());
}
}
void ConstraintView::showConstraints()
{
QList<QListWidgetItem *> items = selectedItems();
@@ -616,6 +654,10 @@ TaskSketcherConstrains::TaskSketcherConstrains(ViewProviderSketch *sketchView)
ui->listWidgetConstraints, SIGNAL(onUpdateDrivingStatus(QListWidgetItem *, bool)),
this , SLOT (on_listWidgetConstraints_updateDrivingStatus(QListWidgetItem *, bool))
);
QObject::connect(
ui->listWidgetConstraints, SIGNAL(onUpdateActiveStatus(QListWidgetItem *, bool)),
this , SLOT (on_listWidgetConstraints_updateActiveStatus(QListWidgetItem *, bool))
);
QObject::connect(
ui->filterInternalAlignment, SIGNAL(stateChanged(int)),
this , SLOT (on_filterInternalAlignment_stateChanged(int))
@@ -750,6 +792,16 @@ void TaskSketcherConstrains::on_listWidgetConstraints_updateDrivingStatus(QListW
slotConstraintsChanged();
}
void TaskSketcherConstrains::on_listWidgetConstraints_updateActiveStatus(QListWidgetItem *item, bool status)
{
Q_UNUSED(status);
ConstraintItem *citem = dynamic_cast<ConstraintItem*>(item);
if (!citem) return;
Gui::Application::Instance->commandManager().runCommandByName("Sketcher_ToggleActiveConstraint");
slotConstraintsChanged();
}
void TaskSketcherConstrains::on_listWidgetConstraints_itemChanged(QListWidgetItem *item)
{
const ConstraintItem *it = dynamic_cast<const ConstraintItem*>(item);

3
src/Mod/Sketcher/Gui/TaskSketcherConstrains.h
View File

@@ -51,6 +51,7 @@ protected:
Q_SIGNALS:
void onUpdateDrivingStatus(QListWidgetItem *item, bool status);
void onUpdateActiveStatus(QListWidgetItem *item, bool status);
void emitCenterSelectedItems();
protected Q_SLOTS:
@@ -60,6 +61,7 @@ protected Q_SLOTS:
void deleteSelectedItems();
void doSelectConstraints();
void updateDrivingStatus();
void updateActiveStatus();
void swapNamedOfSelectedItems();
void showConstraints();
void hideConstraints();
@@ -85,6 +87,7 @@ public Q_SLOTS:
void on_listWidgetConstraints_itemActivated(QListWidgetItem *item);
void on_listWidgetConstraints_itemChanged(QListWidgetItem * item);
void on_listWidgetConstraints_updateDrivingStatus(QListWidgetItem *item, bool status);
void on_listWidgetConstraints_updateActiveStatus(QListWidgetItem *item, bool status);
void on_listWidgetConstraints_emitCenterSelectedItems(void);
void on_filterInternalAlignment_stateChanged(int state);
void on_extendedInformation_stateChanged(int state);