From 5b44e38c8961176533cc71835e59698c3aff21b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= Date: Tue, 14 Jul 2015 05:59:34 +0200 Subject: [PATCH] remove linear and S-shape scaling from pipe They worked and are nice feature, but the handling with properties must be worked out better. To avoid any incompatibility due to property changes the functionality is removed now. --- src/Mod/PartDesign/App/FeaturePipe.cpp | 7 +- src/Mod/PartDesign/App/FeaturePipe.h | 1 - src/Mod/PartDesign/Gui/TaskPipeParameters.cpp | 30 ----- src/Mod/PartDesign/Gui/TaskPipeParameters.h | 2 - src/Mod/PartDesign/Gui/TaskPipeScaling.ui | 123 +----------------- 5 files changed, 4 insertions(+), 159 deletions(-) diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index 55f111cb2b..ff2ffc94d0 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -91,7 +91,6 @@ Pipe::Pipe() ADD_PROPERTY_TYPE(Binormal,(Base::Vector3d()),"Sweep",App::Prop_None,"Binormal vector for coresponding orientation mode"); ADD_PROPERTY_TYPE(Transition,(long(0)),"Sweep",App::Prop_None,"Transition mode"); ADD_PROPERTY_TYPE(Transformation,(long(0)),"Sweep",App::Prop_None,"Section transformation mode"); - ADD_PROPERTY_TYPE(ScalingData, (), "Sweep", App::Prop_None, "Data for scaling laws"); Mode.setEnums(ModeEnums); Transition.setEnums(TransitionEnums); Transformation.setEnums(TransformEnums); @@ -195,7 +194,7 @@ App::DocumentObjectExecReturn *Pipe::execute(void) } } - //build the law functions instead + /*//build the law functions instead else if(Transformation.getValue() == 2) { if(ScalingData.getValues().size()<1) return new App::DocumentObjectExecReturn("No valid data given for liinear scaling mode"); @@ -207,13 +206,13 @@ App::DocumentObjectExecReturn *Pipe::execute(void) } else if(Transformation.getValue() == 3) { if(ScalingData.getValues().size()<1) - return new App::DocumentObjectExecReturn("No valid data given for liinear scaling mode"); + return new App::DocumentObjectExecReturn("No valid data given for S-shape scaling mode"); Handle(Law_S) s = new Law_S(); s->Set(0,1,ScalingData[0].y, 1, ScalingData[0].x, ScalingData[0].z); scalinglaw = s; - } + }*/ //build all shells std::vector shells; diff --git a/src/Mod/PartDesign/App/FeaturePipe.h b/src/Mod/PartDesign/App/FeaturePipe.h index f4c53e5c44..08907abfc3 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.h +++ b/src/Mod/PartDesign/App/FeaturePipe.h @@ -49,7 +49,6 @@ public: App::PropertyEnumeration Transition; App::PropertyEnumeration Transformation; App::PropertyLinkList Sections; - App::PropertyVectorList ScalingData; App::DocumentObjectExecReturn *execute(void); short mustExecute() const; diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index b21037d1eb..81411658ba 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -542,14 +542,6 @@ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool newObj, QWidge this, SLOT(onButtonRefRemove(bool))); connect(ui->stackedWidget, SIGNAL(currentChanged(int)), this, SLOT(updateUI(int))); - connect(ui->linearSpinBox, SIGNAL(valueChanged(double)), - this, SLOT(onLinearSpinBox(double))); - connect(ui->sshapeSpinBox, SIGNAL(valueChanged(double)), - this, SLOT(onSshapeChanged(double))); - connect(ui->sshapeStartDeriSpinBox, SIGNAL(valueChanged(double)), - this, SLOT(onSshapeChanged(double))); - connect(ui->sshapeEndDeriSpinBox, SIGNAL(valueChanged(double)), - this, SLOT(onSshapeChanged(double))); this->groupLayout()->addWidget(proxy); @@ -597,11 +589,6 @@ void TaskPipeScaling::onScalingChanged(int idx) { updateUI(idx); static_cast(vp->getObject())->Transformation.setValue(idx); - - if(idx==2) - onLinearSpinBox(ui->linearSpinBox->value()); - else if(idx==3) - onSshapeChanged(0); } void TaskPipeScaling::onSelectionChanged(const SelectionChanges& msg) { @@ -691,23 +678,6 @@ void TaskPipeScaling::updateUI(int idx) { ui->stackedWidget->widget(idx)->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); } -void TaskPipeScaling::onLinearSpinBox(double val) { - - static_cast(vp->getObject())->ScalingData.setValue(Base::Vector3d(val,0,0)); - recomputeFeature(); -} - -void TaskPipeScaling::onSshapeChanged(double val) { - - double f, d0, d1; - f = ui->sshapeSpinBox->value(); - d0 = ui->sshapeStartDeriSpinBox->value(); - d1 = ui->sshapeEndDeriSpinBox->value(); - static_cast(vp->getObject())->ScalingData.setValue(Base::Vector3d(f, d0, d1)); - recomputeFeature(); -} - - //************************************************************************** //************************************************************************** diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.h b/src/Mod/PartDesign/Gui/TaskPipeParameters.h index 5f797a2a5e..b4eec5da6e 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.h @@ -138,8 +138,6 @@ private Q_SLOTS: void onButtonRefAdd(bool checked); void onButtonRefRemove(bool checked); void updateUI(int idx); - void onLinearSpinBox(double val); - void onSshapeChanged(double val); protected: enum selectionModes { none, refAdd, refRemove }; diff --git a/src/Mod/PartDesign/Gui/TaskPipeScaling.ui b/src/Mod/PartDesign/Gui/TaskPipeScaling.ui index 9b9c0e31e4..d06cbe8bc9 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeScaling.ui +++ b/src/Mod/PartDesign/Gui/TaskPipeScaling.ui @@ -41,16 +41,6 @@ Multisection - - - Linear - - - - - S-Shape - - @@ -58,7 +48,7 @@ - 1 + 0 @@ -111,117 +101,6 @@ - - - - - - - - Final scaling factor - - - - - - - - 0 - 0 - - - - 2 - - - 0.000000000000000 - - - 99999.000000000000000 - - - 1.000000000000000 - - - - - - - - - - - - - - - Scaling factor - - - - - - - - 0 - 0 - - - - -9999.000000000000000 - - - 9999.000000000000000 - - - 1.000000000000000 - - - - - - - Derivative at start - - - - - - - - 0 - 0 - - - - -99.000000000000000 - - - - - - - Derivative at end - - - - - - - - 0 - 0 - - - - -99.000000000000000 - - - - - - -