From 7636882e3826813db6106d75f53289fc08eed1f3 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 24 Feb 2016 08:21:19 +0000 Subject: [PATCH] EgtInterface 1.6n8 : - aggiornamento interfacce per nesting. --- API_Nesting.cpp | 13 ++++++------- EgtInterface.rc | Bin 11726 -> 11726 bytes 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/API_Nesting.cpp b/API_Nesting.cpp index 620cf10..6f30c24 100644 --- a/API_Nesting.cpp +++ b/API_Nesting.cpp @@ -103,15 +103,15 @@ __stdcall EgtMoveBoxCluster( int nId[], int nCount, double vtMove[3], //----------------------------------------------------------------------------- BOOL -__stdcall EgtCreateOutRegion( int nParentId, - double dXmin, double dYmin, double dXmax, double dYmax, double dZ) +__stdcall EgtCreateOutRegionRectangle( int nParentId, + double dXmin, double dYmin, double dXmax, double dYmax, double dZ) { return ( ExeCreateOutRegion( nParentId, dXmin, dYmin, dXmax, dYmax, dZ) ? TRUE : FALSE) ; } //----------------------------------------------------------------------------- BOOL -__stdcall EgtCreateOutRegion2( int nParentId, int nOutCrvId) +__stdcall EgtCreateOutRegion( int nParentId, int nOutCrvId) { return ( ExeCreateOutRegion( nParentId, nOutCrvId) ? TRUE : FALSE) ; } @@ -136,8 +136,7 @@ __stdcall EgtVerifyPartCluster( int nId[], int nCount, BOOL bReducedCut) //----------------------------------------------------------------------------- BOOL -__stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, - double dXmin, double dYmin, double dXmax, double dYmax, BOOL bBottomUp) +__stdcall EgtPackPartClusterInRectangle( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp) { // verifico if ( nId == nullptr || nCount <= 0) @@ -148,14 +147,14 @@ __stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, for ( int i = 0 ; i < nCount ; ++ i) vIds.push_back( nId[i]) ; // eseguo - if ( ! ExePackPartCluster( vIds, ( bReducedCut != FALSE), dXmin, dYmin,dXmax, dYmax, ( bBottomUp != FALSE))) + if ( ! ExePackPartClusterInRectangle( vIds, ( bReducedCut != FALSE), ( bBottomUp != FALSE))) return FALSE ; return TRUE ; } //----------------------------------------------------------------------------- BOOL -__stdcall EgtPackPartCluster2( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp) +__stdcall EgtPackPartCluster( int nId[], int nCount, BOOL bReducedCut, BOOL bBottomUp) { // verifico if ( nId == nullptr || nCount <= 0) diff --git a/EgtInterface.rc b/EgtInterface.rc index d16ea8db8d6374990a08b2bad49006ccece8492b..61be7e67f1424664f310c477bdb083fac267fb9f 100644 GIT binary patch delta 113 zcmX>XeJ*;#A2vpd%@4(HGEKh5na5}``6H+9WG^L)&3#f*jGK>e8!&^VPclv3Cs+lM i-t491#khHcFjUGNr~*ls7YjlI&*XKAP&0v=TDSq2At@CA delta 113 zcmX>XeJ*;#A2vqw%@4(HGEKh5na5~8`6H+9WG^L)&3#f*jGK>e8!&^VPclv3Cs+lM i-t491#khHcFjUGNr~*ls7YjlI&*XKAP&0v=TDSq0S1Anu