From: mpv Date: Fri, 29 May 2015 15:46:30 +0000 (+0300) Subject: Update the version number before the delivery X-Git-Tag: V_1.2.0~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=47a805357cf60c343b91a04d3176e22b199290ea;p=modules%2Fshaper.git Update the version number before the delivery --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cb7b11d3..203796b6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) PROJECT (NewGEOM) -SET (NewGeom_Version 1.1.0) +SET (NewGeom_Version 1.2.0) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) diff --git a/src/ModelAPI/ModelAPI_Feature.cpp b/src/ModelAPI/ModelAPI_Feature.cpp index 4627bb503..e29fff7d0 100644 --- a/src/ModelAPI/ModelAPI_Feature.cpp +++ b/src/ModelAPI/ModelAPI_Feature.cpp @@ -153,9 +153,8 @@ void ModelAPI_Feature::erase() while (!myResults.empty()) { // remove one by one with messages std::shared_ptr aRes = *(myResults.begin()); + aRes->setDisabled(aRes, true); // to avoid activation of the Part result myResults.erase(myResults.begin()); - aECreator->sendDeleted(aRes->document(), aRes->groupName()); - aECreator->sendUpdated(aRes, EVENT_DISP); } ModelAPI_Object::erase(); } diff --git a/src/ModelAPI/Test/TestDocument.py b/src/ModelAPI/Test/TestDocument.py index e0f7da4be..a76ac80be 100644 --- a/src/ModelAPI/Test/TestDocument.py +++ b/src/ModelAPI/Test/TestDocument.py @@ -81,9 +81,9 @@ assert(aSession.moduleDocument().size("Parts") == 1) assert(aSession.activeDocument().id() == aSession.moduleDocument().id()) # Remove another one document aSession.startOperation() -aDoc1 = aSession.document("Part_1") -aSession.setActiveDocument(aDoc1, False) -aDoc1.addFeature("Remove") +aDoc2 = aSession.document("Part_2") +aSession.setActiveDocument(aDoc2, False) +aDoc2.addFeature("Remove") aSession.finishOperation() assert(aSession.moduleDocument().size("Parts") == 0) assert(aSession.activeDocument()) diff --git a/src/NewGeom/resources/LightApp.xml b/src/NewGeom/resources/LightApp.xml index 0ce335100..f259e23ca 100644 --- a/src/NewGeom/resources/LightApp.xml +++ b/src/NewGeom/resources/LightApp.xml @@ -23,7 +23,7 @@ - +
diff --git a/src/NewGeom/resources/SalomeApp.xml b/src/NewGeom/resources/SalomeApp.xml index d5c820939..bc6282f53 100644 --- a/src/NewGeom/resources/SalomeApp.xml +++ b/src/NewGeom/resources/SalomeApp.xml @@ -27,7 +27,7 @@ - +