Merge patches from Naohiko Shimizu <nshimizu@ip-arch.jp> for variable

Cell gabarit (for pharosc).
This commit is contained in:
Jean-Paul Chaput 2012-05-02 14:47:54 +00:00
parent 6280a6a00a
commit 544ad6c3e2
2 changed files with 4 additions and 4 deletions

View File

@ -27,7 +27,7 @@
#ifndef __PCONSTANTS_H #ifndef __PCONSTANTS_H
#define __PCONSTANTS_H #define __PCONSTANTS_H
#define PITCH (5 * SCALE_X) #define PITCH (MBK_X_GRID * SCALE_X)
#define ROWHEIGHT 10 #define ROWHEIGHT (MBK_Y_SLICE / MBK_Y_GRID)
#endif /* __PCONSTANTS_H */ #endif /* __PCONSTANTS_H */

View File

@ -60,7 +60,7 @@ PCon::Save(struct phfig *physicalfig, const double dx, const double dy) const {
, (int)(GetPosX() * PITCH + dx) , (int)(GetPosX() * PITCH + dx)
, (int)(GetPosY() * PITCH + dy) , (int)(GetPosY() * PITCH + dy)
, _orient==NORTH || _orient == SOUTH ? ALU2 : ALU3 , _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 { } else {
#if 0 #if 0
addphcon(physicalfig, addphcon(physicalfig,
@ -89,7 +89,7 @@ PCon::RingSave(struct phfig *physicalfig, const double dx, const double dy) cons
(int)(GetPosX() * PITCH + dx), (int)(GetPosX() * PITCH + dx),
(int)(GetPosY() * PITCH + dy), (int)(GetPosY() * PITCH + dy),
ALU2, ALU2,
2 * (PITCH/5)); 2 * (PITCH/MBK_X_GRID));
} }
ostream& ostream&