PD: fix #2582

FreeCAD · Oct 15, 2016 · cdf4374 · cdf4374
1 parent 8c59d59
commit cdf4374
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
@@ -136,6 +136,9 @@ void TaskMirroredParameters::setupUI()
     if (sketch && sketch->isDerivedFrom(Part::Part2DObject::getClassTypeId())) {
         this->fillPlanesCombo(planeLinks,static_cast<Part::Part2DObject*>(sketch));
     }
+    else {
+        this->fillPlanesCombo(planeLinks, NULL);
+    }
 
     //show the parts coordinate system planes for selection
     PartDesign::Body * body = PartDesign::Body::findBodyOf ( getObject() );

diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
@@ -156,6 +156,9 @@ void TaskPolarPatternParameters::setupUI()
     if (sketch && sketch->isDerivedFrom(Part::Part2DObject::getClassTypeId())) {
         this->fillAxisCombo(axesLinks, static_cast<Part::Part2DObject*>(sketch));
     }
+    else {
+        this->fillAxisCombo(axesLinks, NULL);
+    }
 
     //show the parts coordinate system axis for selection
     PartDesign::Body * body = PartDesign::Body::findBodyOf ( getObject() );
@@ -214,31 +217,26 @@ void TaskPolarPatternParameters::kickUpdateViewTimer() const
 void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
 {
     if (msg.Type == Gui::SelectionChanges::AddSelection) {
-
+        
         if (originalSelected(msg)) {
             if (selectionMode == addFeature)
                 ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName));
             else
                 removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName);
             exitSelectionMode();
         } else {
-            // TODO checkme (2015-09-01, Fat-Zer)
-            exitSelectionMode();
-            std::vector<std::string> axes;
-            App::DocumentObject* selObj;
-            PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
-            getReferencedSelection(pcPolarPattern, msg, selObj, axes);
-            if(!selObj)
-                return;
-            // Note: ReferenceSelection has already checked the selection for validity
-            if ( selectionMode == reference || 
-                selObj->isDerivedFrom ( App::Line::getClassTypeId () ) ||
-                selObj->isDerivedFrom(PartDesign::Line::getClassTypeId()) ) {
+            if (selectionMode == reference) {
+                std::vector<std::string> axes;
+                App::DocumentObject* selObj;
+                PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
+                getReferencedSelection(pcPolarPattern, msg, selObj, axes);
+                if(!selObj)
+                    return;
                 pcPolarPattern->Axis.setValue(selObj, axes);
-
                 recomputeFeature();
                 updateUI();
             }
+            exitSelectionMode();
         }
     }
 }