Skip to content

Commit

Permalink
PartDesign: remove unused FitIntersection from sketch based feature
Browse files Browse the repository at this point in the history
  • Loading branch information
realthunder committed Nov 25, 2020
1 parent 098dbe4 commit 34f56bf
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 20 deletions.
3 changes: 1 addition & 2 deletions src/Mod/PartDesign/App/FeatureSketchBased.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ ProfileBased::ProfileBased()
ADD_PROPERTY_TYPE(Fit, (0.0), "SketchBased", App::Prop_None, "Shrink or expand the profile for fitting");
ADD_PROPERTY_TYPE(FitJoin,(long(0)),"SketchBased",App::Prop_None,"Fit join type");
FitJoin.setEnums(Part::Offset::JoinEnums);
ADD_PROPERTY_TYPE(FitIntersection,(false),"SketchBased",App::Prop_None,"Fit intersection");
}

short ProfileBased::mustExecute() const
Expand Down Expand Up @@ -243,7 +242,7 @@ TopoShape ProfileBased::getVerifiedFace(bool silent) const {
static_cast<short>(FitJoin.getValue()),
false,
false,
FitIntersection.getValue());
false);
}

if(count>1) {
Expand Down
1 change: 0 additions & 1 deletion src/Mod/PartDesign/App/FeatureSketchBased.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class PartDesignExport ProfileBased : public PartDesign::FeatureAddSub

App::PropertyDistance Fit;
App::PropertyEnumeration FitJoin;
App::PropertyBool FitIntersection;

short mustExecute() const;

Expand Down
15 changes: 0 additions & 15 deletions src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,6 @@ void TaskSketchBasedParameters::initUI(QWidget *widget) {
layout->addWidget(fitJoinType);
boxLayout->addLayout(layout);

fitIntersection = new QCheckBox(tr("Fit intersection"), this);
connect(fitIntersection, SIGNAL(toggled(bool)), this, SLOT(onFitIntersectionChanged(bool)));
boxLayout->addWidget(fitIntersection);

addUpdateViewCheckBox(widget);
}

Expand All @@ -129,10 +125,6 @@ void TaskSketchBasedParameters::refresh()
fitJoinType->setCurrentIndex(pcSketchBased->FitJoin.getValue());
}

if (fitIntersection) {
QSignalBlocker guard(fitIntersection);
fitIntersection->setChecked(pcSketchBased->FitIntersection.getValue());
}
TaskFeatureParameters::refresh();
}

Expand All @@ -150,13 +142,6 @@ void TaskSketchBasedParameters::onFitChanged(double v)
recomputeFeature();
}

void TaskSketchBasedParameters::onFitIntersectionChanged(bool checked)
{
PartDesign::ProfileBased* pcSketchBased = static_cast<PartDesign::ProfileBased*>(vp->getObject());
pcSketchBased->FitIntersection.setValue(checked);
recomputeFeature();
}

void TaskSketchBasedParameters::onFitJoinChanged(int v)
{
PartDesign::ProfileBased* pcSketchBased = static_cast<PartDesign::ProfileBased*>(vp->getObject());
Expand Down
2 changes: 0 additions & 2 deletions src/Mod/PartDesign/Gui/TaskSketchBasedParameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@ class TaskSketchBasedParameters : public PartDesignGui::TaskFeatureParameters,
protected Q_SLOTS:
void onFitChanged(double);
void onFitJoinChanged(int);
void onFitIntersectionChanged(bool);

protected:
Gui::PrefQuantitySpinBox * fitEdit = nullptr;
QCheckBox *fitIntersection = nullptr;
QComboBox *fitJoinType = nullptr;
};

Expand Down

0 comments on commit 34f56bf

Please sign in to comment.