suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Datum Filter showing Named non-datum variables

Browse Source
This commit is contained in:
Abdullah Tahiri 2014-05-21 10:28:00 +02:00 committed by wmayer
parent f0bd78bee9
commit 63ab2d7f12
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,8 +112,8 @@ void ConstraintView::contextMenuEvent (QContextMenuEvent* event)
change->setEnabled(v.isValid());
QAction* rename = menu.addAction(tr("Rename"), this, SLOT(renameCurrentItem())
#ifndef Q_WS_MAC // on Mac F2 doesn't seem to trigger an edit signal
,QKeySequence(Qt::Key_F2)
#ifndef Q_WS_MAC // on Mac F2 doesn't seem to trigger an edit signal
,QKeySequence(Qt::Key_F2)
#endif
);
rename->setEnabled(item != 0);
@ -357,41 +357,47 @@ void TaskSketcherConstrains::slotConstraintsChanged(void)
else
name = QString::fromUtf8((*it)->Name.c_str());
/* Filter
0 => All
1 => Normal? => <1 => ALL
2 => Datums? => <2 => All or normal
3 => Named => <3 => All, Normal or Datums
*/
switch((*it)->Type){
case Sketcher::Horizontal:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(horiz,name,i-1,(*it)->Type));
break;
case Sketcher::Vertical:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(vert,name,i-1,(*it)->Type));
break;
case Sketcher::Coincident:
if (Filter<1 || !(*it)->Name.empty())
if (Filter<1 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(coinc,name,i-1,(*it)->Type));
break;
case Sketcher::PointOnObject:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(pntoo,name,i-1,(*it)->Type));
break;
case Sketcher::Parallel:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(para,name,i-1,(*it)->Type));
break;
case Sketcher::Perpendicular:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(perp,name,i-1,(*it)->Type));
break;
case Sketcher::Tangent:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(tang,name,i-1,(*it)->Type));
break;
case Sketcher::Equal:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(equal,name,i-1,(*it)->Type));
break;
case Sketcher::Symmetric:
if (Filter<2 || !(*it)->Name.empty())
if (Filter<2 || (Filter==3 && !(*it)->Name.empty()))
ui->listWidgetConstraints->addItem(new ConstraintItem(symm,name,i-1,(*it)->Type));
break;
case Sketcher::Distance: