Merge pull request LibrePCB#195 from LibrePCB/rename_item_to_gate

Rename "item" to "gate" in components and schematics
trdenton · Feb 11, 2018 · d2ea95e · d2ea95e
2 parents 2412a24 + ed62d03
commit d2ea95e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/dev/demo-workspace b/dev/demo-workspace
diff --git a/libs/librepcb/library/cmp/componentsymbolvariant.cpp b/libs/librepcb/library/cmp/componentsymbolvariant.cpp
@@ -62,6 +62,11 @@ ComponentSymbolVariant::ComponentSymbolVariant(const SExpression& node) :
     // Load all symbol variant items
     mSymbolItems.loadFromDomElement(node);
 
+    // backward compatibility, remove this some time!
+    foreach (const SExpression& node, node.getChildren("item")) {
+        mSymbolItems.append(std::make_shared<ComponentSymbolVariantItem>(node)); // can throw
+    }
+
     if (!checkAttributesValidity()) throw LogicError(__FILE__, __LINE__);
 }
 

diff --git a/libs/librepcb/library/cmp/componentsymbolvariantitem.h b/libs/librepcb/library/cmp/componentsymbolvariantitem.h
@@ -51,6 +51,8 @@ namespace library {
  *  - UUID
  *  - Symbol UUID
  *  - Pin-signal-mapping
+ *
+ * @todo Rename class to "ComponentGate" (or similar) and rename related classes if needed
  */
 class ComponentSymbolVariantItem final : public SerializableObject
 {
@@ -112,7 +114,7 @@ class ComponentSymbolVariantItem final : public SerializableObject
  *  Class ComponentSymbolVariantItemList
  ****************************************************************************************/
 
-struct ComponentSymbolVariantItemListNameProvider {static constexpr const char* tagname = "item";};
+struct ComponentSymbolVariantItemListNameProvider {static constexpr const char* tagname = "gate";};
 using ComponentSymbolVariantItemList = SerializableObjectList<ComponentSymbolVariantItem, ComponentSymbolVariantItemListNameProvider>;
 using CmdComponentSymbolVariantItemInsert = CmdListElementInsert<ComponentSymbolVariantItem, ComponentSymbolVariantItemListNameProvider>;
 using CmdComponentSymbolVariantItemRemove = CmdListElementRemove<ComponentSymbolVariantItem, ComponentSymbolVariantItemListNameProvider>;

diff --git a/libs/librepcb/project/schematics/items/si_symbol.cpp b/libs/librepcb/project/schematics/items/si_symbol.cpp
@@ -56,7 +56,13 @@ SI_Symbol::SI_Symbol(Schematic& schematic, const SExpression& node) :
     }
     mPosition = Point(node.getChildByPath("pos"));
     mRotation = node.getValueByPath<Angle>("rot", true);
-    Uuid symbVarItemUuid = node.getValueByPath<Uuid>("lib_item", true);
+    Uuid symbVarItemUuid;
+    if (node.tryGetChildByPath("lib_gate")) {
+        symbVarItemUuid = node.getValueByPath<Uuid>("lib_gate", true);
+    } else {
+        // backward compatibility, remove this some time!
+        symbVarItemUuid = node.getValueByPath<Uuid>("lib_item", true);
+    }
     init(symbVarItemUuid);
 }
 
@@ -189,7 +195,7 @@ void SI_Symbol::serialize(SExpression& root) const
 
     root.appendToken(mUuid);
     root.appendTokenChild("component", mComponentInstance->getUuid(), true);
-    root.appendTokenChild("lib_item", mSymbVarItem->getUuid(), true);
+    root.appendTokenChild("lib_gate", mSymbVarItem->getUuid(), true);
     root.appendChild(mPosition.serializeToDomElement("pos"), true);
     root.appendTokenChild("rot", mRotation, false);
 }