Add more objects for Assembly

This commit is contained in:
jriegel
2012-01-19 10:08:12 +01:00
committed by Stefan Tröger
parent b496dfded4
commit 0fb347e4b1
13 changed files with 88 additions and 43 deletions

View File

@@ -14,6 +14,8 @@ include_directories(
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${ODE_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
)
set(Assembly_LIBS
@@ -28,6 +30,20 @@ generate_from_xml(ItemAssemblyPy)
generate_from_xml(ItemPartPy)
generate_from_xml(ConstraintGroupPy)
SET(FreeGCS3D_SRCS
gcs3d/GCS.cpp
gcs3d/GCS.h
gcs3d/Util.h
gcs3d/Geo.h
gcs3d/Constraints.cpp
gcs3d/Constraints.h
gcs3d/SubSystem.cpp
gcs3d/SubSystem.h
gcs3d/qp_eq.cpp
gcs3d/qp_eq.h
)
SOURCE_GROUP("FreeGCS3D" FILES ${FreeGCS3D_SRCS})
SET(Features_SRCS
Item.cpp
Item.h
@@ -76,6 +92,7 @@ SET(Assembly_SRCS
${Features_SRCS}
${Python_SRCS}
${Module_SRCS}
${FreeGCS3D_SRCS}
)

View File

@@ -43,6 +43,9 @@ Item::Item()
ADD_PROPERTY(Uid,(0));
ADD_PROPERTY(Name,(0));
ADD_PROPERTY(Description,(0));
ADD_PROPERTY(Color,(1.0,1.0,1.0,1.0)); // set transparent -> not used
ADD_PROPERTY(Visibility,(true));
}
short Item::mustExecute() const

View File

@@ -50,6 +50,17 @@ public:
App::PropertyString Description ;
//@}
/** @name base properties of all Assembly Items */
//@{
/** Base color of the Item
If the transparency value is 1.0
the color or the next hirachy is used
*/
App::PropertyColor Color;
/// Visibility
App::PropertyBool Visibility;
//@}
/** @name methods override feature */
//@{
/// recalculate the feature

View File

@@ -45,10 +45,10 @@ public:
/// recalculate the feature
App::DocumentObjectExecReturn *execute(void);
short mustExecute() const;
/// returns the type name of the view provider
//const char* getViewProviderName(void) const {
// return "ItemPartDesignGui::ViewProviderItemPart";
//}
// returns the type name of the view provider
const char* getViewProviderName(void) const {
return "ItemPartDesignGui::ViewProviderItemPart";
}
//@}
};

View File

@@ -291,6 +291,7 @@ int System::solve(SubSystem *subsys, bool isFine, Algorithm alg)
int System::solve_EX(SubSystem* subsys) {
return 0;
}