Merge branch 'master' of newgeom:newgeom.git

diff --git a/eclipse.sh b/eclipse.sh
index de64257e30eaeaad82db575bb38b04f9720810ba..0dddf7dec27da0033b1bdac91dc7539df5bbdd9e 100755 (executable)
--- a/eclipse.sh
+++ b/eclipse.sh
@@ -13,8 +13,10 @@ CMAKE_ARGS="-D_ECLIPSE_VERSION=4.3"
 CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug"
 CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=ON"
 CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/install"
+CMAKE_ARGS="${CMAKE_ARGS} -DPYTHON_EXECUTABLE=${PYTHONHOME}/bin/python"
 CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}"
 
 cmake -G "Eclipse CDT4 - Unix Makefiles" ${CMAKE_ARGS}
 
-/misc/dn48/newgeom/common/eclipse-4.3.0/eclipse -Dosgi.locking=none &
\ No newline at end of file
+#/misc/dn48/newgeom/common/eclipse-4.3.0/eclipse&
+/misc/dn48/newgeom/common/eclipse-4.4.0/eclipse&
\ No newline at end of file

diff --git a/linux_env.sh b/linux_env.sh
index 6cd1e816b0b77a876634860af689db040e3a6375..b5c8db6368e2ef2fd858b28d22b58fd243adaed5 100644 (file)
--- a/linux_env.sh
+++ b/linux_env.sh
@@ -28,7 +28,7 @@ export LD_LIBRARY_PATH=${QT4_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
 ##
 #------ boost ------
 export BOOST_ROOT_DIR=${PDIR}/boost-1.52.0
-export LD_LIBRARY_PATH=${BOOST_ROOT_DIR}/lib
+export LD_LIBRARY_PATH=${BOOST_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
 ##
 #------ swig ------
 export SWIG_ROOT_DIR=${PDIR}/swig-2.0.8
@@ -100,5 +100,6 @@ export LIB=${LD_LIBRARY_PATH}
 #------ NewGEOM ------
 export INST_DIR=${ROOT_DIR}/install
 export PATH=${INST_DIR}/bin:${INST_DIR}/plugins:${PATH}
-export LD_LIBRARY_PATH=${INST_DIR}/bin:${INST_DIR}/swig:${INST_DIR}/plugins:${PATH}${LD_LIBRARY_PATH}
+export PYTHONPATH=${INST_DIR}/swig:${PYTHONPATH}
+export LD_LIBRARY_PATH=${INST_DIR}/bin:${INST_DIR}/swig:${INST_DIR}/plugins:${LD_LIBRARY_PATH}
 export NEW_GEOM_CONFIG_FILE=${INST_DIR}/plugins

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index 53e34ce9746f399f5771cb8b4fad3c63091981eb..9cd9d082cedb5969b7e95ba9163409ee48591705 100644 (file)
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -17,13 +17,14 @@
 #include <Events_Loop.h>
 #include <Events_Error.h>
 
+
 using namespace std;
 
 Model_Data::Model_Data()
 {
 }
 
-void Model_Data::setLabel(TDF_Label& theLab)
+void Model_Data::setLabel(TDF_Label theLab)
 {
   myLab = theLab;
 }

diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index 34f3ec7a98ba3e17ddac4526326e3700a92dc31d..c63bce4760be2f493f829d01c9fd691331ad2623 100644 (file)
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -90,7 +90,7 @@ public:
   MODEL_EXPORT virtual void sendAttributeUpdated(ModelAPI_Attribute* theAttr);
 
   /// Puts feature to the document data sub-structure
-  MODEL_EXPORT void setLabel(TDF_Label& theLab);
+  MODEL_EXPORT void setLabel(TDF_Label theLab);
 
   /// Sets the object of this data
   MODEL_EXPORT virtual void setObject(ObjectPtr theObject)

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 88a0914ff9c1dc539f233f719f6c43c1db1d7711..c08c851605ba88b20bfdbc1e8fdec69826d70304 100644 (file)
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -20,6 +20,9 @@
 #include <TDataStd_HLabelArray1.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDF_Reference.hxx>
+#include <TDF_Label.hxx>
+
+#include <boost/shared_ptr.hpp>
 
 #include <climits>
 #ifndef WIN32
@@ -463,7 +466,7 @@ FeaturePtr Model_Document::feature(TDF_Label& theLabel)
   return FeaturePtr(); // not found
 }
 
-ObjectPtr Model_Document::object(TDF_Label& theLabel)
+ObjectPtr Model_Document::object(TDF_Label theLabel)
 {
   // iterate all features, may be optimized later by keeping labels-map
   std::vector<ObjectPtr>& aVec = myObjs[ModelAPI_Feature::group()];
@@ -642,7 +645,7 @@ void Model_Document::setUniqueName(FeaturePtr theFeature)
   theFeature->data()->setName(aName);
 }
 
-void Model_Document::initData(ObjectPtr theObj, TDF_Label& theLab, const int theTag) {
+void Model_Document::initData(ObjectPtr theObj, TDF_Label theLab, const int theTag) {
   boost::shared_ptr<ModelAPI_Document> aThis = 
     Model_Application::getApplication()->getDocument(myID);
   boost::shared_ptr<Model_Data> aData(new Model_Data);
@@ -662,7 +665,7 @@ void Model_Document::synchronizeFeatures(const bool theMarkUpdated)
   std::map<std::string, std::vector<ObjectPtr> >::reverse_iterator aGroupIter = myObjs.rbegin();
   for(; aGroupIter != myObjs.rend(); aGroupIter++) {
     std::vector<ObjectPtr>::iterator anObjIter = aGroupIter->second.begin();
-    // and in parallel iterate labels of features
+    // and in parallel iterate labels of features+
     const std::string& aGroupName = aGroupIter->first;
     TDF_ChildIDIterator aLabIter(groupLabel(aGroupName), TDataStd_Comment::GetID());
     while(anObjIter != aGroupIter->second.end() || aLabIter.More()) {

diff --git a/src/Model/Model_Document.h b/src/Model/Model_Document.h
index db353a93babe0e59fa71ae479b6eceb8652b4091..01171bf68bbb565b2471b6e35342028cbe0d6fb7 100644 (file)
--- a/src/Model/Model_Document.h
+++ b/src/Model/Model_Document.h
@@ -74,7 +74,7 @@ public:
 
   //! Returns the existing object: result or feature
   //! \param theLabel base label of the object
-  MODEL_EXPORT virtual ObjectPtr object(TDF_Label& theLabel);
+  MODEL_EXPORT virtual ObjectPtr object(TDF_Label theLabel);
 
   //! Adds a new sub-document by the identifier, or returns existing one if it is already exist
   MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_Document> subDocument(std::string theDocID);
@@ -127,7 +127,7 @@ protected:
   void compactNested();
 
   //! Initializes the data fields of the feature
-  void Model_Document::initData(ObjectPtr theObj, TDF_Label& theLab, const int theTag);
+  void initData(ObjectPtr theObj, TDF_Label theLab, const int theTag);
 
   //! Allows to store the result in the data tree of the document (attaches 'data' of result to tree)
   MODEL_EXPORT virtual void storeResult(boost::shared_ptr<ModelAPI_Data> theFeatureData,

diff --git a/src/ModelAPI/ModelAPI_AttributeRefList.h b/src/ModelAPI/ModelAPI_AttributeRefList.h
index b897c1b4250e173bb3591bdd0ac425b330f07ff5..d6004f7af4fd1bf1d0c3318a22a91050c0c05ec5 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeRefList.h
+++ b/src/ModelAPI/ModelAPI_AttributeRefList.h
@@ -33,7 +33,7 @@ public:
   MODELAPI_EXPORT virtual int size() = 0;
 
   /// Returns the list of features
-  MODELAPI_EXPORT virtual std::list<ObjectPtr > list() = 0;
+  MODELAPI_EXPORT virtual std::list<ObjectPtr> list() = 0;
 
 protected:
   /// Objects are created for features automatically

diff --git a/src/ModelAPI/ModelAPI_ResultBody.h b/src/ModelAPI/ModelAPI_ResultBody.h
index 09ce4d6b0f6225b78242ae107ce7632b47079e5f..debc96d3e4f281d4a1f0c344c6b6b6830d9e257d 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultBody.h
+++ b/src/ModelAPI/ModelAPI_ResultBody.h
@@ -8,6 +8,8 @@
 #include "ModelAPI_Result.h"
 #include <GeomAPI_Shape.h>
 
+#include <string>
+
 /**\class ModelAPI_ResultBody
  * \ingroup DataModel
  * \brief The body (shape) result of a feature.
@@ -20,8 +22,9 @@ class ModelAPI_ResultBody : public ModelAPI_Result
 {
 public:
   /// Returns the group identifier of this result
-  virtual std::string groupName()
-    { return group(); }
+  virtual std::string groupName() {
+    return group();
+  }
 
   /// Returns the group identifier of this result
   static std::string group()

diff --git a/src/ModelAPI/ModelAPI_ResultConstruction.h b/src/ModelAPI/ModelAPI_ResultConstruction.h
index 4207ff5e3c42516d0a16dd60c96b0e9287c14cde..bd9220ae515033e8ef0c0392bb9b0456990eaa2d 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultConstruction.h
+++ b/src/ModelAPI/ModelAPI_ResultConstruction.h
@@ -8,6 +8,8 @@
 #include "ModelAPI_Result.h"
 #include <GeomAPI_Shape.h>
 
+#include <string>
+
 /**\class ModelAPI_ResultConstruction
  * \ingroup DataModel
  * \brief The construction element result of a feature.

diff --git a/src/ModelAPI/ModelAPI_ResultPart.h b/src/ModelAPI/ModelAPI_ResultPart.h
index 82e0cee5d79f28a663ad96fc341c149a7734b1a3..2f6feb5e5bae06a44166cd607656b943661ee65d 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultPart.h
+++ b/src/ModelAPI/ModelAPI_ResultPart.h
@@ -7,6 +7,8 @@
 
 #include "ModelAPI_Result.h"
 
+#include <string>
+
 /**\class ModelAPI_ResultPart
  * \ingroup DataModel
  * \brief The Part document, result of a creation of new part feature.

diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp
index ba757565d4dd40614e5cbe2292f65cf62bc34a2d..e967a1d4918d7c855e4cf8a5353363873561d257 100644 (file)
--- a/src/ModuleBase/ModuleBase_Operation.cpp
+++ b/src/ModuleBase/ModuleBase_Operation.cpp
@@ -15,7 +15,7 @@
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Document.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <Events_Loop.h>
 

diff --git a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp
index 81be8438b667393ef320e5b2030f3931002aa6be..2c5faadd25fdb9053aef8afb7bb9a9ca0d8213b2 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp
@@ -11,7 +11,7 @@
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <QWidget>
 #include <QLayout>

diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index 587e1e04141fd09bb49e167d87b692ca623862c6..f246713cd7d5e6d54482a6f0b27bf3a547a513fc 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@ -11,7 +11,7 @@
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <QWidget>
 #include <QLayout>

diff --git a/src/ModuleBase/ModuleBase_WidgetEditor.cpp b/src/ModuleBase/ModuleBase_WidgetEditor.cpp
index 1e00eb180ea7e65e3ce0d5edad56e11130403f59..16d4c52cbc60bc9dbdf0de0e2ae3a5389695e69f 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetEditor.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetEditor.cpp
@@ -8,7 +8,7 @@
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>

diff --git a/src/ModuleBase/ModuleBase_WidgetFeature.cpp b/src/ModuleBase/ModuleBase_WidgetFeature.cpp
index 5f625caeeafd045744a35b8504bd07e43e385445..2a65062b0828686a48437c0765064244f4b60165 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFeature.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFeature.cpp
@@ -11,7 +11,7 @@
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>

diff --git a/src/ModuleBase/ModuleBase_WidgetFeatureOrAttribute.cpp b/src/ModuleBase/ModuleBase_WidgetFeatureOrAttribute.cpp
index a26a70d0ac81c569af8b5c72af442f1b1fe28e47..87a1a88c2bd226cc68e3e9a820c7736b8ce1ac12 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFeatureOrAttribute.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFeatureOrAttribute.cpp
@@ -11,7 +11,7 @@
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>

diff --git a/src/ModuleBase/ModuleBase_WidgetPoint2D.cpp b/src/ModuleBase/ModuleBase_WidgetPoint2D.cpp
index 51db5770b64f28dc04fb1aa6b88423e1fb7bcf1f..cefa9284771c98de52d5b0ebf2f55af5febd0e02 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetPoint2D.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetPoint2D.cpp
@@ -9,7 +9,7 @@
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index 88aa9c3816570569346f60c04b4290928558197c..5e0cd3e9837fce05a1d1cca2d2c49c42cc2bb396 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -8,7 +8,7 @@
 #include "ModuleBase_Tools.h"
 
 #include <Events_Loop.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Object.h>
@@ -30,6 +30,8 @@
 #include <QEvent>
 #include <QDockWidget>
 
+#include <stdexcept>
+
 
 typedef QMap<QString, TopAbs_ShapeEnum> ShapeTypes;
 static ShapeTypes MyShapeTypes;
@@ -250,4 +252,4 @@ void ModuleBase_WidgetSelector::raisePanel() const
     QDockWidget* aTabWgt = (QDockWidget*) aParent;
     aTabWgt->raise();
   }
-}
\ No newline at end of file
+}

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp b/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
index 4818f6608be77bf57e34471bd414b73c520edb16..fe1faa56db70f3b18e20855641ce48e3963da796 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
@@ -5,8 +5,8 @@
 #include "SketchPlugin_ConstraintDistance.h"
 #include <SketchPlugin_Point.h>
 
-#include <GeomAPI_Lin2D.h>
-#include <GeomAPI_Pnt2D.h>
+#include <GeomAPI_Lin2d.h>
+#include <GeomAPI_Pnt2d.h>
 #include <GeomDataAPI_Point2D.h>
 
 #include <ModelAPI_AttributeDouble.h>

diff --git a/src/SketchSolver/SketchSolver_ConstraintManager.cpp b/src/SketchSolver/SketchSolver_ConstraintManager.cpp
index e21bb346acbb9b52dd4613f480b911885637e4e1..d9e10c85e2a214d98e4fc3ac276aae62a0448476 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintManager.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintManager.cpp
@@ -9,6 +9,7 @@
 #include <ModelAPI_AttributeRefList.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Events.h>
+#include <ModelAPI_Object.h>
 
 #include <SketchPlugin_Constraint.h>
 
@@ -18,6 +19,8 @@
 #include <SketchPlugin_Point.h>
 #include <SketchPlugin_Sketch.h>
 
+#include <list>
+
 
 // Initialization of constraint manager self pointer
 SketchSolver_ConstraintManager* SketchSolver_ConstraintManager::_self = 0;
@@ -353,8 +356,8 @@ boost::shared_ptr<SketchPlugin_Feature> SketchSolver_ConstraintManager::findWork
 
     boost::shared_ptr<ModelAPI_AttributeRefList> aWPFeatures =
       boost::dynamic_pointer_cast<ModelAPI_AttributeRefList>(aWP->data()->attribute(SketchPlugin_Sketch::FEATURES_ID()));
-    std::list< ObjectPtr >& aFeaturesList = aWPFeatures->list();
-    std::list< ObjectPtr >::const_iterator anIter;
+    std::list<ObjectPtr> aFeaturesList = aWPFeatures->list();
+    std::list<ObjectPtr>::const_iterator anIter;
     for (anIter = aFeaturesList.begin(); anIter != aFeaturesList.end(); anIter++)
       if (*anIter == theConstraint)
         return aWP; // workplane is found

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 4380786974b39ccc470174b26c01fd4a8e9236d7..67ba7629dcd28365ffb75f99e84791f2d7db21b2 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -115,7 +115,6 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
                                         ${PROJECT_SOURCE_DIR}/src/PyConsole
                                         ${PROJECT_SOURCE_DIR}/src/ModelAPI
                                         ${PROJECT_SOURCE_DIR}/src/GeomAPI
-                                    ${PROJECT_SOURCE_DIR}/src/Model
                                         ${PROJECT_SOURCE_DIR}/src/ModuleBase
                                         ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
                                         ${CAS_INCLUDE_DIRS})

diff --git a/src/XGUI/XGUI_DocumentDataModel.cpp b/src/XGUI/XGUI_DocumentDataModel.cpp
index a9c3f7a48ca1b56f983cca7c27deb58330146a8e..45788794fd2570b3871679f5008a39dcebe86657 100644 (file)
--- a/src/XGUI/XGUI_DocumentDataModel.cpp
+++ b/src/XGUI/XGUI_DocumentDataModel.cpp
@@ -8,7 +8,7 @@
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_ResultPart.h>
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 #include <ModelAPI_Object.h>
 
 #include <Events_Loop.h>
@@ -19,6 +19,7 @@
 #include <QString>
 #include <QBrush>
 
+#include <set>
 
 #define ACTIVE_COLOR QColor(0,72,140)
 #define PASSIVE_COLOR Qt::black
@@ -49,7 +50,7 @@ void XGUI_DocumentDataModel::processEvent(const Events_Message* theMessage)
 
   // Created object event *******************
   if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
-    const Model_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const Model_ObjectUpdatedMessage*>(theMessage);
+    const ModelAPI_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
     std::set<ObjectPtr> aObjects = aUpdMsg->objects();
 
     std::set<ObjectPtr>::const_iterator aIt;
@@ -93,7 +94,7 @@ void XGUI_DocumentDataModel::processEvent(const Events_Message* theMessage)
     }
   // Deleted object event ***********************
   } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) {
-    const Model_ObjectDeletedMessage* aUpdMsg = dynamic_cast<const Model_ObjectDeletedMessage*>(theMessage);
+    const ModelAPI_ObjectDeletedMessage* aUpdMsg = dynamic_cast<const ModelAPI_ObjectDeletedMessage*>(theMessage);
     DocumentPtr aDoc = aUpdMsg->document();
     std::set<std::string> aGroups = aUpdMsg->groups();
 
@@ -135,7 +136,7 @@ void XGUI_DocumentDataModel::processEvent(const Events_Message* theMessage)
     }
   // Deleted object event ***********************
   } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
-    //const Model_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const Model_ObjectUpdatedMessage*>(theMessage);
+    //const ModelAPI_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
     //ObjectPtr aFeature = aUpdMsg->feature();
     //DocumentPtr aDoc = aFeature->document();
     

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index b047562126338358a2e1aa3da493d386a3549bdc..9b0a8f0867a8183a040da712b69b4a81db6cc7d7 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -23,7 +23,7 @@
 #include "XGUI_ContextMenuMgr.h"
 #include "XGUI_ModuleConnector.h"
 
-#include <Model_Events.h>
+#include <ModelAPI_Events.h>
 #include <ModelAPI_PluginManager.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>
@@ -232,14 +232,14 @@ void XGUI_Workshop::processEvent(const Events_Message* theMessage)
 
   // Process creation of Part
   if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
-    const Model_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const Model_ObjectUpdatedMessage*>(theMessage);
+    const ModelAPI_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
     onFeatureCreatedMsg(aUpdMsg);
     return;
   }
 
   // Redisplay feature
   if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)) {
-    const Model_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const Model_ObjectUpdatedMessage*>(theMessage);
+    const ModelAPI_ObjectUpdatedMessage* aUpdMsg = dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
     onFeatureRedisplayMsg(aUpdMsg);
     return;
   }
@@ -247,15 +247,15 @@ void XGUI_Workshop::processEvent(const Events_Message* theMessage)
   //Update property panel on corresponding message. If there is no current operation (no
   //property panel), or received message has different feature to the current - do nothing.
   if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) {
-    const Model_ObjectUpdatedMessage* anUpdateMsg =
-        dynamic_cast<const Model_ObjectUpdatedMessage*>(theMessage);
+    const ModelAPI_ObjectUpdatedMessage* anUpdateMsg =
+        dynamic_cast<const ModelAPI_ObjectUpdatedMessage*>(theMessage);
     onFeatureUpdatedMsg(anUpdateMsg);
     return;
   }
 
   if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) {
-    const Model_ObjectDeletedMessage* aDelMsg =
-        dynamic_cast<const Model_ObjectDeletedMessage*>(theMessage);
+    const ModelAPI_ObjectDeletedMessage* aDelMsg =
+        dynamic_cast<const ModelAPI_ObjectDeletedMessage*>(theMessage);
     onObjectDeletedMsg(aDelMsg);
     return;
   }
@@ -283,7 +283,7 @@ void XGUI_Workshop::processEvent(const Events_Message* theMessage)
 }
 
 //******************************************************
-void XGUI_Workshop::onFeatureUpdatedMsg(const Model_ObjectUpdatedMessage* theMsg)
+void XGUI_Workshop::onFeatureUpdatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
 {
   std::set<ObjectPtr> aFeatures = theMsg->objects();
   if (myOperationMgr->hasOperation())
@@ -301,7 +301,7 @@ void XGUI_Workshop::onFeatureUpdatedMsg(const Model_ObjectUpdatedMessage* theMsg
 }
 
 //******************************************************
-void XGUI_Workshop::onFeatureRedisplayMsg(const Model_ObjectUpdatedMessage* theMsg)
+void XGUI_Workshop::onFeatureRedisplayMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
 {
   std::set<ObjectPtr> aObjects = theMsg->objects();
   std::set<ObjectPtr>::const_iterator aIt;
@@ -317,7 +317,7 @@ void XGUI_Workshop::onFeatureRedisplayMsg(const Model_ObjectUpdatedMessage* theM
 }
 
 //******************************************************
-void XGUI_Workshop::onFeatureCreatedMsg(const Model_ObjectUpdatedMessage* theMsg)
+void XGUI_Workshop::onFeatureCreatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg)
 {
   std::set<ObjectPtr> aObjects = theMsg->objects();
 
@@ -344,7 +344,7 @@ void XGUI_Workshop::onFeatureCreatedMsg(const Model_ObjectUpdatedMessage* theMsg
 }
 
 //******************************************************
-void XGUI_Workshop::onObjectDeletedMsg(const Model_ObjectDeletedMessage* theMsg)
+void XGUI_Workshop::onObjectDeletedMsg(const ModelAPI_ObjectDeletedMessage* theMsg)
 {
   //std::set<ObjectPtr> aFeatures = theMsg->objects();
 }

diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index 681afb312cd09e406e457296cc012309e05e0ea3..c0d5d64551235f98e38fd66280d39be3ebd8abe0 100644 (file)
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -38,8 +38,8 @@ class Config_PointerMessage;
 class QWidget;
 class QDockWidget;
 
-class Model_ObjectUpdatedMessage;
-class Model_ObjectDeletedMessage;
+class ModelAPI_ObjectUpdatedMessage;
+class ModelAPI_ObjectDeletedMessage;
 class QAction;
 
 /**\class XGUI_Workshop
@@ -154,10 +154,10 @@ protected:
   void connectWithOperation(ModuleBase_Operation* theOperation);
   void saveDocument(QString theName);
 
-  void onFeatureUpdatedMsg(const Model_ObjectUpdatedMessage* theMsg);
-  void onFeatureCreatedMsg(const Model_ObjectUpdatedMessage* theMsg);
-  void onFeatureRedisplayMsg(const Model_ObjectUpdatedMessage* theMsg);
-  void onObjectDeletedMsg(const Model_ObjectDeletedMessage* theMsg);
+  void onFeatureUpdatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg);
+  void onFeatureCreatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg);
+  void onFeatureRedisplayMsg(const ModelAPI_ObjectUpdatedMessage* theMsg);
+  void onObjectDeletedMsg(const ModelAPI_ObjectDeletedMessage* theMsg);
 
   QList<QAction*> getModuleCommands() const;