Add inserted state to elements and filter on save

Introduced an 'inserted' state to elements, with getter and setter methods in Element.h. Updated element creation and loading logic to set this state appropriately. Modified FileHanding::SaveProject to only save elements that are properly inserted, preventing incomplete or placeholder elements from being serialized. Removed redundant m_inserted members from derived classes and updated project toolset version.

Author: Thales1330

Project/PSP-UFU.vcxproj

@@ -28,7 +28,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -41,13 +41,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

Project/editors/Workspace.cpp

@@ -205,6 +205,7 @@ void Workspace::OnLeftClickDown(wxMouseEvent& event)
 						m_timer->Stop();
 						showNewElementForm = true;
 						m_mode = WorkspaceMode::MODE_EDIT;
+						element->SetInserted();
 					}
 				}
 			}

Project/elements/Element.h

@@ -592,6 +592,18 @@ class Element
 	 */
 	virtual double PointToLineDistance(wxPoint2DDouble point, int* segmentNumber = nullptr) const;
 
+	/**
+	 * @brief Check if the element is properly inserted in the workspace.
+	 * @return true if is inserted properly, false otherwise
+	 */
+	bool IsInserted() const { return m_inserted; }
+
+	/**
+	 * @brief Set if the element is properly inserted in the workspace.
+	 * @param inserted true if is inserted properly, false otherwise
+	 */
+	void SetInserted(bool inserted = true) { m_inserted = inserted; }
+
 	virtual rapidxml::xml_node<>* SaveElement(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* elementListNode) { return nullptr; }
 	virtual bool OpenElement(rapidxml::xml_node<>* elementNode) { return true; }
 	void SaveCADProperties(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* elementNode);
@@ -617,6 +629,7 @@ class Element
 	bool m_selected = false;
 	bool m_dragging = false;
 	bool m_showPickbox = false;
+	bool m_inserted = false;
 
 	int m_activePickboxID = ID_PB_NONE;
 	int m_activeNodeID = 0;

Project/elements/Text.cpp

@@ -1050,5 +1050,6 @@ bool Text::OpenElement(rapidxml::xml_node<>* elementNode)
 	SetDirection(XMLParser::GetNodeValueDouble(textProperties, "Direction"));
 	SetDecimalPlaces(XMLParser::GetNodeValueDouble(textProperties, "DecimalPlaces"));
 	SetElementNumber(XMLParser::GetNodeValueInt(textProperties, "ElementNumber"));
+	SetInserted();
 	return true;
 }

Project/elements/powerElement/Branch.h

@@ -53,8 +53,8 @@ class Branch : public PowerElement
     virtual void UpdateSwitchesPosition();
     virtual void UpdateSwitches();
 
-   protected:
-    bool m_inserted = false;
+   //protected:
+    //bool m_inserted = false;
 };
 
 #endif  // BRANCH_H

Project/elements/powerElement/Bus.cpp

@@ -449,5 +449,6 @@ bool Bus::OpenElement(rapidxml::xml_node<>* elementNode)
 	if (powerQuality) m_electricalData.plotPQData = XMLParser::GetNodeValueInt(powerQuality, "Plot");
 
 	if (m_electricalData.stabHasFault) SetDynamicEvent(true);
+	SetInserted();
 	return true;
 }

Project/elements/powerElement/Line.cpp

@@ -257,7 +257,7 @@ bool Line::AddParent(Element* parent, wxPoint2DDouble position)
 			m_switchRect.push_back(genRect);
 			UpdateSwitches();
 
-			m_inserted = true;
+			SetInserted();
 			UpdatePowerFlowArrowsPosition();
 			return true;
 		}

Project/elements/powerElement/Machines.h

@@ -59,7 +59,7 @@ class Machines : public PowerElement
    protected:
     void UpdateSwitchesPosition();
     void UpdatePowerFlowArrowsPosition();
-    bool m_inserted = false;
+    //bool m_inserted = false;
 };
 
 #endif  // MACHINES_H

Project/elements/powerElement/Shunt.h

@@ -50,7 +50,7 @@ class Shunt : public PowerElement
     void UpdatePowerFlowArrowsPosition();
     //void DrawGround(wxPoint2DDouble position) const;
     void DrawDCGround(wxPoint2DDouble position, wxGraphicsContext* gc) const;
-    bool m_inserted = false;
+    //bool m_inserted = false;
 };
 
 #endif  // SHUNT_H

Project/utils/FileHanding.cpp

@@ -128,143 +128,167 @@ void FileHanding::SaveProject(wxFileName path)
     //{ Buses
     auto busesNode = XMLParser::AppendNode(doc, elementsNode, "BusList");
     auto busList = allElements.GetBusList();
-    for(auto it = busList.begin(), itEnd = busList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, busesNode);
-        elementID++;
+    for(auto* bus :  busList) {
+        if (bus->IsInserted()) {
+            bus->SetID(elementID);
+            bus->SaveElement(doc, busesNode);
+            elementID++;
+        }
     }
     //}
 
     //{ Capacitor
     auto capacitorsNode = XMLParser::AppendNode(doc, elementsNode, "CapacitorList");
     auto capacitorList = allElements.GetCapacitorList();
     elementID = 0;
-    for(auto it = capacitorList.begin(), itEnd = capacitorList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, capacitorsNode);
-        elementID++;
+    for(auto* capacitor : capacitorList) {
+        if (capacitor->IsInserted()) {
+            capacitor->SetID(elementID);
+            capacitor->SaveElement(doc, capacitorsNode);
+            elementID++;
+        }
     }
     //}
 
     //{ IndMotor
     auto indMotorsNode = XMLParser::AppendNode(doc, elementsNode, "IndMotorList");
     auto indMotorList = allElements.GetIndMotorList();
     elementID = 0;
-    for(auto it = indMotorList.begin(), itEnd = indMotorList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, indMotorsNode);
-        elementID++;
+    for(auto* indMotor : indMotorList) {
+        if (indMotor->IsInserted()) {
+            indMotor->SetID(elementID);
+            indMotor->SaveElement(doc, indMotorsNode);
+            elementID++;
+        }
     }
     //}
 
     //{ Inductor
     auto inductorsNode = XMLParser::AppendNode(doc, elementsNode, "InductorList");
     auto inductorList = allElements.GetInductorList();
     elementID = 0;
-    for(auto it = inductorList.begin(), itEnd = inductorList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, inductorsNode);
-        elementID++;
+    for(auto* inductor : inductorList) {
+        if (inductor->IsInserted()) {
+            inductor->SetID(elementID);
+            inductor->SaveElement(doc, inductorsNode);
+            elementID++;
+        }
     }
     //}
 
     //{ Line
     auto linesNode = XMLParser::AppendNode(doc, elementsNode, "LineList");
     auto lineList = allElements.GetLineList();
     elementID = 0;
-    for(auto it = lineList.begin(), itEnd = lineList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, linesNode);
-        elementID++;
+    for(auto* line : lineList) {
+        if (line->IsInserted()) {
+            line->SetID(elementID);
+            line->SaveElement(doc, linesNode);
+            elementID++;
+        }
     }
     //}
 
     //{ Load
     auto loadsNode = XMLParser::AppendNode(doc, elementsNode, "LoadList");
     auto loadList = allElements.GetLoadList();
     elementID = 0;
-    for(auto it = loadList.begin(), itEnd = loadList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, loadsNode);
-        elementID++;
+    for(auto* load : loadList) {
+        if(load->IsInserted()) {
+            load->SetID(elementID);
+            load->SaveElement(doc, loadsNode);
+            elementID++;
+		}
     }
     //}
 
     //{ SyncGenerator
     auto syncGeneratorsNode = XMLParser::AppendNode(doc, elementsNode, "SyncGeneratorList");
     auto syncGeneratorList = allElements.GetSyncGeneratorList();
     elementID = 0;
-    for(auto it = syncGeneratorList.begin(), itEnd = syncGeneratorList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        auto elementNode = (*it)->SaveElement(doc, syncGeneratorsNode);
+    for(auto syncGen : syncGeneratorList) {
+        if (syncGen->IsInserted()) {
+            syncGen->SetID(elementID);
+            auto elementNode = syncGen->SaveElement(doc, syncGeneratorsNode);
 
-        // Save controls
-        auto data = (*it)->GetElectricalData();
-        auto electricalProp = elementNode->first_node("ElectricalProperties");
-        auto stability = electricalProp->first_node("Stability");
+            // Save controls
+            auto data = syncGen->GetElectricalData();
+            auto electricalProp = elementNode->first_node("ElectricalProperties");
+            auto stability = electricalProp->first_node("Stability");
 
-        auto avr = XMLParser::AppendNode(doc, stability, "AVR");
-        if(data.avr) SaveControlElements(doc, avr, data.avr);
+            auto avr = XMLParser::AppendNode(doc, stability, "AVR");
+            if (data.avr) SaveControlElements(doc, avr, data.avr);
 
-        auto speedGov = XMLParser::AppendNode(doc, stability, "SpeedGovernor");
-        if(data.speedGov) SaveControlElements(doc, speedGov, data.speedGov);
+            auto speedGov = XMLParser::AppendNode(doc, stability, "SpeedGovernor");
+            if (data.speedGov) SaveControlElements(doc, speedGov, data.speedGov);
 
-        elementID++;
+            elementID++;
+        }
     }
     //}
 
     //{ SyncMotor
     auto syncMotorsNode = XMLParser::AppendNode(doc, elementsNode, "SyncMotorList");
     auto syncMotorList = allElements.GetSyncMotorList();
     elementID = 0;
-    for(auto it = syncMotorList.begin(), itEnd = syncMotorList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, syncMotorsNode);
-        elementID++;
+    for(auto* syncMotor : syncMotorList) {
+        if(syncMotor->IsInserted()) {
+            syncMotor->SetID(elementID);
+            syncMotor->SaveElement(doc, syncMotorsNode);
+            elementID++;
+		}
     }
     //}
 
     //{ Transfomer
     auto transformersNode = XMLParser::AppendNode(doc, elementsNode, "TransformerList");
     auto transformerList = allElements.GetTransformerList();
     elementID = 0;
-    for(auto it = transformerList.begin(), itEnd = transformerList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, transformersNode);
-        elementID++;
+    for(auto* transformer : transformerList) {
+        if (transformer->IsInserted()) {
+            transformer->SetID(elementID);
+            transformer->SaveElement(doc, transformersNode);
+            elementID++;
+        }
     }
     //}
 
     //{ HarmCurrent
     auto harmCurrentNode = XMLParser::AppendNode(doc, elementsNode, "HarmCurrentList");
     auto harmCurrentList = allElements.GetHarmCurrentList();
     elementID = 0;
-    for(auto it = harmCurrentList.begin(), itEnd = harmCurrentList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, harmCurrentNode);
-        elementID++;
+    for(auto* harmCurrent : harmCurrentList) {
+        if (harmCurrent->IsInserted()) {
+            harmCurrent->SetID(elementID);
+            harmCurrent->SaveElement(doc, harmCurrentNode);
+            elementID++;
+        }
     }
     //}
 
     //{ EMTElement
     auto emtElementNode = XMLParser::AppendNode(doc, elementsNode, "EMTElementList");
     auto emtElementList = allElements.GetEMTElementList();
     elementID = 0;
-    for (auto it = emtElementList.begin(), itEnd = emtElementList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, emtElementNode);
-        elementID++;
+    for (auto* emtElement : emtElementList) {
+        if(emtElement->IsInserted()) {
+            emtElement->SetID(elementID);
+            emtElement->SaveElement(doc, emtElementNode);
+            elementID++;
+		}
     }
     //}
 
     //{ Text
     auto textsNode = XMLParser::AppendNode(doc, elementsNode, "TextList");
     auto textList = m_workspace->GetTextList();
     elementID = 0;
-    for(auto it = textList.begin(), itEnd = textList.end(); it != itEnd; ++it) {
-        (*it)->SetID(elementID);
-        (*it)->SaveElement(doc, textsNode);
-        elementID++;
+    for(auto* text : textList) {
+        if(text->IsInserted()) {
+            text->SetID(elementID);
+            text->SaveElement(doc, textsNode);
+            elementID++;
+		}
     }
     //}