diff --git a/ENkMachOptimization.h b/ENkMachOptimization.h index 94fd718..57fad26 100644 --- a/ENkMachOptimization.h +++ b/ENkMachOptimization.h @@ -81,8 +81,15 @@ struct MachOptm { dA_Start( dA_Start) , dB_Start( dB_Start), dC_Start( dC_Start), dX_End( dX_End), dY_End( dY_End), dZ_End( dZ_End), dA_End( dA_End), dB_End( dB_End), dC_End( dC_End) {} + MachOptm() + : nId( -1), nIdTool( -1), nGroup( -1), + dX_Start( 0.), dY_Start( 0.), dZ_Start( 0.), + dA_Start( 0.) , dB_Start( 0.), dC_Start( 0.), + dX_End( 0.), dY_End( 0.), dZ_End( 0.), + dA_End( 0.), dB_End( 0.), dC_End( 0.) {} ; } ; typedef std::vector MACHOPTMVECTOR ; +typedef std::vector MACHOPTMMATRIX ; typedef std::list MACHOPTMLIST ; //---------------------------------------------------------------------------- @@ -104,8 +111,9 @@ class __declspec( novtable) IMachOptimization virtual bool SetLastMachining( int nId) = 0 ; virtual bool SetFeeds( double dFeedL, double dFeedA) = 0 ; virtual bool SetAllGroupsAsMandatory( bool bAllMandatory = false) = 0 ; + virtual bool SetOptimizationForGroups( bool bOptForGroups = false) = 0 ; virtual bool GetResult( INTVECTOR& vIds) = 0 ; } ; //----------------------------------------------------------------------------- -ENK_EXPORT IMachOptimization* CreateMachOptimization( void) ; \ No newline at end of file +ENK_EXPORT IMachOptimization* CreateMachOptimization( void) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 9f77609..1c979d5 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -233,6 +233,7 @@ EXE_EXPORT bool ExeOptMachSetFeeds( double dFeedL, double dFeedA) ; EXE_EXPORT bool ExeOptMachAddDependence( int nIdPrec, int nIdNext) ; EXE_EXPORT bool ExeOptMachAddSuggestedDependence( int nIdPrec, int nIdNext) ; EXE_EXPORT bool ExeOptMachSetAllGroupDependencesAsMandatory( bool bAllMandatory) ; +EXE_EXPORT bool ExeOptMachSetOptimizationForGroups( bool bOptForGroups) ; EXE_EXPORT bool ExeOptMachGetResult( INTVECTOR& vIds) ; // GeomDB Create