Skip to content

Commit a88e700

Browse files
Merge pull request #8803 from osamahammad21/3dblox-check
3dblox: 3DBlox Checker
2 parents a34a87c + c21c3f9 commit a88e700

26 files changed

+1094
-71
lines changed

src/gui/src/dbDescriptors.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4438,9 +4438,11 @@ Descriptor::Properties DbMarkerCategoryDescriptor::getDBProperties(
44384438

44394439
odb::dbObject* parent = category->getParent();
44404440
if (parent != top) {
4441-
if (parent->getObjectType() == odb::dbObjectType::dbBlockObj) {
4441+
if (parent->getObjectType() == odb::dbObjectType::dbChipObj) {
4442+
// TODO: fix this
44424443
props.push_back(
4443-
{"Parent", gui->makeSelected(static_cast<odb::dbBlock*>(parent))});
4444+
{"Parent",
4445+
gui->makeSelected(static_cast<odb::dbChip*>(parent)->getBlock())});
44444446
} else {
44454447
props.push_back(
44464448
{"Parent",

src/odb/include/odb/3dblox.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class ThreeDBlox
3535
void readDbv(const std::string& dbv_file);
3636
void readDbx(const std::string& dbx_file);
3737
void readBMap(const std::string& bmap_file);
38+
void check();
3839

3940
private:
4041
void createChiplet(const ChipletDef& chiplet);

src/odb/include/odb/db.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7101,6 +7101,8 @@ class dbChip : public dbObject
71017101

71027102
dbSet<dbChipRegion> getChipRegions() const;
71037103

7104+
dbSet<dbMarkerCategory> getMarkerCategories() const;
7105+
71047106
// User Code Begin dbChip
71057107

71067108
ChipType getChipType() const;
@@ -7124,6 +7126,10 @@ class dbChip : public dbObject
71247126

71257127
Rect getBBox() const;
71267128

7129+
Cuboid getCuboid() const;
7130+
7131+
dbMarkerCategory* findMarkerCategory(const char* name) const;
7132+
71277133
///
71287134
/// Create a new chip.
71297135
/// Returns nullptr if there is no database technology.
@@ -7235,6 +7241,8 @@ class dbChipInst : public dbObject
72357241

72367242
Rect getBBox() const;
72377243

7244+
Cuboid getCuboid() const;
7245+
72387246
dbSet<dbChipRegionInst> getRegions() const;
72397247

72407248
dbChipRegionInst* findChipRegionInst(dbChipRegion* chip_region) const;
@@ -7290,6 +7298,8 @@ class dbChipRegion : public dbObject
72907298
dbSet<dbChipBump> getChipBumps() const;
72917299

72927300
// User Code Begin dbChipRegion
7301+
Cuboid getCuboid() const;
7302+
72937303
dbChip* getChip() const;
72947304

72957305
Side getSide() const;
@@ -7308,6 +7318,7 @@ class dbChipRegionInst : public dbObject
73087318
{
73097319
public:
73107320
// User Code Begin dbChipRegionInst
7321+
Cuboid getCuboid() const;
73117322

73127323
dbChipInst* getChipInst() const;
73137324

@@ -8196,6 +8207,9 @@ class dbMarkerCategory : public dbObject
81968207
static dbMarkerCategory* create(dbBlock* block, const char* name);
81978208
static dbMarkerCategory* createOrReplace(dbBlock* block, const char* name);
81988209
static dbMarkerCategory* createOrGet(dbBlock* block, const char* name);
8210+
static dbMarkerCategory* create(dbChip* chip, const char* name);
8211+
static dbMarkerCategory* createOrReplace(dbChip* chip, const char* name);
8212+
static dbMarkerCategory* createOrGet(dbChip* chip, const char* name);
81998213
static dbMarkerCategory* create(dbMarkerCategory* category, const char* name);
82008214
static dbMarkerCategory* createOrGet(dbMarkerCategory* category,
82018215
const char* name);

src/odb/include/odb/dbUtil.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "odb/dbObject.h"
1111
#include "odb/odb.h"
1212
#include "utl/Logger.h"
13-
1413
namespace odb {
1514

1615
namespace dbUtil {

0 commit comments

Comments
 (0)