Identify more source libraries

Werni2A · Jun 19, 2024 · 929725e · 929725e
1 parent bfc6c74
commit 929725e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/src/Structures/StructERCSymbol.hpp b/src/Structures/StructERCSymbol.hpp
@@ -45,10 +45,10 @@ static std::string to_string(const StructERCSymbol& aObj)
     std::string str;
 
     str += fmt::format("{}:\n", nameof::nameof_type<decltype(aObj)>());
-    str += fmt::format("{}name     = {}\n", indent(1), aObj.name);
-    str += fmt::format("{}someStr0 = {}\n", indent(1), aObj.someStr0);
-    str += fmt::format("{}color    = {}\n", indent(1), ::to_string(aObj.color));
-    str += fmt::format("{}symbolBBox = {}", indent(1), aObj.symbolBBox.to_string());
+    str += fmt::format("{}name          = {}\n", indent(1), aObj.name);
+    str += fmt::format("{}sourceLibrary = {}\n", indent(1), aObj.sourceLibrary);
+    str += fmt::format("{}color         = {}\n", indent(1), ::to_string(aObj.color));
+    str += fmt::format("{}symbolBBox    = {}", indent(1), aObj.symbolBBox.to_string());
 
     return str;
 }

diff --git a/src/Structures/StructGlobalSymbol.hpp b/src/Structures/StructGlobalSymbol.hpp
@@ -50,9 +50,9 @@ static std::string to_string(const StructGlobalSymbol& aObj)
     std::string str;
 
     str += fmt::format("{}:\n", nameof::nameof_type<decltype(aObj)>());
-    str += fmt::format("{}name     = {}\n", indent(1), aObj.name);
-    str += fmt::format("{}someStr0 = {}\n", indent(1), aObj.someStr0);
-    str += fmt::format("{}color    = {}\n", indent(1), ::to_string(aObj.color));
+    str += fmt::format("{}name          = {}\n", indent(1), aObj.name);
+    str += fmt::format("{}sourceLibrary = {}\n", indent(1), aObj.sourceLibrary);
+    str += fmt::format("{}color         = {}\n", indent(1), ::to_string(aObj.color));
 
     str += fmt::format("{}symbolPins:\n", indent(1));
     for(size_t i = 0u; i < aObj.symbolPins.size(); ++i)

diff --git a/src/Structures/StructOffPageSymbol.hpp b/src/Structures/StructOffPageSymbol.hpp
@@ -51,9 +51,9 @@ static std::string to_string(const StructOffPageSymbol& aObj)
     std::string str;
 
     str += fmt::format("{}:\n", nameof::nameof_type<decltype(aObj)>());
-    str += fmt::format("{}name     = {}\n", indent(1), aObj.name);
-    str += fmt::format("{}someStr0 = {}\n", indent(1), aObj.someStr0);
-    str += fmt::format("{}color    = {}\n", indent(1), ::to_string(aObj.color));
+    str += fmt::format("{}name          = {}\n", indent(1), aObj.name);
+    str += fmt::format("{}sourceLibrary = {}\n", indent(1), aObj.sourceLibrary);
+    str += fmt::format("{}color         = {}\n", indent(1), ::to_string(aObj.color));
 
     str += fmt::format("{}symbolPins:\n", indent(1));
     for(size_t i = 0u; i < aObj.symbolPins.size(); ++i)

diff --git a/src/Structures/StructPinShapeSymbol.hpp b/src/Structures/StructPinShapeSymbol.hpp
@@ -50,9 +50,9 @@ static std::string to_string(const StructPinShapeSymbol& aObj)
     std::string str;
 
     str += fmt::format("{}:\n", nameof::nameof_type<decltype(aObj)>());
-    str += fmt::format("{}name     = {}\n", indent(1), aObj.name);
-    str += fmt::format("{}someStr0 = {}\n", indent(1), aObj.someStr0);
-    str += fmt::format("{}color    = {}\n", indent(1), ::to_string(aObj.color));
+    str += fmt::format("{}name          = {}\n", indent(1), aObj.name);
+    str += fmt::format("{}sourceLibrary = {}\n", indent(1), aObj.sourceLibrary);
+    str += fmt::format("{}color         = {}\n", indent(1), ::to_string(aObj.color));
 
     str += fmt::format("{}symbolPins:\n", indent(1));
     for(size_t i = 0u; i < aObj.symbolPins.size(); ++i)

diff --git a/src/Structures/StructSthInPages0.cpp b/src/Structures/StructSthInPages0.cpp
@@ -48,9 +48,9 @@ void StructSthInPages0::read_raw(FileFormatVersion /* aVersion */, FutureDataLst
 
     mCtx.mLogger.trace("name = {}", name);
 
-    someStr0 = ds.readStringLenZeroTerm();
+    sourceLibrary = ds.readStringLenZeroTerm();
 
-    mCtx.mLogger.trace("someStr0 = {}", someStr0);
+    mCtx.mLogger.trace("sourceLibrary = {}", sourceLibrary);
 
     aLocalFutureLst.checkpoint();
 

diff --git a/src/Structures/StructSthInPages0.hpp b/src/Structures/StructSthInPages0.hpp
@@ -24,7 +24,7 @@ class StructSthInPages0 : public Record
 public:
 
     StructSthInPages0(StreamContext& aCtx) : Record{aCtx},
-        name{}, someStr0{}, color{Color::Default}, primitives{}
+        name{}, sourceLibrary{}, color{Color::Default}, primitives{}
     { }
 
     std::string to_string() const override;
@@ -44,7 +44,10 @@ class StructSthInPages0 : public Record
     void read_raw(FileFormatVersion aVersion, FutureDataLst& aLocalFutureLst);
 
     std::string name;
-    std::string someStr0;
+
+    // Absolute path
+    std::string sourceLibrary;
+
     Color       color;
 
     std::vector<std::unique_ptr<PrimBase>> primitives;
@@ -57,9 +60,9 @@ static std::string to_string(const StructSthInPages0& aObj)
     std::string str;
 
     str += fmt::format("{}:\n", nameof::nameof_type<decltype(aObj)>());
-    str += fmt::format("{}name     = {}\n", indent(1), aObj.name);
-    str += fmt::format("{}someStr0 = {}\n", indent(1), aObj.someStr0);
-    str += fmt::format("{}color    = {}\n", indent(1), ::to_string(aObj.color));
+    str += fmt::format("{}name          = {}\n", indent(1), aObj.name);
+    str += fmt::format("{}sourceLibrary = {}\n", indent(1), aObj.sourceLibrary);
+    str += fmt::format("{}color         = {}\n", indent(1), ::to_string(aObj.color));
 
     str += fmt::format("{}primitives:\n", indent(1));
     for(size_t i = 0u; i < aObj.primitives.size(); ++i)

diff --git a/src/Structures/StructTitleBlockSymbol.hpp b/src/Structures/StructTitleBlockSymbol.hpp
@@ -50,9 +50,9 @@ static std::string to_string(const StructTitleBlockSymbol& aObj)
     std::string str;
 
     str += fmt::format("{}:\n", nameof::nameof_type<decltype(aObj)>());
-    str += fmt::format("{}name     = {}\n", indent(1), aObj.name);
-    str += fmt::format("{}someStr0 = {}\n", indent(1), aObj.someStr0);
-    str += fmt::format("{}color    = {}\n", indent(1), ::to_string(aObj.color));
+    str += fmt::format("{}name          = {}\n", indent(1), aObj.name);
+    str += fmt::format("{}sourceLibrary = {}\n", indent(1), aObj.sourceLibrary);
+    str += fmt::format("{}color         = {}\n", indent(1), ::to_string(aObj.color));
 
     str += fmt::format("{}symbolPins:\n", indent(1));
     for(size_t i = 0u; i < aObj.symbolPins.size(); ++i)