add gui for remaining primitives

2015-05-20 20:15:13 +02:00
parent 9c172a535b
commit 48e8858bc9
15 changed files with 2922 additions and 3 deletions
--- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
@@ -49,7 +49,6 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
    proxy = new QWidget(this);
    ui.setupUi(proxy);
    
-    // set limits
    // box
    ui.boxLength->setMaximum(INT_MAX);    
    ui.boxWidth->setMaximum(INT_MAX);
@@ -69,6 +68,10 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
    ui.coneRadius1->setMaximum(INT_MAX);
    ui.coneRadius2->setMaximum(INT_MAX);
    ui.coneHeight->setMaximum(INT_MAX);
+    connect(ui.coneRadius1, SIGNAL(valueChanged(double)), this, SLOT(onConeRadius1Changed(double)));
+    connect(ui.coneRadius2, SIGNAL(valueChanged(double)), this, SLOT(onConeRadius2Changed(double)));
+    connect(ui.coneAngle, SIGNAL(valueChanged(double)), this, SLOT(onConeAngleChanged(double)));
+    connect(ui.coneHeight, SIGNAL(valueChanged(double)), this, SLOT(onConeHeightChanged(double)));
    
    // sphere
    ui.sphereRadius->setMaximum(INT_MAX);
@@ -81,9 +84,27 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
    ui.ellipsoidRadius1->setMaximum(INT_MAX);
    ui.ellipsoidRadius2->setMaximum(INT_MAX);
    ui.ellipsoidRadius3->setMaximum(INT_MAX);
+    connect(ui.ellipsoidRadius1, SIGNAL(valueChanged(double)), this, SLOT(onEllipsoidRadius1Changed(double)));
+    connect(ui.ellipsoidRadius2, SIGNAL(valueChanged(double)), this, SLOT(onEllipsoidRadius2Changed(double)));
+    connect(ui.ellipsoidRadius3, SIGNAL(valueChanged(double)), this, SLOT(onEllipsoidRadius3Changed(double)));
+    connect(ui.ellipsoidAngle1, SIGNAL(valueChanged(double)), this, SLOT(onEllipsoidAngle1Changed(double)));
+    connect(ui.ellipsoidAngle2, SIGNAL(valueChanged(double)), this, SLOT(onEllipsoidAngle2Changed(double)));
+    connect(ui.ellipsoidAngle3, SIGNAL(valueChanged(double)), this, SLOT(onEllipsoidAngle3Changed(double)));
+    
    // torus
    ui.torusRadius1->setMaximum(INT_MAX);
    ui.torusRadius2->setMaximum(INT_MAX);
+    connect(ui.torusRadius1, SIGNAL(valueChanged(double)), this, SLOT(onTorusRadius1Changed(double)));
+    connect(ui.torusRadius2, SIGNAL(valueChanged(double)), this, SLOT(onTorusRadius2Changed(double)));
+    connect(ui.torusAngle1, SIGNAL(valueChanged(double)), this, SLOT(onTorusAngle1Changed(double)));
+    connect(ui.torusAngle2, SIGNAL(valueChanged(double)), this, SLOT(onTorusAngle2Changed(double)));
+    connect(ui.torusAngle3, SIGNAL(valueChanged(double)), this, SLOT(onTorusAngle3Changed(double)));
+    
+    //prism
+    connect(ui.prismCircumradius, SIGNAL(valueChanged(double)), this, SLOT(onPrismCircumradiusChanged(double)));
+    connect(ui.prismHeight, SIGNAL(valueChanged(double)), this, SLOT(onPrismHeightChanged(double)));
+    connect(ui.prismPolygon, SIGNAL(valueChanged(int)), this, SLOT(onPrismPolygonChanged(int)));
+  
    // wedge
    ui.wedgeXmin->setMinimum(INT_MIN);
    ui.wedgeXmin->setMaximum(INT_MAX);
@@ -105,7 +126,17 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
    ui.wedgeX2max->setMaximum(INT_MAX);
    ui.wedgeZ2max->setMinimum(INT_MIN);
    ui.wedgeZ2max->setMaximum(INT_MAX);
-   
+    connect(ui.wedgeXmax, SIGNAL(valueChanged(double)), this, SLOT(onWedgeXmaxChanged(double)));
+    connect(ui.wedgeXmin, SIGNAL(valueChanged(double)), this, SLOT(onWedgeXinChanged(double)));
+    connect(ui.wedgeYmax, SIGNAL(valueChanged(double)), this, SLOT(onWedgeYmaxChanged(double)));
+    connect(ui.wedgeYmin, SIGNAL(valueChanged(double)), this, SLOT(onWedgeYinChanged(double)));
+    connect(ui.wedgeZmax, SIGNAL(valueChanged(double)), this, SLOT(onWedgeZmaxChanged(double)));
+    connect(ui.wedgeZmin, SIGNAL(valueChanged(double)), this, SLOT(onWedgeZinChanged(double)));
+    connect(ui.wedgeX2max, SIGNAL(valueChanged(double)), this, SLOT(onWedgeX2maxChanged(double)));
+    connect(ui.wedgeX2min, SIGNAL(valueChanged(double)), this, SLOT(onWedgeX2inChanged(double)));
+    connect(ui.wedgeZ2max, SIGNAL(valueChanged(double)), this, SLOT(onWedgeZ2maxChanged(double)));
+    connect(ui.wedgeZ2min, SIGNAL(valueChanged(double)), this, SLOT(onWedgeZ2inChanged(double)));
+    
    this->groupLayout()->addWidget(proxy);
    
    int index = 0;
@@ -130,6 +161,49 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
            ui.sphereAngle3->setValue(static_cast<PartDesign::Sphere*>(vp->getObject())->Angle3.getValue());
            ui.sphereRadius->setValue(static_cast<PartDesign::Sphere*>(vp->getObject())->Radius.getValue());
            break;
+        case PartDesign::FeaturePrimitive::Cone:
+            index = 3;
+            ui.coneAngle->setValue(static_cast<PartDesign::Cone*>(vp->getObject())->Angle.getValue());
+            ui.coneHeight->setValue(static_cast<PartDesign::Cone*>(vp->getObject())->Height.getValue());
+            ui.coneRadius1->setValue(static_cast<PartDesign::Cone*>(vp->getObject())->Radius1.getValue());
+            ui.coneRadius2->setValue(static_cast<PartDesign::Cone*>(vp->getObject())->Radius2.getValue());
+            break;
+        case PartDesign::FeaturePrimitive::Ellipsoid:
+            index = 5;
+            ui.ellipsoidAngle1->setValue(static_cast<PartDesign::Ellipsoid*>(vp->getObject())->Angle1.getValue());
+            ui.ellipsoidAngle2->setValue(static_cast<PartDesign::Ellipsoid*>(vp->getObject())->Angle2.getValue());
+            ui.ellipsoidAngle3->setValue(static_cast<PartDesign::Ellipsoid*>(vp->getObject())->Angle3.getValue());
+            ui.ellipsoidRadius1->setValue(static_cast<PartDesign::Ellipsoid*>(vp->getObject())->Radius1.getValue());
+            ui.ellipsoidRadius2->setValue(static_cast<PartDesign::Ellipsoid*>(vp->getObject())->Radius2.getValue());
+            ui.ellipsoidRadius3->setValue(static_cast<PartDesign::Ellipsoid*>(vp->getObject())->Radius3.getValue());
+            break;
+        case PartDesign::FeaturePrimitive::Torus:
+            index = 6;
+            ui.torusAngle1->setValue(static_cast<PartDesign::Torus*>(vp->getObject())->Angle1.getValue());
+            ui.torusAngle2->setValue(static_cast<PartDesign::Torus*>(vp->getObject())->Angle2.getValue());
+            ui.torusAngle3->setValue(static_cast<PartDesign::Torus*>(vp->getObject())->Angle3.getValue());
+            ui.torusRadius1->setValue(static_cast<PartDesign::Torus*>(vp->getObject())->Radius1.getValue());
+            ui.torusRadius2->setValue(static_cast<PartDesign::Torus*>(vp->getObject())->Radius2.getValue());
+            break;
+        case PartDesign::FeaturePrimitive::Prism:
+            index = 7;
+            ui.prismPolygon->setValue(static_cast<PartDesign::Prism*>(vp->getObject())->Polygon.getValue());
+            ui.prismCircumradius->setValue(static_cast<PartDesign::Prism*>(vp->getObject())->Circumradius.getValue());
+            ui.prismHeight->setValue(static_cast<PartDesign::Prism*>(vp->getObject())->Height.getValue());
+            break;
+        case PartDesign::FeaturePrimitive::Wedge:
+            index = 8;
+            ui.wedgeXmax->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Xmax.getValue());
+            ui.wedgeXmin->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Xmin.getValue());
+            ui.wedgeX2max->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->X2max.getValue());
+            ui.wedgeX2min->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->X2min.getValue());
+            ui.wedgeYmax->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Ymax.getValue());
+            ui.wedgeYmin->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Ymin.getValue());
+            ui.wedgeZmax->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Zmax.getValue());
+            ui.wedgeZmin->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Zmin.getValue());
+            ui.wedgeZ2max->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Z2max.getValue());
+            ui.wedgeZ2min->setValue(static_cast<PartDesign::Wedge*>(vp->getObject())->Z2min.getValue());
+            break;       
    }
    
    ui.widgetStack->setCurrentIndex(index);
@@ -208,6 +282,177 @@ void TaskBoxPrimitives::onSphereRadiusChanged(double  v) {
    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
 }

+void TaskBoxPrimitives::onConeAngleChanged(double v) {
+
+    PartDesign::Cone* sph = static_cast<PartDesign::Cone*>(vp->getObject());
+    sph->Angle.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onConeHeightChanged(double v) {
+    PartDesign::Cone* sph = static_cast<PartDesign::Cone*>(vp->getObject());
+    sph->Height.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onConeRadius1Changed(double v) {
+    PartDesign::Cone* sph = static_cast<PartDesign::Cone*>(vp->getObject());
+    sph->Radius1.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onConeRadius2Changed(double v) {
+    PartDesign::Cone* sph = static_cast<PartDesign::Cone*>(vp->getObject());
+    sph->Radius2.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onEllipsoidAngle1Changed(double v) {
+    PartDesign::Ellipsoid* sph = static_cast<PartDesign::Ellipsoid*>(vp->getObject());
+    sph->Angle1.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onEllipsoidAngle2Changed(double v) {
+    PartDesign::Ellipsoid* sph = static_cast<PartDesign::Ellipsoid*>(vp->getObject());
+    sph->Angle2.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onEllipsoidAngle3Changed(double v) {
+    PartDesign::Ellipsoid* sph = static_cast<PartDesign::Ellipsoid*>(vp->getObject());
+    sph->Angle3.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onEllipsoidRadius1Changed(double v) {
+    PartDesign::Ellipsoid* sph = static_cast<PartDesign::Ellipsoid*>(vp->getObject());
+    sph->Radius1.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onEllipsoidRadius2Changed(double v) {
+    PartDesign::Ellipsoid* sph = static_cast<PartDesign::Ellipsoid*>(vp->getObject());
+    sph->Radius2.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onEllipsoidRadius3Changed(double v) {
+    PartDesign::Ellipsoid* sph = static_cast<PartDesign::Ellipsoid*>(vp->getObject());
+    sph->Radius3.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onTorusAngle1Changed(double v) {
+    PartDesign::Torus* sph = static_cast<PartDesign::Torus*>(vp->getObject());
+    sph->Angle1.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onTorusAngle2Changed(double v) {
+    PartDesign::Torus* sph = static_cast<PartDesign::Torus*>(vp->getObject());
+    sph->Angle2.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onTorusAngle3Changed(double v) {
+    PartDesign::Torus* sph = static_cast<PartDesign::Torus*>(vp->getObject());
+    sph->Angle3.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onTorusRadius1Changed(double v) {
+    PartDesign::Torus* sph = static_cast<PartDesign::Torus*>(vp->getObject());
+    sph->Radius1.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onTorusRadius2Changed(double v) {
+    PartDesign::Torus* sph = static_cast<PartDesign::Torus*>(vp->getObject());
+    sph->Radius2.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onPrismCircumradiusChanged(double v) {
+    PartDesign::Prism* sph = static_cast<PartDesign::Prism*>(vp->getObject());
+    sph->Circumradius.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onPrismHeightChanged(double v) {
+    PartDesign::Prism* sph = static_cast<PartDesign::Prism*>(vp->getObject());
+    sph->Height.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onPrismPolygonChanged(int v) {
+    PartDesign::Prism* sph = static_cast<PartDesign::Prism*>(vp->getObject());
+    sph->Polygon.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+
+void TaskBoxPrimitives::onWedgeX2inChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->X2min.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeX2maxChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->X2max.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeXinChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Xmin.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeXmaxChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Xmax.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeYinChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Ymin.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeYmaxChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Ymax.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeZ2inChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Z2min.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeZ2maxChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Z2max.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeZinChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Zmin.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+void TaskBoxPrimitives::onWedgeZmaxChanged(double v) {
+    PartDesign::Wedge* sph = static_cast<PartDesign::Wedge*>(vp->getObject());
+    sph->Zmax.setValue(v);
+    vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
+}
+
+

 /*
 void  TaskBoxPrimitives::createPrimitive(const QString& placement)