Merge pull request #135 from blobfish/rebaseMaster

PartDesignNext rebased on master

CMakeLists.txt

@@ -62,7 +62,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
     include(cMake/ConfigureChecks.cmake)
     configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
     add_definitions(-DHAVE_CONFIG_H)
-    set(CMAKE_CXX_FLAGS "-Wall -Wno-deprecated -Wno-write-strings ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-Wall -Wno-deprecated -Wno-write-strings -std=c++11 ${CMAKE_CXX_FLAGS}")
     INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
     # get linker errors as soon as possible and not at runtime e.g. for modules
     if(UNIX)

FCMasterMerge.kdev4

@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=FCMasterMerge

src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp

@@ -157,6 +157,9 @@ Driver_Mesh::Status DriverSTL_R_SMDS_Mesh::Perform()
 
 // static methods
 
+#pragma warning(push)
+#pragma warning(disable : 4805)
+
 static Standard_Real readFloat(OSD_File& theFile)
 {
   union {
@@ -176,6 +179,7 @@ static Standard_Real readFloat(OSD_File& theFile)
 
   return u.f;
 }
+#pragma warning(pop)
 
 static SMDS_MeshNode* addNode(const gp_Pnt& P,
                               DriverSTL_DataMapOfPntNodePtr& uniqnodes,

src/App/Application.cpp

@@ -94,7 +94,11 @@
 #include "Annotation.h"
 #include "MeasureDistance.h"
 #include "Placement.h"
-#include "Plane.h"
+#include "GeoFeatureGroup.h"
+#include "OriginGroup.h"
+#include "Part.h"
+#include "OriginFeature.h"
+#include "Origin.h"
 #include "MaterialObject.h"
 #include "Expression.h"
 
@@ -1128,7 +1132,14 @@ void Application::initTypes(void)
     App ::MaterialObject            ::init();
     App ::MaterialObjectPython      ::init();
     App ::Placement                 ::init();
+    App ::OriginFeature             ::init();
     App ::Plane                     ::init();
+    App ::Line                      ::init();
+    App ::GeoFeatureGroup           ::init();
+    App ::GeoFeatureGroupPython     ::init();
+    App ::OriginGroup               ::init();
+    App ::Part                      ::init();
+    App ::Origin                    ::init();
 
     // Expression classes
     App ::Expression                ::init();
@@ -1334,7 +1345,7 @@ void Application::processFiles(const std::list<std::string>& files)
                 Base::Interpreter().runFile(file.filePath().c_str(), true);
             }
             else if (file.hasExtension("py")) {
-                try {
+                try{
                     Base::Interpreter().loadModule(file.fileNamePure().c_str());
                 }
                 catch(const PyException&) {

src/App/CMakeLists.txt

@@ -33,6 +33,11 @@ set(FreeCADApp_LIBS
 generate_from_xml(DocumentPy)
 generate_from_xml(DocumentObjectPy)
 generate_from_xml(DocumentObjectGroupPy)
+generate_from_xml(GeoFeaturePy)
+generate_from_xml(GeoFeatureGroupPy)
+generate_from_xml(OriginGroupPy)
+generate_from_xml(PartPy)
+
 generate_from_xml(ComplexGeoDataPy)
 generate_from_xml(PropertyContainerPy)
 generate_from_xml(MaterialPy)
@@ -43,6 +48,10 @@ generate_from_py(FreeCADTest TestScript.h)
 SET(FreeCADApp_XML_SRCS
     DocumentObjectGroupPy.xml
     DocumentObjectPy.xml
+    GeoFeaturePy.xml
+    GeoFeatureGroupPy.xml
+    OriginGroupPy.xml
+    PartPy.xml
     DocumentPy.xml
     PropertyContainerPy.xml
     ComplexGeoDataPy.xml
@@ -58,6 +67,7 @@ SET(Document_CPP_SRCS
     DocumentObjectFileIncluded.cpp
     DocumentObjectGroup.cpp
     DocumentObjectGroupPyImp.cpp
+    GeoFeaturePyImp.cpp
     DocumentObjectPyImp.cpp
     DocumentObserver.cpp
     DocumentObserverPython.cpp
@@ -66,10 +76,18 @@ SET(Document_CPP_SRCS
     FeaturePython.cpp
     FeatureTest.cpp
     GeoFeature.cpp
+    GeoFeatureGroupPyImp.cpp
+    GeoFeatureGroup.cpp
+    OriginGroupPyImp.cpp
+    OriginGroup.cpp
+    PartPyImp.cpp
+    Part.cpp
+    Origin.cpp
+    Path.cpp
     InventorObject.cpp
     MeasureDistance.cpp
     Placement.cpp
-    Plane.cpp
+    OriginFeature.cpp
     Range.cpp
     Transactions.cpp
     VRMLObject.cpp
@@ -93,10 +111,15 @@ SET(Document_HPP_SRCS
     FeaturePythonPyImp.inl
     FeatureTest.h
     GeoFeature.h
+    GeoFeatureGroup.h
+    OriginGroup.h
+    Part.h
+    Origin.h
+    Path.h
     InventorObject.h
     MeasureDistance.h
     Placement.h
-    Plane.h
+    OriginFeature.h
     Range.h
     Transactions.h
     VRMLObject.h