use designName (filename) for names in DesignCache

nam20485 · May 12, 2024 · 4955c9e · 4955c9e
1 parent 8bb3c35
commit 4955c9e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/OdbDesignLib/App/DesignCache.cpp b/OdbDesignLib/App/DesignCache.cpp
@@ -9,6 +9,10 @@
 #include "../FileModel/Design/FileArchive.h"
 #include <memory>
 #include "../ProductModel/Design.h"
+#include <iosfwd>
+#include <string>
+#include <type_traits>
+#include <StringVector.h>
 
 using namespace Utils;
 using namespace std::filesystem;
@@ -91,7 +95,7 @@ namespace Odb::Lib::App
         std::vector<std::string> loadedDesigns;
         for (const auto& kv : m_designsByName)
         {
-            loadedDesigns.push_back(kv.second->GetFileModel()->GetProductName());
+            loadedDesigns.push_back(kv.first);
         }
         return loadedDesigns;
     }
@@ -101,7 +105,7 @@ namespace Odb::Lib::App
         std::vector<std::string> loadedFileArchives;
         for (const auto& kv : m_fileArchivesByName)
 		{
-			loadedFileArchives.push_back(kv.second->GetProductName());
+			loadedFileArchives.push_back(kv.first);
 		}
         return loadedFileArchives;
     }
@@ -274,7 +278,7 @@ namespace Odb::Lib::App
                         if (pDesign->Build(pFileModel))
                         {
                             // overwrite any existing design with the same name
-                            m_designsByName[pFileModel->GetProductName()] =  pDesign;
+                            m_designsByName[designName] =  pDesign;
                             return pDesign;
                         }
                         else
@@ -313,7 +317,7 @@ namespace Odb::Lib::App
                     if (pFileArchive->ParseFileModel())
                     {
                         // overwrite any existing file archive with the same name
-                        m_fileArchivesByName[pFileArchive->GetProductName()] = pFileArchive;
+                        m_fileArchivesByName[designName] = pFileArchive;
                         return pFileArchive;
                     }
                     else

diff --git a/OdbDesignLib/ProductModel/Design.cpp b/OdbDesignLib/ProductModel/Design.cpp
@@ -6,6 +6,7 @@
 #include "Part.h"
 #include <memory>
 #include "Net.h"
+#include "../FileModel/Design/FileArchive.h"
 
 
 namespace Odb::Lib::ProductModel
@@ -118,6 +119,9 @@ namespace Odb::Lib::ProductModel
 
 		m_pFileModel = pFileModel;
 
+		//m_productModel = m_pFileModel->GetProductName();
+		//m_name = m_pFileModel->GetProductName();
+
 		// atomic elements
 		if (! BuildNets()) return false;
 		if (! BuildPackages()) return false;