From a20f4dddffbe590434041373ee125b367ee60e31 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 22 Sep 2012 16:22:26 +0200 Subject: [PATCH] Fix autotools, fix warning --- src/Mod/Part/Gui/TaskCheckGeometry.cpp | 3 ++ src/Mod/PartDesign/App/Makefile.am | 14 +++++- src/Mod/PartDesign/Gui/Makefile.am | 65 ++++++++++++++++++++++---- 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index bf220e3cc..95afd3795 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -521,6 +521,9 @@ QString SetupResultBase::selectionName(ResultEntry *entry, const TopoDS_Shape &s TopExp::MapShapes(parentEntry->shape, TopAbs_VERTEX, shapeMap); stream << "Vertex"; break; + default: + stream << "Unexpected shape type"; + break; } index = shapeMap.FindIndex(shape); diff --git a/src/Mod/PartDesign/App/Makefile.am b/src/Mod/PartDesign/App/Makefile.am index a3b251dec..80f971f49 100644 --- a/src/Mod/PartDesign/App/Makefile.am +++ b/src/Mod/PartDesign/App/Makefile.am @@ -21,18 +21,28 @@ libPartDesign_la_SOURCES=\ FeatureGroove.h \ Body.cpp \ Body.h \ + FeatureLinearPattern.cpp \ + FeatureLinearPattern.h \ + FeatureMirrored.cpp \ + FeatureMirrored.h \ + FeatureMultiTransform.cpp \ + FeatureMultiTransform.h \ + FeaturePolarPattern.cpp \ + FeaturePolarPattern.h \ + FeatureScaled.cpp \ + FeatureScaled.h \ FeatureSketchBased.cpp \ FeatureSketchBased.h \ FeatureRevolution.cpp \ FeatureRevolution.h \ FeatureAdditive.cpp \ FeatureAdditive.h \ - FeaturePatternRectangular.cpp \ - FeaturePatternRectangular.h \ FeatureSubtractive.cpp \ FeatureSubtractive.h \ FeatureHole.cpp \ FeatureHole.h \ + FeatureTransformed.cpp \ + FeatureTransformed.h \ PreCompiled.cpp \ PreCompiled.h diff --git a/src/Mod/PartDesign/Gui/Makefile.am b/src/Mod/PartDesign/Gui/Makefile.am index e3b32574c..4d0ca5034 100644 --- a/src/Mod/PartDesign/Gui/Makefile.am +++ b/src/Mod/PartDesign/Gui/Makefile.am @@ -3,62 +3,103 @@ SUBDIRS=Resources lib_LTLIBRARIES=libPartDesignGui.la PartDesignGui.la BUILT_SOURCES=\ + moc_FeaturePickDialog.cpp \ moc_TaskPadParameters.cpp \ - moc_TaskPatternRectangularParameters.cpp \ moc_TaskPocketParameters.cpp \ moc_TaskChamferParameters.cpp \ moc_TaskFilletParameters.cpp \ moc_TaskGrooveParameters.cpp \ moc_TaskHoleParameters.cpp \ + moc_TaskLinearPatternParameters.cpp \ + moc_TaskMirroredParameters.cpp \ + moc_TaskMultiTransformParameters.cpp \ + moc_TaskPolarPatternParameters.cpp \ moc_TaskRevolutionParameters.cpp \ + moc_TaskScaledParameters.cpp \ + moc_TaskTransformedMessages.cpp \ + moc_TaskTransformedParameters.cpp \ + ui_FeaturePickDialog.h \ ui_TaskGrooveParameters.h \ ui_TaskPadParameters.h \ - ui_TaskPatternRectangularParameters.h \ ui_TaskPocketParameters.h \ ui_TaskChamferParameters.h \ ui_TaskFilletParameters.h \ ui_TaskHoleParameters.h \ - ui_TaskRevolutionParameters.h + ui_TaskLinearPatternParameters.h \ + ui_TaskMirroredParameters.h \ + ui_TaskMultiTransformParameters.h \ + ui_TaskPolarPatternParameters.h \ + ui_TaskRevolutionParameters.h \ + ui_TaskScaledParameters.h \ + ui_TaskTransformedMessages.h libPartDesignGui_la_UI=\ + FeaturePickDialog.ui \ TaskGrooveParameters.ui \ TaskPadParameters.ui \ - TaskPatternRectangularParameters.ui \ TaskPocketParameters.ui \ TaskChamferParameters.ui \ TaskFilletParameters.ui \ TaskHoleParameters.ui \ - TaskRevolutionParameters.ui + TaskLinearPatternParameters.ui \ + TaskMirroredParameters.ui \ + TaskMultiTransformParameters.ui \ + TaskPolarPatternParameters.ui \ + TaskRevolutionParameters.ui \ + TaskScaledParameters.ui \ + TaskTransformedMessages.ui libPartDesignGui_la_SOURCES=\ AppPartDesignGuiPy.cpp \ Command.cpp \ PreCompiled.cpp \ PreCompiled.h \ + FeaturePickDialog.cpp \ + FeaturePickDialog.h \ TaskGrooveParameters.cpp \ TaskGrooveParameters.h \ TaskPadParameters.cpp \ TaskPadParameters.h \ - TaskPatternRectangularParameters.cpp \ - TaskPatternRectangularParameters.h \ TaskPocketParameters.cpp \ TaskPocketParameters.h \ TaskChamferParameters.cpp \ TaskChamferParameters.h \ TaskFilletParameters.cpp \ TaskFilletParameters.h \ + TaskLinearPatternParameters.cpp \ + TaskLinearPatternParameters.h \ + TaskMirroredParameters.cpp \ + TaskMirroredParameters.h \ + TaskMultiTransformParameters.cpp \ + TaskMultiTransformParameters.h \ + TaskPolarPatternParameters.cpp \ + TaskPolarPatternParameters.h \ TaskRevolutionParameters.cpp \ TaskRevolutionParameters.h \ TaskHoleParameters.cpp \ TaskHoleParameters.h \ + TaskScaledParameters.cpp \ + TaskScaledParameters.h \ + TaskTransformedParameters.cpp \ + TaskTransformedParameters.h \ + TaskTransformedMessages.cpp \ + TaskTransformedMessages.h \ ViewProvider.cpp \ ViewProvider.h \ ViewProviderHole.cpp \ ViewProviderHole.h \ + ViewProviderLinearPattern.cpp \ + ViewProviderLinearPattern.h \ + ViewProviderMirrored.cpp \ + ViewProviderMirrored.h \ + ViewProviderMultiTransform.cpp \ + ViewProviderMultiTransform.h \ ViewProviderPad.cpp \ ViewProviderPad.h \ ViewProviderPocket.cpp \ ViewProviderPocket.h \ + ViewProviderPolarPattern.cpp \ + ViewProviderPolarPattern.h \ ViewProviderChamfer.cpp \ ViewProviderChamfer.h \ ViewProviderFillet.cpp \ @@ -67,8 +108,10 @@ libPartDesignGui_la_SOURCES=\ ViewProviderGroove.h \ ViewProviderRevolution.cpp \ ViewProviderRevolution.h \ - ViewProviderPatternRectangular.cpp \ - ViewProviderPatternRectangular.h \ + ViewProviderScaled.cpp \ + ViewProviderScaled.h \ + ViewProviderTransformed.cpp \ + ViewProviderTransformed.h \ Workbench.cpp \ Workbench.h @@ -95,6 +138,10 @@ libPartDesignGui_la_LIBADD = \ -lTKXSBase \ -lTKBRep \ -lTKTopAlgo \ + -lTKG2d \ + -lTKG3d \ + -lTKGeomAlgo \ + -lTKGeomBase \ -lPartDesign #--------------------------------------------------------------------------------------