Skip to content

Commit

Permalink
remove hole feature
Browse files Browse the repository at this point in the history
A hole feature is something needed, however, the current implementation does not use the attacher code which would made it intuitive and compatibel to other workbench tools. A reimplementation is needed.
  • Loading branch information
ickby authored and Fat-Zer committed Jul 18, 2015
1 parent 5cc4c12 commit 5f127b6
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/Mod/PartDesign/App/AppPartDesign.cpp
Expand Up @@ -47,7 +47,7 @@
#include "FeaturePolarPattern.h"
#include "FeatureScaled.h"
#include "FeatureMultiTransform.h"
#include "FeatureHole.h"
//#include "FeatureHole.h"
#include "DatumPlane.h"
#include "DatumLine.h"
#include "DatumPoint.h"
Expand Down Expand Up @@ -96,7 +96,7 @@ void PartDesignExport init_PartDesign()
PartDesign::PolarPattern ::init();
PartDesign::Scaled ::init();
PartDesign::MultiTransform ::init();
PartDesign::Hole ::init();
//PartDesign::Hole ::init();
PartDesign::Body ::init();
PartDesign::Pad ::init();
PartDesign::Pocket ::init();
Expand Down
20 changes: 10 additions & 10 deletions src/Mod/PartDesign/CMakeLists.txt
Expand Up @@ -89,17 +89,17 @@ SET(FeatureHole_UI

SET(all_featurehole_files ${FeatureHole_SRCS} ${FeatureHole_UI})

ADD_CUSTOM_TARGET(FeatureHole ALL
SOURCES ${all_featurehole_files}
)
#ADD_CUSTOM_TARGET(FeatureHole ALL
# SOURCES ${all_featurehole_files}
#)

SET(all_files ${all_featurehole_files})
#SET(all_files ${all_featurehole_files})

fc_copy_sources(Mod/PartDesign "${CMAKE_BINARY_DIR}/Mod/PartDesign" ${all_files})

INSTALL(
FILES
${FeatureHole_SRCS}
DESTINATION
Mod/PartDesign/FeatureHole
)
#INSTALL(
# FILES
# ${FeatureHole_SRCS}
# DESTINATION
# Mod/PartDesign/FeatureHole
#)
14 changes: 7 additions & 7 deletions src/Mod/PartDesign/Gui/CMakeLists.txt
Expand Up @@ -37,7 +37,7 @@ set(PartDesignGui_MOC_HDRS
TaskDraftParameters.h
TaskThicknessParameters.h
TaskDressUpParameters.h
TaskHoleParameters.h
#TaskHoleParameters.h
TaskRevolutionParameters.h
TaskGrooveParameters.h
TaskTransformedMessages.h
Expand Down Expand Up @@ -67,7 +67,7 @@ set(PartDesignGui_UIC_SRCS
TaskDraftParameters.ui
TaskThicknessParameters.ui
TaskBooleanParameters.ui
TaskHoleParameters.ui
#TaskHoleParameters.ui
TaskRevolutionParameters.ui
TaskGrooveParameters.ui
TaskTransformedMessages.ui
Expand All @@ -92,8 +92,8 @@ SET(PartDesignGuiViewProvider_SRCS CommandPrimitive.cpp
ViewProviderBody.h
ViewProviderPad.cpp
ViewProviderPad.h
ViewProviderHole.cpp
ViewProviderHole.h
#ViewProviderHole.cpp
#ViewProviderHole.h
ViewProviderPocket.cpp
ViewProviderPocket.h
ViewProviderChamfer.cpp
Expand Down Expand Up @@ -199,9 +199,9 @@ SET(PartDesignGuiTaskDlgs_SRCS
TaskMultiTransformParameters.ui
TaskMultiTransformParameters.cpp
TaskMultiTransformParameters.h
TaskHoleParameters.ui
TaskHoleParameters.cpp
TaskHoleParameters.h
#TaskHoleParameters.ui
#TaskHoleParameters.cpp
#TaskHoleParameters.h
TaskDatumParameters.ui
TaskDatumParameters.cpp
TaskDatumParameters.h
Expand Down
3 changes: 2 additions & 1 deletion src/Mod/PartDesign/Gui/Workbench.cpp
Expand Up @@ -779,7 +779,8 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Separator"
<< "PartDesign_Boolean"
<< "Separator"
<< "PartDesign_Hole";
//<< "PartDesign_Hole"
<< "PartDesign_InvoluteGear";

// 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
Expand Down
8 changes: 4 additions & 4 deletions src/Mod/PartDesign/InitGui.py
Expand Up @@ -80,10 +80,10 @@ def Initialize(self):
import InvoluteGearFeature
except ImportError:
print "Involute gear module cannot be loaded"
try:
from FeatureHole import HoleGui
except:
pass
#try:
# from FeatureHole import HoleGui
#except:
# pass

def GetClassName(self):
return "PartDesignGui::Workbench"
Expand Down

0 comments on commit 5f127b6

Please sign in to comment.