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

Fix Cam and Assembly module

Browse Source
This commit is contained in:
wmayer 2012-04-07 17:00:12 +02:00
parent ef7c1d4b50
commit 4da08fc48d
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Assembly/Gui/Makefile.am
View File

@ -2,14 +2,11 @@ SUBDIRS=Resources
lib_LTLIBRARIES=libAssemblyGui.la AssemblyGui.la lib_LTLIBRARIES=libAssemblyGui.la AssemblyGui.la
BUILT_SOURCES=\ #BUILT_SOURCES
moc_AssemblyView.cpp
libAssemblyGui_la_SOURCES=\ libAssemblyGui_la_SOURCES=\
AppAssemblyGuiPy.cpp \ AppAssemblyGuiPy.cpp \
Command.cpp \ Command.cpp \
AssemblyView.cpp \
AssemblyView.h \
PreCompiled.cpp \ PreCompiled.cpp \
PreCompiled.h \ PreCompiled.h \
Workbench.cpp \ Workbench.cpp \

6
src/Mod/Cam/App/CMakeLists.txt
View File

@ -88,7 +88,11 @@ SET(Cam_SRCS
add_library(Cam SHARED ${Cam_SRCS}) add_library(Cam SHARED ${Cam_SRCS})
target_link_libraries(Cam ${Cam_LIBS}) target_link_libraries(Cam ${Cam_LIBS})
fc_copy_script("Mod/Cam" "Cam" Init.py)
fc_target_copy_resource(Cam
${CMAKE_SOURCE_DIR}/src/Mod/Cam
${CMAKE_BINARY_DIR}/Mod/Cam
Init.py)
if(MSVC) if(MSVC)
set_target_properties(Cam PROPERTIES SUFFIX ".pyd") set_target_properties(Cam PROPERTIES SUFFIX ".pyd")

6
src/Mod/Cam/Gui/CMakeLists.txt
View File

@ -65,7 +65,11 @@ SET(CamGui_SRCS
add_library(CamGui SHARED ${CamGui_SRCS}) add_library(CamGui SHARED ${CamGui_SRCS})
target_link_libraries(CamGui ${CamGui_LIBS}) target_link_libraries(CamGui ${CamGui_LIBS})
fc_copy_script("Mod/Cam" "CamGui" InitGui.py)
fc_target_copy_resource(CamGui
${CMAKE_SOURCE_DIR}/src/Mod/Cam
${CMAKE_BINARY_DIR}/Mod/Cam
InitGui.py)
if(MSVC) if(MSVC)
set_target_properties(CamGui PROPERTIES SUFFIX ".pyd") set_target_properties(CamGui PROPERTIES SUFFIX ".pyd")

4
src/Mod/Cam/Gui/Cutting.cpp
View File

@ -899,7 +899,9 @@ void Cutting::zLevelCallback(void * ud, SoEventCallback * n)
if (!vp || !vp->getTypeId().isDerivedFrom(PartGui::ViewProviderPart::getClassTypeId())) if (!vp || !vp->getTypeId().isDerivedFrom(PartGui::ViewProviderPart::getClassTypeId()))
return; return;
PartGui::ViewProviderPart* vpp = static_cast<PartGui::ViewProviderPart*>(vp); PartGui::ViewProviderPart* vpp = static_cast<PartGui::ViewProviderPart*>(vp);
TopoDS_Shape sh = vpp->getShape(point); std::string element = vpp->getElement(point->getDetail());
TopoDS_Shape sh = static_cast<Part::Feature*>(vpp->getObject())->
Shape.getShape().getSubShape(element.c_str());
if (!sh.IsNull()) if (!sh.IsNull())
{ {
// ok a shape was picked // ok a shape was picked