Fixes for OCC 6.3
This commit is contained in:
parent
40e3fa7a21
commit
1b957e98bc
|
@ -47,6 +47,7 @@
|
|||
# include <BRepBuilderAPI_MakeEdge.hxx>
|
||||
#endif
|
||||
|
||||
#include <Base/Tools.h>
|
||||
#include <Mod/Part/App/TopoShape.h>
|
||||
|
||||
#include "FeatureDraft.h"
|
||||
|
|
|
@ -57,6 +57,7 @@
|
|||
# include <Extrema_POnCurv.hxx>
|
||||
# include <BRepAdaptor_CompCurve.hxx>
|
||||
# include <BRepAdaptor_Curve.hxx>
|
||||
# include <Standard_Version.hxx>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -562,7 +563,11 @@ const bool SketchBased::checkLineCrossesFace(const gp_Lin &line, const TopoDS_Fa
|
|||
for (int i = 1; i <= intersector.NbExt(); i++) {
|
||||
|
||||
|
||||
#if OCC_VERSION_HEX >= 0x060500
|
||||
if (intersector.SquareDistance(i) < Precision::Confusion()) {
|
||||
#else
|
||||
if (intersector.Value(i) < Precision::Confusion()) {
|
||||
#endif
|
||||
if (intersector.IsParallel()) {
|
||||
// A line that is coincident with the axis produces three intersections
|
||||
// 1 with the line itself and 2 with the adjacent edges
|
||||
|
|
|
@ -44,27 +44,10 @@ SOURCE_GROUP("wizardshaft" FILES ${WizardShaft_SRCS})
|
|||
SET(all_wizardshaft_files ${WizardShaft_SRCS})
|
||||
|
||||
ADD_CUSTOM_TARGET(WizardShaft ALL
|
||||
SOURCES ${all_wizardshaft_files}
|
||||
SOURCES ${all_wizardshaft_files}
|
||||
)
|
||||
|
||||
SET(FeatureBore_SRCS
|
||||
FeatureBore/__init__.py
|
||||
FeatureBore/FeatureBore.py
|
||||
FeatureBore/TaskBore.py
|
||||
)
|
||||
SOURCE_GROUP("featurebore" FILES ${FeatureBore_SRCS})
|
||||
|
||||
SET(FeatureBore_UI
|
||||
FeatureBore/TaskBore.ui
|
||||
)
|
||||
|
||||
SET(all_featurebore_files ${FeatureBore_SRCS} ${FeatureBore_UI})
|
||||
|
||||
ADD_CUSTOM_TARGET(FeatureBore ALL
|
||||
SOURCES ${all_featurebore_files}
|
||||
)
|
||||
|
||||
SET(all_files ${all_featurebore_files} ${all_wizardshaft_files})
|
||||
SET(all_files ${all_wizardshaft_files})
|
||||
|
||||
fc_copy_sources(Mod/PartDesign "${CMAKE_BINARY_DIR}/Mod/PartDesign" ${all_files})
|
||||
|
||||
|
@ -73,8 +56,4 @@ INSTALL(
|
|||
${WizardShaft_SRCS}
|
||||
DESTINATION
|
||||
Mod/PartDesign/WizardShaft
|
||||
FILES
|
||||
${FeatureBore_SRCS}
|
||||
DESTINATION
|
||||
Mod/PartDesign/FeatureBore
|
||||
)
|
||||
|
|
|
@ -87,7 +87,6 @@ void Workbench::activated()
|
|||
"PartDesign_Fillet",
|
||||
"PartDesign_Chamfer",
|
||||
"PartDesign_Draft",
|
||||
"PartDesign_Bore",
|
||||
0};
|
||||
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
|
||||
"SELECT Part::Feature SUBELEMENT Face COUNT 1",
|
||||
|
@ -220,9 +219,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
|
|||
<< "PartDesign_LinearPattern"
|
||||
<< "PartDesign_PolarPattern"
|
||||
// << "PartDesign_Scaled"
|
||||
<< "PartDesign_MultiTransform"
|
||||
<< "Separator"
|
||||
<< "PartDesign_Bore"
|
||||
<< "PartDesign_MultiTransform";
|
||||
// For 0.13 a couple of python packages like numpy, matplotlib and others
|
||||
// are not deployed with the installer on Windows. Thus, the WizardShaft is
|
||||
// not deployed either hence the check for the existence of the command.
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
|
||||
class PartDesignWorkbench ( Workbench ):
|
||||
"PartDesign workbench object"
|
||||
from FeatureBore import TaskBore
|
||||
Icon = """
|
||||
/* XPM */
|
||||
static char * partdesign_xpm[] = {
|
||||
|
|
Loading…
Reference in New Issue
Block a user