From fd173031e8ca28d60e04ddb3559e4bc5928fb859 Mon Sep 17 00:00:00 2001 From: azv Date: Thu, 16 Dec 2021 20:08:41 +0300 Subject: [PATCH] bos #26805: regressions in tests Revert several changes after #26446 --- src/ModelHighAPI/CMakeLists.txt | 2 -- src/ModelHighAPI/ModelHighAPI_Services.cpp | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/ModelHighAPI/CMakeLists.txt b/src/ModelHighAPI/CMakeLists.txt index 07adac9db..2d7a4917f 100644 --- a/src/ModelHighAPI/CMakeLists.txt +++ b/src/ModelHighAPI/CMakeLists.txt @@ -58,7 +58,6 @@ SET(PROJECT_LIBRARIES Locale ModelAPI ModelGeomAlgo - ModuleBase ) ADD_DEFINITIONS(-DMODELHIGHAPI_EXPORTS -DWNT) @@ -88,7 +87,6 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/Locale ${PROJECT_SOURCE_DIR}/src/ModelAPI ${PROJECT_SOURCE_DIR}/src/ModelGeomAlgo - ${PROJECT_SOURCE_DIR}/src/ModuleBase ${PROJECT_SOURCE_DIR}/src/PartSetPlugin ${OpenCASCADE_INCLUDE_DIR} ) diff --git a/src/ModelHighAPI/ModelHighAPI_Services.cpp b/src/ModelHighAPI/ModelHighAPI_Services.cpp index 763798c8b..09dea983c 100644 --- a/src/ModelHighAPI/ModelHighAPI_Services.cpp +++ b/src/ModelHighAPI/ModelHighAPI_Services.cpp @@ -26,8 +26,6 @@ #include #include -#include - #include #include @@ -108,9 +106,8 @@ void begin() aNbTransactions = aNbUndo; ++aTransactionID; } - static std::string anOperationPrefix(ModuleBase_Tools::translate("", "Operation").toStdString()); std::ostringstream aTransactionName; - aTransactionName << anOperationPrefix << "_" << aTransactionID; + aTransactionName << "Operation_" << aTransactionID; ModelAPI_Session::get()->startOperation(aTransactionName.str()); } -- 2.30.2