diff --git a/EgtInterface.vb b/EgtInterface.vb index 0db6cb3..83aafcd 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -759,6 +759,23 @@ Public Function EgtGetKeyInfo(ByRef sKeyInfo As String) As Boolean Return bOk End Function + +Private Function EgtGetKeyOptions_32(nProd As Integer, nVer As Integer, nLev As Integer, + ByRef nOpt2 As UInteger) As Boolean +End Function + +Private Function EgtGetKeyOptions_64(nProd As Integer, nVer As Integer, nLev As Integer, + ByRef nOpt2 As UInteger) As Boolean +End Function +Public Function EgtGetKeyOptions(nProd As Integer, nVer As Integer, nLev As Integer, + ByRef nOpt2 As UInteger) As Boolean + If IntPtr.Size = 4 Then + Return EgtGetKeyOptions_32(nProd, nVer, nLev, nOpt2) + Else + Return EgtGetKeyOptions_64(nProd, nVer, nLev, nOpt2) + End If +End Function + Private Function EgtGetOsInfo_32(ByRef psOsInfo As IntPtr) As Boolean End Function @@ -2817,6 +2834,20 @@ Public Function EgtModifyCurveCompoJoint(nId As Integer, nU As Integer, ByRef Pt End If End Function + +Private Function EgtGetCurveCompoJointCount_32(nId As Integer) As Integer +End Function + +Private Function EgtGetCurveCompoJointCount_64(nId As Integer) As Integer +End Function +Public Function EgtGetCurveCompoJointCount(nId As Integer) As Integer + If IntPtr.Size = 4 Then + Return EgtGetCurveCompoJointCount_32(nId) + Else + Return EgtGetCurveCompoJointCount_64(nId) + End If +End Function + Private Function EgtRemoveCurveCompoJoint_32(nId As Integer, nU As Integer) As Boolean End Function @@ -4808,6 +4839,20 @@ Public Function EgtCurveLengthAtPoint(nId As Integer, ptOn As Point3d, ByRef dLe Return EgtCurveLengthAtPoint(nId, ptOn, 0, dLen) End Function + +Private Function EgtCurveAreaXY_32(nId As Integer, ByRef dArea As Double) As Boolean +End Function + +Private Function EgtCurveAreaXY_64(nId As Integer, ByRef dArea As Double) As Boolean +End Function +Public Function EgtCurveAreaXY(nId As Integer, ByRef dArea As Double) As Boolean + If IntPtr.Size = 4 Then + Return EgtCurveAreaXY_32(nId, dArea) + Else + Return EgtCurveAreaXY_64(nId, dArea) + End If +End Function + Private Function EgtCurveNearestExtremityToPoint_32(nId As Integer, ByRef ptP As Point3d, ByRef bStart As Boolean) As Boolean End Function @@ -5090,6 +5135,20 @@ Public Function EgtAdjustFlatPartLayer(nLayerId As Integer) As Boolean End If End Function + +Private Function EgtCalcFlatPartDownRegion_32(nPartId As Integer, dH As Double) As Boolean +End Function + +Private Function EgtCalcFlatPartDownRegion_64(nPartId As Integer, dH As Double) As Boolean +End Function +Public Function EgtCalcFlatPartDownRegion(nPartId As Integer, dH As Double) As Boolean + If IntPtr.Size = 4 Then + Return EgtCalcFlatPartDownRegion_32(nPartId, dH) + Else + Return EgtCalcFlatPartDownRegion_64(nPartId, dH) + End If +End Function + Private Function EgtPackBoxCluster_32(vId As Integer(), nCount As Integer, dXmin As Double, dYmin As Double, dXmax As Double, dYmax As Double, dOffs As Double, bBottomUp As Boolean) As Boolean @@ -5173,37 +5232,51 @@ Public Function EgtGetPartBBoxGlob(nPartId As Integer, ByRef PtMin As Point3d, B End If End Function - -Private Function EgtCreateOutRegion_32(nParentId As Integer, - dXmin As Double, dYmin As Double, - dXmax As Double, dYmax As Double, dZ As Double) As Boolean + +Private Function EgtCreateOutRegionRectangle_32(nParentId As Integer, + dXmin As Double, dYmin As Double, + dXmax As Double, dYmax As Double, dZ As Double) As Boolean End Function - -Private Function EgtCreateOutRegion_64(nParentId As Integer, - dXmin As Double, dYmin As Double, - dXmax As Double, dYmax As Double, dZ As Double) As Boolean + +Private Function EgtCreateOutRegionRectangle_64(nParentId As Integer, + dXmin As Double, dYmin As Double, + dXmax As Double, dYmax As Double, dZ As Double) As Boolean End Function -Public Function EgtCreateOutRegion(nParentId As Integer, - dXmin As Double, dYmin As Double, - dXmax As Double, dYmax As Double, dZ As Double) As Boolean +Public Function EgtCreateOutRegionRectangle(nParentId As Integer, + dXmin As Double, dYmin As Double, + dXmax As Double, dYmax As Double, dZ As Double) As Boolean If IntPtr.Size = 4 Then - Return EgtCreateOutRegion_32(nParentId, dXmin, dYmin, dXmax, dYmax, dZ) + Return EgtCreateOutRegionRectangle_32(nParentId, dXmin, dYmin, dXmax, dYmax, dZ) Else - Return EgtCreateOutRegion_64(nParentId, dXmin, dYmin, dXmax, dYmax, dZ) + Return EgtCreateOutRegionRectangle_64(nParentId, dXmin, dYmin, dXmax, dYmax, dZ) End If End Function - -Private Function EgtCreateOutRegion2_32(nParentId As Integer, nOutCrvId As Integer) As Boolean + +Private Function EgtCreateOutRegion_32(nParentId As Integer, nOutCrvId As Integer) As Boolean End Function - -Private Function EgtCreateOutRegion2_64(nParentId As Integer, nOutCrvId As Integer) As Boolean + +Private Function EgtCreateOutRegion_64(nParentId As Integer, nOutCrvId As Integer) As Boolean End Function Public Function EgtCreateOutRegion(nParentId As Integer, nOutCrvId As Integer) As Boolean If IntPtr.Size = 4 Then - Return EgtCreateOutRegion2_32(nParentId, nOutCrvId) + Return EgtCreateOutRegion_32(nParentId, nOutCrvId) Else - Return EgtCreateOutRegion2_64(nParentId, nOutCrvId) + Return EgtCreateOutRegion_64(nParentId, nOutCrvId) + End If +End Function + + +Private Function EgtCreateDamagedRegion_32(nParentId As Integer, nDmgCrvId As Integer) As Boolean +End Function + +Private Function EgtCreateDamagedRegion_64(nParentId As Integer, nDmgCrvId As Integer) As Boolean +End Function +Public Function EgtCreateDamagedRegion(nParentId As Integer, nDmgCrvId As Integer) As Boolean + If IntPtr.Size = 4 Then + Return EgtCreateDamagedRegion_32(nParentId, nDmgCrvId) + Else + Return EgtCreateDamagedRegion_64(nParentId, nDmgCrvId) End If End Function @@ -5230,59 +5303,55 @@ Public Function EgtVerifyPart(nPartId As Integer, bReducedCut As Boolean) As Boo End If End Function - -Private Function EgtPackPartCluster_32(vId As Integer(), nCount As Integer, bReducedCut As Boolean, - dXmin As Double, dYmin As Double, - dXmax As Double, dYmax As Double, bBottomUp As Boolean) As Boolean + +Private Function EgtPackPartClusterInRectangle_32(vId As Integer(), nCount As Integer, + bReducedCut As Boolean, bBottomUp As Boolean) As Boolean End Function - -Private Function EgtPackPartCluster_64(vId As Integer(), nCount As Integer, bReducedCut As Boolean, - dXmin As Double, dYmin As Double, - dXmax As Double, dYmax As Double, bBottomUp As Boolean) As Boolean + +Private Function EgtPackPartClusterInRectangle_64(vId As Integer(), nCount As Integer, + bReducedCut As Boolean, bBottomUp As Boolean) As Boolean End Function -Public Function EgtPackPartCluster(vId As Integer(), bReducedCut As Boolean, - dXmin As Double, dYmin As Double, - dXmax As Double, dYmax As Double, bBottomUp As Boolean) As Boolean +Public Function EgtPackPartClusterInRectangle(vId As Integer(), bReducedCut As Boolean, + bBottomUp As Boolean) As Boolean If IntPtr.Size = 4 Then - Return EgtPackPartCluster_32(vId, vId.Count(), bReducedCut, dXmin, dYmin, dXmax, dYmax, bBottomUp) + Return EgtPackPartClusterInRectangle_32(vId, vId.Count(), bReducedCut, bBottomUp) Else - Return EgtPackPartCluster_64(vId, vId.Count(), bReducedCut, dXmin, dYmin, dXmax, dYmax, bBottomUp) + Return EgtPackPartClusterInRectangle_64(vId, vId.Count(), bReducedCut, bBottomUp) End If End Function -Public Function EgtPackPart(nPartId As Integer, bReducedCut As Boolean, - dXmin As Double, dYmin As Double, - dXmax As Double, dYmax As Double, bBottomUp As Boolean) As Boolean +Public Function EgtPackPartInRectangle(nPartId As Integer, bReducedCut As Boolean, + bBottomUp As Boolean) As Boolean Dim vId(0) As Integer vId(0) = nPartId If IntPtr.Size = 4 Then - Return EgtPackPartCluster_32(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax, bBottomUp) + Return EgtPackPartClusterInRectangle_32(vId, 1, bReducedCut, bBottomUp) Else - Return EgtPackPartCluster_64(vId, 1, bReducedCut, dXmin, dYmin, dXmax, dYmax, bBottomUp) + Return EgtPackPartClusterInRectangle_64(vId, 1, bReducedCut, bBottomUp) End If End Function - -Private Function EgtPackPartCluster2_32(vId As Integer(), nCount As Integer, bReducedCut As Boolean, + +Private Function EgtPackPartCluster_32(vId As Integer(), nCount As Integer, bReducedCut As Boolean, bBottomUp As Boolean) As Boolean End Function - -Private Function EgtPackPartCluster2_64(vId As Integer(), nCount As Integer, bReducedCut As Boolean, + +Private Function EgtPackPartCluster_64(vId As Integer(), nCount As Integer, bReducedCut As Boolean, bBottomUp As Boolean) As Boolean End Function Public Function EgtPackPartCluster(vId As Integer(), bReducedCut As Boolean, bBottomUp As Boolean) As Boolean If IntPtr.Size = 4 Then - Return EgtPackPartCluster2_32(vId, vId.Count(), bReducedCut, bBottomUp) + Return EgtPackPartCluster_32(vId, vId.Count(), bReducedCut, bBottomUp) Else - Return EgtPackPartCluster2_64(vId, vId.Count(), bReducedCut, bBottomUp) + Return EgtPackPartCluster_64(vId, vId.Count(), bReducedCut, bBottomUp) End If End Function Public Function EgtPackPart(nPartId As Integer, bReducedCut As Boolean, bBottomUp As Boolean) As Boolean Dim vId(0) As Integer vId(0) = nPartId If IntPtr.Size = 4 Then - Return EgtPackPartCluster2_32(vId, 1, bReducedCut, bBottomUp) + Return EgtPackPartCluster_32(vId, 1, bReducedCut, bBottomUp) Else - Return EgtPackPartCluster2_64(vId, 1, bReducedCut, bBottomUp) + Return EgtPackPartCluster_64(vId, 1, bReducedCut, bBottomUp) End If End Function @@ -6982,6 +7051,20 @@ Public Function EgtSetMachiningParam(nType As Integer, dVal As Double) As Boolea End If End Function + +Private Function EgtSetMachiningParamString_32(nType As Integer, sVal As String) As Boolean +End Function + +Private Function EgtSetMachiningParamString_64(nType As Integer, sVal As String) As Boolean +End Function +Public Function EgtSetMachiningParam(nType As Integer, sVal As String) As Boolean + If IntPtr.Size = 4 Then + Return EgtSetMachiningParamString_32(nType, sVal) + Else + Return EgtSetMachiningParamString_64(nType, sVal) + End If +End Function + Private Function EgtPreviewMachining_32(bRecalc As Boolean) As Boolean End Function @@ -7038,6 +7121,29 @@ Public Function EgtGetMachiningParam(nType As Integer, ByRef dVal As Double) As End If End Function + +Private Function EgtGetMachiningParamString_32(nType As Integer, ByRef psVal As IntPtr) As Boolean +End Function + +Private Function EgtGetMachiningParamString_64(nType As Integer, ByRef psVal As IntPtr) As Boolean +End Function +Public Function EgtGetMachiningParam(nType As Integer, ByRef sVal As String) As Boolean + Dim psVal As IntPtr + Dim bOk As Boolean + If IntPtr.Size = 4 Then + bOk = EgtGetMachiningParamString_32(nType, psVal) + Else + bOk = EgtGetMachiningParamString_64(nType, psVal) + End If + If bOk Then + sVal = Marshal.PtrToStringUni(psVal) + EgtFreeMemory(psVal) + Else + sVal = String.Empty + End If + Return bOk +End Function + Private Function EgtGetMachiningGeometry_32(nInd As Integer, ByRef nId As Integer, ByRef nSub As Integer) As Boolean End Function @@ -7310,6 +7416,20 @@ Public Function EgtSetAxisPos(sAxis As String, dVal As Double) As Boolean End If End Function + +Private Function EgtLoadTool_32(sHead As String, nExit As Integer, sTool As String) As Boolean +End Function + +Private Function EgtLoadTool_64(sHead As String, nExit As Integer, sTool As String) As Boolean +End Function +Public Function EgtLoadTool(sHead As String, nExit As Integer, sTool As String) As Boolean + If IntPtr.Size = 4 Then + Return EgtLoadTool_32(sHead, nExit, sTool) + Else + Return EgtLoadTool_64(sHead, nExit, sTool) + End If +End Function + Private Function EgtSetMachineLook_32(nFlag As Integer) As Boolean End Function @@ -9000,6 +9120,7 @@ Public Enum MCH_GP As Integer EXTRALONCUTREG = 16385 EXTRARONDRIREG = 16386 HOLEDIAMTOLER = 16387 + EXTSAWARCMINRAD = 16388 End Enum 'Costanti : parametri delle lavorazioni Public Enum MCH_MP As Integer diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 84d2c03..e803a66 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + +