Merge pull request #8003 from osamahammad21/odb-database-prop

ODB: database prop

Author: osamahammad21

src/gui/src/dbDescriptors.cpp

@@ -4431,7 +4431,7 @@ Descriptor::Properties DbMarkerCategoryDescriptor::getDBProperties(
   }
 
   SelectionSet subcategories;
-  for (odb::dbMarkerCategory* subcat : category->getMarkerCategorys()) {
+  for (odb::dbMarkerCategory* subcat : category->getMarkerCategories()) {
     subcategories.insert(gui->makeSelected(subcat));
   }
   if (!subcategories.empty()) {

src/gui/src/drcWidget.cpp

@@ -253,7 +253,7 @@ void DRCWidget::updateModel()
   model_->removeRows(0, model_->rowCount());
 
   if (category != nullptr) {
-    for (odb::dbMarkerCategory* subcategory : category->getMarkerCategorys()) {
+    for (odb::dbMarkerCategory* subcategory : category->getMarkerCategories()) {
       populateCategory(subcategory, model_->invisibleRootItem());
     }
   }
@@ -280,7 +280,7 @@ void DRCWidget::populateCategory(odb::dbMarkerCategory* category,
   type_group->setCheckable(true);
   type_group->setCheckState(Qt::Checked);
 
-  for (odb::dbMarkerCategory* subcategory : category->getMarkerCategorys()) {
+  for (odb::dbMarkerCategory* subcategory : category->getMarkerCategories()) {
     populateCategory(subcategory, type_group);
   }
 

src/odb/include/odb/db.h

@@ -7029,6 +7029,8 @@ class dbDatabase : public dbObject
 
   dbChip* findChip(const char* name) const;
 
+  dbSet<dbProperty> getProperties() const;
+
   // User Code Begin dbDatabase
 
   void setTopChip(dbChip* chip);
@@ -7448,7 +7450,7 @@ class dbGDSStructure : public dbObject
  public:
   char* getName() const;
 
-  dbSet<dbGDSBoundary> getGDSBoundarys() const;
+  dbSet<dbGDSBoundary> getGDSBoundaries() const;
 
   dbSet<dbGDSBox> getGDSBoxs() const;
 
@@ -7849,7 +7851,7 @@ class dbMarkerCategory : public dbObject
 
   dbSet<dbMarker> getMarkers() const;
 
-  dbSet<dbMarkerCategory> getMarkerCategorys() const;
+  dbSet<dbMarkerCategory> getMarkerCategories() const;
 
   dbMarkerCategory* findMarkerCategory(const char* name) const;
 

src/odb/src/codeGenerator/gen.py

@@ -17,6 +17,7 @@
     components,
     get_class,
     get_functional_name,
+    get_plural_name,
     get_hash_table_type,
     get_ref_type,
     get_table_name,
@@ -160,12 +161,12 @@ def add_field_attributes(field, klass, flags_struct, schema):
     if field.get("table", False):
         klass["hasTables"] = True
         if field["type"].startswith("db"):
-            field["functional_name"] = f"{field['type'][2:]}s"
+            field["functional_name"] = get_plural_name(field["type"][2:])
         else:
-            field["functional_name"] = f"{field['type']}s"
+            field["functional_name"] = get_plural_name(field["type"])
         field["components"] = [field["name"]]
     elif field["isHashTable"]:
-        field["functional_name"] = f"{field['type'][2:]}s"
+        field["functional_name"] = get_plural_name(field["type"][2:])
     else:
         field["functional_name"] = get_functional_name(field["name"])
         field["components"] = components(klass["structs"], field["name"], field["type"])

src/odb/src/codeGenerator/helper.py

@@ -100,6 +100,16 @@ def is_bit_fields(field, structs):
     return False
 
 
+def get_plural_name(name):
+    # if name ends with y, replace it with ies
+    if name.endswith("y"):
+        return name[:-1] + "ies"
+    # if name ends with s, add es
+    elif name.endswith("s"):
+        return name + "es"
+    return name + "s"
+
+
 def get_functional_name(name):
     if name.islower():
         return "".join(

src/odb/src/codeGenerator/schema.json

@@ -380,6 +380,13 @@
       "flags": ["no-serial"],
       "page_size": 2,
       "hash": true
+    },
+    {
+      "parent":"dbDatabase",
+      "child":"dbProperty",
+      "type":"1_n",
+      "tbl_name":"_prop_tbl",
+      "flags": ["no-serial"]
     }
   ]
 }

src/odb/src/db/dbDatabase.cpp

@@ -5,6 +5,7 @@
 #include "dbDatabase.h"
 
 #include "dbChip.h"
+#include "dbProperty.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
@@ -68,6 +69,9 @@ bool _dbDatabase::operator==(const _dbDatabase& rhs) const
   if (chip_hash_ != rhs.chip_hash_) {
     return false;
   }
+  if (*_prop_tbl != *rhs._prop_tbl) {
+    return false;
+  }
 
   // User Code Begin ==
   //
@@ -87,10 +91,6 @@ bool _dbDatabase::operator==(const _dbDatabase& rhs) const
     return false;
   }
 
-  if (*_prop_tbl != *rhs._prop_tbl) {
-    return false;
-  }
-
   if (*_name_cache != *rhs._name_cache) {
     return false;
   }
@@ -116,6 +116,8 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
   chip_tbl_ = new dbTable<_dbChip, 2>(
       this, this, (GetObjTbl_t) &_dbDatabase::getObjectTable, dbChipObj);
   chip_hash_.setTable(chip_tbl_);
+  _prop_tbl = new dbTable<_dbProperty>(
+      this, this, (GetObjTbl_t) &_dbDatabase::getObjectTable, dbPropertyObj);
   // User Code Begin Constructor
   _magic1 = DB_MAGIC1;
   _magic2 = DB_MAGIC2;
@@ -134,9 +136,6 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
   _lib_tbl = new dbTable<_dbLib>(
       this, this, (GetObjTbl_t) &_dbDatabase::getObjectTable, dbLibObj);
 
-  _prop_tbl = new dbTable<_dbProperty>(
-      this, this, (GetObjTbl_t) &_dbDatabase::getObjectTable, dbPropertyObj);
-
   _name_cache = new _dbNameCache(
       this, this, (GetObjTbl_t) &_dbDatabase::getObjectTable);
 
@@ -255,6 +254,8 @@ dbObjectTable* _dbDatabase::getObjectTable(dbObjectType type)
   switch (type) {
     case dbChipObj:
       return chip_tbl_;
+    case dbPropertyObj:
+      return _prop_tbl;
       // User Code Begin getObjectTable
     case dbTechObj:
       return _tech_tbl;
@@ -264,9 +265,6 @@ dbObjectTable* _dbDatabase::getObjectTable(dbObjectType type)
 
     case dbGdsLibObj:
       return _gds_lib_tbl;
-
-    case dbPropertyObj:
-      return _prop_tbl;
     // User Code End getObjectTable
     default:
       break;
@@ -280,23 +278,24 @@ void _dbDatabase::collectMemInfo(MemInfo& info)
 
   chip_tbl_->collectMemInfo(info.children_["chip_tbl_"]);
 
+  _prop_tbl->collectMemInfo(info.children_["_prop_tbl"]);
+
   // User Code Begin collectMemInfo
   _tech_tbl->collectMemInfo(info.children_["tech"]);
   _lib_tbl->collectMemInfo(info.children_["lib"]);
   _gds_lib_tbl->collectMemInfo(info.children_["gds_lib"]);
-  _prop_tbl->collectMemInfo(info.children_["prop"]);
   _name_cache->collectMemInfo(info.children_["name_cache"]);
   // User Code End collectMemInfo
 }
 
 _dbDatabase::~_dbDatabase()
 {
   delete chip_tbl_;
+  delete _prop_tbl;
   // User Code Begin Destructor
   delete _tech_tbl;
   delete _lib_tbl;
   delete _gds_lib_tbl;
-  delete _prop_tbl;
   delete _name_cache;
   delete _prop_itr;
   // User Code End Destructor
@@ -373,6 +372,12 @@ dbChip* dbDatabase::findChip(const char* name) const
   return (dbChip*) obj->chip_hash_.find(name);
 }
 
+dbSet<dbProperty> dbDatabase::getProperties() const
+{
+  _dbDatabase* obj = (_dbDatabase*) this;
+  return dbSet<dbProperty>(obj, obj->_prop_tbl);
+}
+
 // User Code Begin dbDatabasePublicMethods
 
 void dbDatabase::setTopChip(dbChip* chip)

src/odb/src/db/dbDatabase.h

@@ -225,8 +225,8 @@ const uint db_schema_add_global_connect = 58;
 class dbIStream;
 class dbOStream;
 class _dbChip;
-// User Code Begin Classes
 class _dbProperty;
+// User Code Begin Classes
 class dbPropertyItr;
 class _dbNameCache;
 class _dbTech;
@@ -261,12 +261,12 @@ class _dbDatabase : public _dbObject
   dbId<_dbChip> _chip;
   dbTable<_dbChip, 2>* chip_tbl_;
   dbHashTable<_dbChip, 2> chip_hash_;
+  dbTable<_dbProperty>* _prop_tbl;
 
   // User Code Begin Fields
   dbTable<_dbTech, 2>* _tech_tbl;
   dbTable<_dbLib>* _lib_tbl;
   dbTable<_dbGDSLib, 2>* _gds_lib_tbl;
-  dbTable<_dbProperty>* _prop_tbl;
   _dbNameCache* _name_cache;
   dbPropertyItr* _prop_itr;
   int _unique_id;

src/odb/src/db/dbGDSStructure.cpp

@@ -169,7 +169,7 @@ char* dbGDSStructure::getName() const
   return obj->_name;
 }
 
-dbSet<dbGDSBoundary> dbGDSStructure::getGDSBoundarys() const
+dbSet<dbGDSBoundary> dbGDSStructure::getGDSBoundaries() const
 {
   _dbGDSStructure* obj = (_dbGDSStructure*) this;
   return dbSet<dbGDSBoundary>(obj, obj->boundaries_);

src/odb/src/db/dbMarkerCategory.cpp

@@ -169,11 +169,11 @@ void _dbMarkerCategory::populatePTree(
   }
 
   _dbMarkerCategory::PropertyTree subcategory_tree;
-  for (dbMarkerCategory* category : category->getMarkerCategorys()) {
+  for (dbMarkerCategory* category : category->getMarkerCategories()) {
     _dbMarkerCategory* category_ = (_dbMarkerCategory*) category;
     category_->populatePTree(subcategory_tree);
   }
-  if (!category->getMarkerCategorys().empty()) {
+  if (!category->getMarkerCategories().empty()) {
     category_tree.add_child("category", subcategory_tree);
   }
 
@@ -267,7 +267,7 @@ void _dbMarkerCategory::writeTR(std::ofstream& report) const
     marker_->writeTR(report);
   }
 
-  for (dbMarkerCategory* category : marker_category->getMarkerCategorys()) {
+  for (dbMarkerCategory* category : marker_category->getMarkerCategories()) {
     _dbMarkerCategory* category_ = (_dbMarkerCategory*) category;
     category_->writeTR(report);
   }
@@ -326,7 +326,7 @@ dbSet<dbMarker> dbMarkerCategory::getMarkers() const
   return dbSet<dbMarker>(obj, obj->marker_tbl_);
 }
 
-dbSet<dbMarkerCategory> dbMarkerCategory::getMarkerCategorys() const
+dbSet<dbMarkerCategory> dbMarkerCategory::getMarkerCategories() const
 {
   _dbMarkerCategory* obj = (_dbMarkerCategory*) this;
   return dbSet<dbMarkerCategory>(obj, obj->categories_tbl_);
@@ -345,7 +345,7 @@ int dbMarkerCategory::getMarkerCount() const
   _dbMarkerCategory* obj = (_dbMarkerCategory*) this;
   int count = obj->marker_tbl_->size();
 
-  for (dbMarkerCategory* category : getMarkerCategorys()) {
+  for (dbMarkerCategory* category : getMarkerCategories()) {
     count += category->getMarkerCount();
   }
 
@@ -745,7 +745,7 @@ std::set<dbMarker*> dbMarkerCategory::getAllMarkers() const
 {
   std::set<dbMarker*> markers;
 
-  for (dbMarkerCategory* category : getMarkerCategorys()) {
+  for (dbMarkerCategory* category : getMarkerCategories()) {
     const std::set<dbMarker*> category_markers = category->getAllMarkers();
     markers.insert(category_markers.begin(), category_markers.end());
   }