suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more objects for Assembly

Browse Source
This commit is contained in:
jriegel 2012-01-19 10:08:12 +01:00 committed by Stefan Tröger
parent 1bb3fbc119
commit f98a811bd1
13 changed files with 88 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Assembly/App/CMakeLists.txt
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}
)

3
src/Mod/Assembly/App/Item.cpp
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

11
src/Mod/Assembly/App/Item.h
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

8
src/Mod/Assembly/App/ItemPart.h
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";
}
//@}
};

1
src/Mod/Assembly/App/gcs3d/GCS.cpp
View File

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

9
src/Mod/Assembly/Gui/AppAssemblyGui.cpp
View File

@ -30,6 +30,11 @@
#include <Gui/Application.h>
#include <Gui/Language/Translator.h>
#include "Workbench.h"
#include "ViewProvider.h"
#include "ViewProviderPart.h"
#include "ViewProviderAssembly.h"
//#include "resources/qrc_Assembly.cpp"
// use a different name to CreateCommand()
@ -62,6 +67,10 @@ void AssemblyGuiExport initAssemblyGui()
CreateAssemblyCommands();
AssemblyGui::Workbench::init();
AssemblyGui::ViewProviderItem ::init();
AssemblyGui::ViewProviderItemPart ::init();
AssemblyGui::ViewProviderItemAssembly::init();
// add resources and reloads the translators
loadAssemblyResource();
}

4
src/Mod/Assembly/Gui/CMakeLists.txt
View File

@ -31,6 +31,10 @@ qt4_add_resources(AssemblyGui_SRCS Resources/Assembly.qrc)
SET(AssemblyGuiViewProvider_SRCS
ViewProvider.cpp
ViewProvider.h
ViewProviderPart.cpp
ViewProviderPart.h
ViewProviderAssembly.cpp
ViewProviderAssembly.h
)
SOURCE_GROUP("ViewProvider" FILES ${AssemblyGuiViewProvider_SRCS})

8
src/Mod/Assembly/Gui/ViewProvider.cpp
View File

@ -32,17 +32,17 @@
using namespace AssemblyGui;
PROPERTY_SOURCE(AssemblyGui::ViewProvider,PartGui::ViewProviderPart)
PROPERTY_SOURCE(AssemblyGui::ViewProviderItem,PartGui::ViewProviderPart)
ViewProvider::ViewProvider()
ViewProviderItem::ViewProviderItem()
{
}
ViewProvider::~ViewProvider()
ViewProviderItem::~ViewProviderItem()
{
}
bool ViewProvider::doubleClicked(void)
bool ViewProviderItem::doubleClicked(void)
{
return true;
}

14
src/Mod/Assembly/Gui/ViewProvider.h
View File

@ -21,23 +21,23 @@
***************************************************************************/
#ifndef PARTGUI_ViewProvider_H
#define PARTGUI_ViewProvider_H
#ifndef ASSEMBLYGUI_ViewProvider_H
#define ASSEMBLYGUI_ViewProvider_H
#include <Mod/Part/Gui/ViewProvider.h>
namespace AssemblyGui {
class AssemblyGuiExport ViewProvider : public PartGui::ViewProviderPart
class AssemblyGuiExport ViewProviderItem : public PartGui::ViewProviderPart
{
PROPERTY_HEADER(PartGui::ViewProvider);
PROPERTY_HEADER(AssemblyGui::ViewProviderItem);
public:
/// constructor
ViewProvider();
ViewProviderItem();
/// destructor
virtual ~ViewProvider();
virtual ~ViewProviderItem();
virtual bool doubleClicked(void);
@ -48,4 +48,4 @@ public:
} // namespace AssemblyGui
#endif // PARTGUI_ViewProviderHole_H
#endif // ASSEMBLYGUI_ViewProvider_H

12
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
View File

@ -26,23 +26,23 @@
#ifndef _PreComp_
#endif
#include "ViewProvider.h"
#include <Gui/Command.h>
#include "ViewProviderAssembly.h"
//#include <Gui/Command.h>
//#include <Gui/Document.h>
using namespace AssemblyGui;
PROPERTY_SOURCE(AssemblyGui::ViewProviderItem,PartGui::ViewProviderPart)
PROPERTY_SOURCE(AssemblyGui::ViewProviderItemAssembly,AssemblyGui::ViewProviderItem)
ViewProviderItem::ViewProvider()
ViewProviderItemAssembly::ViewProviderItemAssembly()
{
}
ViewProviderItem::~ViewProvider()
ViewProviderItemAssembly::~ViewProviderItemAssembly()
{
}
bool ViewProviderItem::doubleClicked(void)
bool ViewProviderItemAssembly::doubleClicked(void)
{
return true;
}

16
src/Mod/Assembly/Gui/ViewProviderAssembly.h
View File

@ -21,23 +21,23 @@
***************************************************************************/
#ifndef PARTGUI_ViewProvider_H
#define PARTGUI_ViewProvider_H
#ifndef ASSEMBLYGUI_ViewProviderAssembly_H
#define ASSEMBLYGUI_ViewProviderAssembly_H
#include <Mod/Part/Gui/ViewProvider.h>
#include "ViewProvider.h"
namespace AssemblyGui {
class AssemblyGuiExport ViewProviderItem : public PartGui::ViewProviderPart
class AssemblyGuiExport ViewProviderItemAssembly : public AssemblyGui::ViewProviderItem
{
PROPERTY_HEADER(PartGui::ViewProviderItem);
PROPERTY_HEADER(PartGui::ViewProviderItemAssembly);
public:
/// constructor
ViewProviderItem();
ViewProviderItemAssembly();
/// destructor
virtual ~ViewProviderItem();
virtual ~ViewProviderItemAssembly();
virtual bool doubleClicked(void);
@ -48,4 +48,4 @@ public:
} // namespace AssemblyGui
#endif // PARTGUI_ViewProviderHole_H
#endif // ASSEMBLYGUI_ViewProviderAssembly_H

12
src/Mod/Assembly/Gui/ViewProviderPart.cpp
View File

@ -26,23 +26,23 @@
#ifndef _PreComp_
#endif
#include "ViewProvider.h"
#include <Gui/Command.h>
#include "ViewProviderPart.h"
//#include <Gui/Command.h>
//#include <Gui/Document.h>
using namespace AssemblyGui;
PROPERTY_SOURCE(AssemblyGui::ViewProviderItem,PartGui::ViewProviderPart)
PROPERTY_SOURCE(AssemblyGui::ViewProviderItemPart,AssemblyGui::ViewProviderItem)
ViewProviderItem::ViewProvider()
ViewProviderItemPart::ViewProviderItemPart()
{
}
ViewProviderItem::~ViewProvider()
ViewProviderItemPart::~ViewProviderItemPart()
{
}
bool ViewProviderItem::doubleClicked(void)
bool ViewProviderItemPart::doubleClicked(void)
{
return true;
}

16
src/Mod/Assembly/Gui/ViewProviderPart.h
View File

@ -21,23 +21,23 @@
***************************************************************************/
#ifndef PARTGUI_ViewProvider_H
#define PARTGUI_ViewProvider_H
#ifndef ASSEMBLYGUI_ViewProviderPart_H
#define ASSEMBLYGUI_ViewProviderPart_H
#include <Mod/Part/Gui/ViewProvider.h>
#include "ViewProvider.h"
namespace AssemblyGui {
class AssemblyGuiExport ViewProviderItem : public PartGui::ViewProviderPart
class AssemblyGuiExport ViewProviderItemPart : public AssemblyGui::ViewProviderItem
{
PROPERTY_HEADER(PartGui::ViewProviderItem);
PROPERTY_HEADER(PartGui::ViewProviderItemPart);
public:
/// constructor
ViewProviderItem();
ViewProviderItemPart();
/// destructor
virtual ~ViewProviderItem();
virtual ~ViewProviderItemPart();
virtual bool doubleClicked(void);
@ -48,4 +48,4 @@ public:
} // namespace AssemblyGui
#endif // PARTGUI_ViewProviderHole_H
#endif // ASSEMBLYGUI_ViewProviderPart_H