diff --git a/BtlGeomCoStru.h b/BtlGeomCoStru.h index 57ed6e5..5743f79 100644 --- a/BtlGeomCoStru.h +++ b/BtlGeomCoStru.h @@ -166,7 +166,6 @@ const double DOVETAIL_DEF_ANG = 15.0 ; const double DTMORT_EXTRA_LEN = 10.0 ; // minima e massima dimensione tasca per mortasa a coda di rondine const double MIN_DTMORT_POCKET = 70.0 ; -const double MAX_DTMORT_POCKET = 200.0 ; const double MIN_DTMORT_AREA = 100.0 ; // tolleranza fuoriuscita curve di tasche di code di rondine const double DTMORT_OUT_CRV_TOL = 30.0 ; diff --git a/BtlGeomProc.cpp b/BtlGeomProc.cpp index 2fb42a3..af43af4 100644 --- a/BtlGeomProc.cpp +++ b/BtlGeomProc.cpp @@ -4311,9 +4311,9 @@ BtlGeom::AddDovetailMortise( int nGroup, int nProc, int nSide, const string& sDe dY4 = dExtraLen ; } else { - dExtraLen = MAX_DTMORT_POCKET ; + dExtraLen = dMortL ; if ( dMortA > EPS_ANG_SMALL) - dExtraLen = Clamp( 0.6225 * dOffs / sin( dMortA * DEGTORAD), MIN_DTMORT_POCKET, MAX_DTMORT_POCKET) ; + dExtraLen = Clamp( dOffs / sin( dMortA * DEGTORAD), MIN_DTMORT_POCKET, dMortL) ; dX4 = dX3 ; dY4 = dExtraLen ; } @@ -4568,9 +4568,9 @@ BtlGeom::AddDtMortiseFront( int nGroup, int nProc, int nSide, const string& sDes dY4 = dExtraLen ; } else { - dExtraLen = MAX_DTMORT_POCKET ; + dExtraLen = dMortL ; if ( dMortA > EPS_ANG_SMALL) - dExtraLen = min( 0.6225 * dOffs / sin( dMortA * DEGTORAD), MAX_DTMORT_POCKET) ; + dExtraLen = Clamp( dOffs / sin( dMortA * DEGTORAD), MIN_DTMORT_POCKET, dMortL) ; dX4 = dX3 ; dY4 = dExtraLen ; } diff --git a/EgtExchange.rc b/EgtExchange.rc index d561afa..ac74c2f 100644 Binary files a/EgtExchange.rc and b/EgtExchange.rc differ