+ editor for PropertyMaterial

FreeCAD · May 7, 2016 · 8bbc642 · 8bbc642
1 parent a175c48
commit 8bbc642
Show file tree

Hide file tree

Showing 6 changed files with 412 additions and 15 deletions.
diff --git a/src/App/FeatureTest.cpp b/src/App/FeatureTest.cpp
@@ -66,7 +66,7 @@ FeatureTest::FeatureTest()
   ConstraintFloat.setConstraints(&floatPercent);
 
   App::Color c;
-  App::Material mat;
+  App::Material mat(App::Material::GOLD);
   ADD_PROPERTY(Colour      ,(c) );
   ADD_PROPERTY(ColourList  ,(c) );
   ADD_PROPERTY(Material    ,(mat));

diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp
@@ -2516,6 +2516,11 @@ void PropertyMaterial::Restore(Base::XMLReader &reader)
     hasSetValue();
 }
 
+const char* PropertyMaterial::getEditorName(void) const
+{
+    return "";// "Gui::PropertyEditor::PropertyMaterialItem";
+}
+
 Property *PropertyMaterial::Copy(void) const
 {
     PropertyMaterial *p= new PropertyMaterial();
@@ -2672,6 +2677,11 @@ void PropertyMaterialList::RestoreDocFile(Base::Reader &reader)
     setValues(values);
 }
 
+const char* PropertyMaterialList::getEditorName(void) const
+{
+    return "";// "Gui::PropertyEditor::PropertyMaterialListItem";
+}
+
 Property *PropertyMaterialList::Copy(void) const
 {
     PropertyMaterialList *p = new PropertyMaterialList();

diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h
@@ -952,7 +952,9 @@ class AppExport PropertyMaterial : public Property
 
     virtual void Save (Base::Writer &writer) const;
     virtual void Restore(Base::XMLReader &reader);
-
+
+    virtual const char* getEditorName(void) const;
+
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
 
@@ -1006,6 +1008,8 @@ class AppExport PropertyMaterialList : public PropertyLists
     virtual void SaveDocFile(Base::Writer &writer) const;
     virtual void RestoreDocFile(Base::Reader &reader);
 
+    virtual const char* getEditorName(void) const;
+
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
     virtual unsigned int getMemSize(void) const;

diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp
@@ -134,6 +134,7 @@ void Gui::SoFCDB::init()
     PropertyFloatListItem           ::init();
     PropertyIntegerListItem         ::init();
     PropertyColorItem               ::init();
+    PropertyMaterialItem            ::init();
     PropertyFileItem                ::init();
     PropertyPathItem                ::init();
     PropertyTransientFileItem       ::init();