From b4d796d8be8691b3e0d1fe2be823c285510b634a Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 29 Jan 2026 16:38:55 +0300 Subject: [PATCH] =?UTF-8?q?cfiController=20=D0=9F=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LibServer/cficontroller/cficontroller.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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();