diff --git a/LibServer/cficontroller/cficontroller.cpp b/LibServer/cficontroller/cficontroller.cpp index b001005..13008ee 100644 --- a/LibServer/cficontroller/cficontroller.cpp +++ b/LibServer/cficontroller/cficontroller.cpp @@ -210,6 +210,18 @@ bool CfiController::parsingCfiXML_DOM(QDomDocument &domDoc, QMap bool CfiController::merge2map(QMap &mapCfiObjects_orig, QMap &mapCfiObjects_new) { + //Проверка на удаление + for(CfiObject cfiObj : mapCfiObjects_orig) + { + int id = cfiObj.getId(); + + if(!mapCfiObjects_new.contains(id)) + {//Удаляем + mapCfiObjects_orig.take(id); + } + } + + //Замена, Добавление for(CfiObject cfiObj : mapCfiObjects_new) { int id = cfiObj.getId();