=================================================================== Modification le : Sat Sep 8 21:12:24 CEST 2001 Par : xtof =================================================================== Update of /users/outil/alliance/cvsroot/alliance/sources/ocp/src In directory bip.lip6.fr:/users/cao/xtof/alliance/sources/ocp/src Modified Files: PMove.cpp PPlacement.cpp PPlacement.h Log Message: mise en place du preplacement en cours, le choix des rows semble marcher .... =================================================================== Index: PMove.cpp =================================================================== RCS file: /users/outil/alliance/cvsroot/alliance/sources/ocp/src/PMove.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -r1.3 -r1.4 166,167c166,167 < PPos SrcPos, DstPos; < //double DstX; --- > PPos SrcPos; > double DstX; 181,185d180 < // verion initiale < DstPos.SetY(PositionRand(SrcPos.GetY(), Dist, Placement.GetMaxY(), Placement.GetMinY())); < _dstRow = &Placement.GetRow(DstPos.GetY()); < DstPos.SetX(PositionRand(SrcPos.GetX(), Dist, _dstRow->GetMaxX(), _dstRow->GetMinX())); < 187c182 < //_dstRow = &Placement.GetRow(_srcRow, Dist); --- > _dstRow = &Placement.GetRow(_srcRow, Dist); 198d192 < DstBin = &(_dstSubRow->GetBin(DstPos.GetX())); 201,202c195,196 < //DstX = PositionRand(SrcPos.GetX(), Dist, _dstRow->GetMaxX(), _dstRow->GetMinX()); < //DstBin = &(_dstSubRow->GetBin(DstX)); --- > DstX = PositionRand(SrcPos.GetX(), Dist, _dstRow->GetMaxX(), _dstRow->GetMinX()); > DstBin = &(_dstSubRow->GetBin(DstX)); Index: PPlacement.cpp =================================================================== RCS file: /users/outil/alliance/cvsroot/alliance/sources/ocp/src/PPlacement.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -r1.2 -r1.3 321c321 < else --- > else if (_placeCons) 645c645 < --- > // 648,649c648,649 < if ((bornesup = row->GetMaxY() + (double)(int)(dist * GetMaxY() + 0.5) ) > GetMaxY() - _rowHeight) < bornesup = GetMaxY() - _rowHeight; --- > if ((bornesup = row->GetMinY() + (double)(int)(dist * GetHeight() + 0.5) ) > GetHeight()) > bornesup = GetMaxY(); =================================================================== Ce message est envoyé au personnes abonnées à alliance-programmers Pour plus d'information sur cette mailling-list, visitez : http://asim.lip6.fr/alliance/mailing-lists/