From 544ad6c3e2e544ae713feafe67762d3b4c2b831f Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 2 May 2012 14:47:54 +0000 Subject: [PATCH] Merge patches from Naohiko Shimizu for variable Cell gabarit (for pharosc). --- alliance/src/ocp/src/common/PConstants.h | 4 ++-- alliance/src/ocp/src/placer/PCon.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alliance/src/ocp/src/common/PConstants.h b/alliance/src/ocp/src/common/PConstants.h index bb4e9928..defd6fec 100644 --- a/alliance/src/ocp/src/common/PConstants.h +++ b/alliance/src/ocp/src/common/PConstants.h @@ -27,7 +27,7 @@ #ifndef __PCONSTANTS_H #define __PCONSTANTS_H -#define PITCH (5 * SCALE_X) -#define ROWHEIGHT 10 +#define PITCH (MBK_X_GRID * SCALE_X) +#define ROWHEIGHT (MBK_Y_SLICE / MBK_Y_GRID) #endif /* __PCONSTANTS_H */ diff --git a/alliance/src/ocp/src/placer/PCon.cpp b/alliance/src/ocp/src/placer/PCon.cpp index d3155090..3dc888f2 100644 --- a/alliance/src/ocp/src/placer/PCon.cpp +++ b/alliance/src/ocp/src/placer/PCon.cpp @@ -60,7 +60,7 @@ PCon::Save(struct phfig *physicalfig, const double dx, const double dy) const { , (int)(GetPosX() * PITCH + dx) , (int)(GetPosY() * PITCH + dy) , _orient==NORTH || _orient == SOUTH ? ALU2 : ALU3 - , (_orient==NORTH || _orient == SOUTH ? 2 : 1) * (PITCH/5)); + , (_orient==NORTH || _orient == SOUTH ? 2 : 1) * (PITCH/MBK_X_GRID)); } else { #if 0 addphcon(physicalfig, @@ -89,7 +89,7 @@ PCon::RingSave(struct phfig *physicalfig, const double dx, const double dy) cons (int)(GetPosX() * PITCH + dx), (int)(GetPosY() * PITCH + dy), ALU2, - 2 * (PITCH/5)); + 2 * (PITCH/MBK_X_GRID)); } ostream&