Fem: Remove unused view properties

Author: marioalexis84

src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp

@@ -24,16 +24,15 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-#include <Inventor/nodes/SoBaseColor.h>
+#include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoCone.h>
 #include <Inventor/nodes/SoCube.h>
 #include <Inventor/nodes/SoCylinder.h>
-#include <Inventor/nodes/SoFontStyle.h>
 #include <Inventor/nodes/SoMultipleCopy.h>
+#include <Inventor/nodes/SoPickStyle.h>
 #include <Inventor/nodes/SoRotation.h>
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoShapeHints.h>
-#include <Inventor/nodes/SoText2.h>
 #include <Inventor/nodes/SoTranslation.h>
 #include <QAction>
 #include <QDockWidget>
@@ -67,39 +66,22 @@ ViewProviderFemConstraint::ViewProviderFemConstraint()
     , wizardSubLayout(nullptr)
     , constraintDialog(nullptr)
 {
-    ADD_PROPERTY(TextColor, (0.0f, 0.0f, 0.0f));
     ADD_PROPERTY(FaceColor, (1.0f, 0.0f, 0.2f));
-    ADD_PROPERTY(FontSize, (18));
-    ADD_PROPERTY(DistFactor, (1.0));
-    ADD_PROPERTY(Mirror, (false));
-
-    pFont = new SoFontStyle();
-    pFont->ref();
-    pLabel = new SoText2();
-    pLabel->ref();
-    pTextColor = new SoBaseColor();
-    pTextColor->ref();
+
     pShapeSep = new SoSeparator();
     pShapeSep->ref();
     pMultCopy = new SoMultipleCopy();
     pMultCopy->ref();
-
-    pMaterials = new SoBaseColor();
+    pMaterials = new SoMaterial();
     pMaterials->ref();
-    pMaterials->rgb.setValue(1.0f, 0.0f, 0.2f);
+    pMaterials->diffuseColor.setValue(1.0f, 0.0f, 0.2f);
 
-    TextColor.touch();
-    FontSize.touch();
-    FaceColor.touch();
 
     Gui::ViewProviderSuppressibleExtension::initExtension(this);
 }
 
 ViewProviderFemConstraint::~ViewProviderFemConstraint()
 {
-    pFont->unref();
-    pLabel->unref();
-    pTextColor->unref();
     pMaterials->unref();
     pMultCopy->unref();
     pShapeSep->unref();
@@ -182,20 +164,21 @@ void ViewProviderFemConstraint::setupContextMenu(QMenu* menu, QObject* receiver,
 
 void ViewProviderFemConstraint::onChanged(const App::Property* prop)
 {
-    if (prop == &Mirror) {
-        updateData(prop);
-    }
-    else if (prop == &TextColor) {
-        const App::Color& c = TextColor.getValue();
-        pTextColor->rgb.setValue(c.r, c.g, c.b);
-    }
-    else if (prop == &FaceColor) {
-        const App::Color& c = FaceColor.getValue();
-        pMaterials->rgb.setValue(c.r, c.g, c.b);
-    }
-    else if (prop == &FontSize) {
-        pFont->size = FontSize.getValue();
+    if (prop == &ShapeAppearance) {
+        const App::Color& d = ShapeAppearance.getDiffuseColor();
+        pMaterials->diffuseColor.setValue(d.r, d.g, d.b);
+        const App::Color& s = ShapeAppearance.getSpecularColor();
+        pMaterials->specularColor.setValue(s.r, s.g, s.b);
+        const App::Color& e = ShapeAppearance.getEmissiveColor();
+        pMaterials->emissiveColor.setValue(e.r, e.g, e.b);
+        const App::Color& a = ShapeAppearance.getAmbientColor();
+        pMaterials->ambientColor.setValue(a.r, a.g, a.b);
+        pMaterials->shininess.setValue(ShapeAppearance.getShininess() / 100.0f);
+        pMaterials->transparency.setValue(ShapeAppearance.getTransparency() / 100.0f);
     }
+    //    else if (prop == &Transparency) {
+    //        pMaterials->transparency.setValue(Transparency.getValue() / 100.0f);
+    //    }
     else {
         ViewProviderDocumentObject::onChanged(prop);  // clazy:exclude=skipped-base-method
     }

src/Mod/Fem/Gui/ViewProviderFemConstraint.h

@@ -35,10 +35,8 @@
 
 
 class SbRotation;
-class SoFontStyle;
-class SoText2;
 class SoBaseColor;
-class SoMaterial;
+class SMaterial;
 class SoMultipleCopy;
 
 namespace FemGui
@@ -57,11 +55,7 @@ class FemGuiExport ViewProviderFemConstraint: public Gui::ViewProviderGeometryOb
     ~ViewProviderFemConstraint() override;
 
     // Display properties
-    App::PropertyColor TextColor;
     App::PropertyColor FaceColor;
-    App::PropertyInteger FontSize;
-    App::PropertyFloat DistFactor;
-    App::PropertyBool Mirror;
 
     void attach(App::DocumentObject*) override;
     void updateData(const App::Property* prop) override;
@@ -165,10 +159,8 @@ class FemGuiExport ViewProviderFemConstraint: public Gui::ViewProviderGeometryOb
                                const bool gap = false);
 
 private:
-    SoFontStyle* pFont;
-    SoText2* pLabel;
-    SoBaseColor* pTextColor;
-    SoBaseColor* pMaterials;
+    //    SoBaseColor* pMaterials;
+    SoMaterial* pMaterials;
     bool rotateSymbol;
 
 protected: