DataWall 2.5c2 :

- aggiunta possibilità di spostare grezzo da corner di riferimento anche in X.
DataWall 2.5c1 :
2023-03-08 08:45:44 +01:00 · 2023-03-02 12:13:40 +01:00 · 2023-02-28 15:13:33 +01:00 · 2023-02-27 17:33:17 +01:00 · 2023-02-27 17:32:51 +01:00 · 2023-01-24 12:47:48 +01:00
12 changed files with 81 additions and 139 deletions
@@ -13,12 +13,9 @@
 /Debug64
 /Release64
 /ipch
-/bin
 /obj
 /.vs
-/32/*.lua
-/32/LuaLibs/*.lua
-/32/Images/*.png
-/64/*.lua
-/64/LuaLibs/*.lua
-/64/Images/*.png
+/bin/*.lua
+/bin/*.ini
+/bin/LuaLibs/*.lua
+/bin/Images/*.png
@@ -7,60 +7,33 @@ variables:
 NET_USERQ: 'steamw\egalware'

 #Note compilazione LUA:
-# lua53 -o 32\$FileName -s $FileName: -o = output, -s = NON include i debug symbols
+# lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols

-# helper compilazione LUA a 32 bit
-.LuaCompile32: &LuaCompile32
+# helper compilazione LUA a 32 e 64 bit
+.LuaCompile: &LuaCompile
  - |
-    Set-Alias lua53  C:\Tools\Lua32\luac53
+    Set-Alias lua54  C:\Tools\Lua32\luac54
    echo "Copia file *.ini"
    $FileList = Get-ChildItem("*.ini")
    ForEach ($File in $FileList) {
      $FileName = Split-Path $File -leaf
-      Copy-Item -Path $FileName -Destination 32\$FileName
-      echo "Copy-Item -Path $FileName -Destination 32\$FileName"
+      Copy-Item -Path $FileName -Destination bin\$FileName
+      echo "Copy-Item -Path $FileName -Destination bin\$FileName"
    }
-    echo "Compilazione file *.lua 32bit"
+    echo "Compilazione file *.lua 32/64bit"
    $FileList = Get-ChildItem("*.lua")
    ForEach ($File in $FileList) {
      $FileName = Split-Path $File -leaf
-      lua53 -o 32\$FileName $FileName
-      echo "lua53 -o 32\$FileName $FileName"
+      lua54 -o bin\$FileName $FileName
+      echo "lua54 -o bin\$FileName $FileName"
    }
    $FileList = Get-ChildItem("LuaLibs\*.lua")
    ForEach ($File in $FileList) {
      $FileName = Split-Path $File -leaf
-      lua53 -o 32\LuaLibs\$FileName LuaLibs\$FileName
-      echo "lua53 -o 32\LuaLibs\$FileName LuaLibs\$FileName"
+      lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName
+      echo "lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName"
    }

-# helper compilazione LUA a 64 bit
-.LuaCompile64: &LuaCompile64
-  - |
-    Set-Alias lua53  C:\Tools\Lua64\luac53
-    echo "Copia file *.ini"
-    $FileList = Get-ChildItem("*.ini")
-    ForEach ($File in $FileList) {
-      $FileName = Split-Path $File -leaf
-      Copy-Item -Path $FileName -Destination 64\$FileName
-      echo "Copy-Item -Path $FileName -Destination 64\$FileName"
-    }
-    echo "Compilazione file *.lua 64bit"
-    $FileList = Get-ChildItem("*.lua")
-    ForEach ($File in $FileList) {
-      $FileName = Split-Path $File -leaf
-      lua53 -o 64\$FileName $FileName
-      echo "lua53 -o 64\$FileName $FileName"
-    }
-    $FileList = Get-ChildItem("LuaLibs\*.lua")
-    ForEach ($File in $FileList) {
-      $FileName = Split-Path $File -leaf
-      lua53 -o 64\LuaLibs\$FileName LuaLibs\$FileName
-      echo "lua53 -o 64\LuaLibs\$FileName LuaLibs\$FileName"
-    }
-
-#      Copy-Item -Path $FileName -Destination 64\$FileName
-#      echo "Copy-Item -Path $FileName -Destination 64\$FileName"
 # helper copia SORGENTI verso cartella di rete R:\ dei SORGENTI
 .CodeReplicaR: &CodeReplicaR
  - |
@@ -70,28 +43,23 @@ variables:
    SLEEP 2
    net use R: /delete

-
-# helper copia script verso cartella di rete R:\ delle cartelle 32 e 64
+# helper copia script verso cartella di rete R:\ delle cartelle bin
 .ReplicaR: &ReplicaR
  - |
    net use R: /delete
    net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
-    ROBOCOPY /MIR 32 R:\EgtData\$env:APP_NAME\32
-    ROBOCOPY /MIR 64 R:\EgtData\$env:APP_NAME\64
-    ROBOCOPY /MIR Images R:\EgtData\$env:APP_NAME\32\Images
-    ROBOCOPY /MIR Images R:\EgtData\$env:APP_NAME\64\Images
+    ROBOCOPY /MIR bin R:\EgtData\$env:APP_NAME\bin
+    ROBOCOPY /MIR Images R:\EgtData\$env:APP_NAME\bin\Images
    SLEEP 2
    net use R: /delete

-# helper copia script verso cartella di rete R:\ delle cartelle 32 e 64
+# helper copia script verso cartella di rete R:\ delle cartelle bin
 .ReplicaZ: &ReplicaZ
  - |
    net use Z: /delete
    net use Z: $env:NET_SHARE_Z /u:$env:NET_USERQ $ZDRIVE_PASSWD
-    ROBOCOPY /MIR 32 Z:\EgtData\$env:APP_NAME\32
-    ROBOCOPY /MIR 64 Z:\EgtData\$env:APP_NAME\64
-    ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\32\Images
-    ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\64\Images
+    ROBOCOPY /MIR bin Z:\EgtData\$env:APP_NAME\bin
+    ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\bin\Images
    SLEEP 2
    net use Z: /delete

@@ -100,15 +68,13 @@ stages:

 LuaCompile:build:
 stage: build
-# only:
-#   - main
-#   - master
+ only:
+   - main
+   - master
 tags:
   - win
 script:    
-   - *LuaCompile32
-   - *LuaCompile64
+   - *LuaCompile
   - *CodeReplicaR
   - *ReplicaR
   - *ReplicaZ
-   
@@ -1,53 +1,29 @@

-REM Compilazione degli script Wall Egaltech                         2022.05.09
+REM Compilazione degli script Wall Egaltech                         2023.02.27
 REM Per togliere info di debug aggiungere flag -s prima del nome del file di input

-REM Compilazione 32 bit
+REM Compilazione 32 e 64 bit

-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WallExec.lua                      LuaLibs\WallExec.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WallLib.lua                       LuaLibs\WallLib.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WMachiningLib.lua                 LuaLibs\WMachiningLib.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessCut.lua                   LuaLibs\WProcessCut.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessDoubleCut.lua             LuaLibs\WProcessDoubleCut.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessDrill.lua                 LuaLibs\WProcessDrill.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessDtMortise.lua             LuaLibs\WProcessDtMortise.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessFreeContour.lua           LuaLibs\WProcessFreeContour.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessLapJoint.lua              LuaLibs\WProcessLapJoint.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessMark.lua                  LuaLibs\WProcessMark.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessMortise.lua               LuaLibs\WProcessMortise.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessSawCut.lua                LuaLibs\WProcessSawCut.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessText.lua                  LuaLibs\WProcessText.lua
-\EgtProg\Dll32\luac53 -o 32\LuaLibs\WProcessVariant.lua               LuaLibs\WProcessVariant.lua
-\EgtProg\Dll32\luac53 -o 32\BatchProcess.lua                          BatchProcess.lua
-\EgtProg\Dll32\luac53 -o 32\BatchProcessNew.lua                       BatchProcessNew.lua
-\EgtProg\Dll32\luac53 -o 32\GetWallData.lua                           GetWallData.lua
-\EgtProg\Dll32\luac53 -o 32\NestFlipAndRotate.lua                     NestFlipAndRotate.lua
-\EgtProg\Dll32\luac53 -o 32\NestProcess.lua                           NestProcess.lua
-\EgtProg\Dll32\luac53 -o 32\Overturn.lua                              Overturn.lua
-\EgtProg\Dll32\luac53 -o 32\Process.lua                               Process.lua
-\EgtProg\Dll32\luac53 -o 32\Rotate.lua                                Rotate.lua
-
-REM Compilazione 64 bit
-
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WallExec.lua                      LuaLibs\WallExec.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WallLib.lua                       LuaLibs\WallLib.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WMachiningLib.lua                 LuaLibs\WMachiningLib.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessCut.lua                   LuaLibs\WProcessCut.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessDoubleCut.lua             LuaLibs\WProcessDoubleCut.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessDrill.lua                 LuaLibs\WProcessDrill.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessDtMortise.lua             LuaLibs\WProcessDtMortise.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessFreeContour.lua           LuaLibs\WProcessFreeContour.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessLapJoint.lua              LuaLibs\WProcessLapJoint.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessMark.lua                  LuaLibs\WProcessMark.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessMortise.lua               LuaLibs\WProcessMortise.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessSawCut.lua                LuaLibs\WProcessSawCut.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessText.lua                  LuaLibs\WProcessText.lua
-\EgtProg\Dll64\luac53 -o 64\LuaLibs\WProcessVariant.lua               LuaLibs\WProcessVariant.lua
-\EgtProg\Dll64\luac53 -o 64\BatchProcess.lua                          BatchProcess.lua
-\EgtProg\Dll64\luac53 -o 64\BatchProcessNew.lua                       BatchProcessNew.lua
-\EgtProg\Dll64\luac53 -o 64\GetWallData.lua                           GetWallData.lua
-\EgtProg\Dll64\luac53 -o 64\NestFlipAndRotate.lua                     NestFlipAndRotate.lua
-\EgtProg\Dll64\luac53 -o 64\NestProcess.lua                           NestProcess.lua
-\EgtProg\Dll64\luac53 -o 64\Overturn.lua                              Overturn.lua
-\EgtProg\Dll64\luac53 -o 64\Process.lua                               Process.lua
-\EgtProg\Dll64\luac53 -o 64\Rotate.lua                                Rotate.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WallExec.lua                      LuaLibs\WallExec.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WallLib.lua                       LuaLibs\WallLib.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WMachiningLib.lua                 LuaLibs\WMachiningLib.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessCut.lua                   LuaLibs\WProcessCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessDoubleCut.lua             LuaLibs\WProcessDoubleCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessDrill.lua                 LuaLibs\WProcessDrill.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessDtMortise.lua             LuaLibs\WProcessDtMortise.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessFreeContour.lua           LuaLibs\WProcessFreeContour.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessLapJoint.lua              LuaLibs\WProcessLapJoint.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessMark.lua                  LuaLibs\WProcessMark.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessMortise.lua               LuaLibs\WProcessMortise.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessSawCut.lua                LuaLibs\WProcessSawCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessText.lua                  LuaLibs\WProcessText.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\WProcessVariant.lua               LuaLibs\WProcessVariant.lua
+\EgtProg\Dll32\luac54 -o bin\BatchProcess.lua                          BatchProcess.lua
+\EgtProg\Dll32\luac54 -o bin\BatchProcessNew.lua                       BatchProcessNew.lua
+\EgtProg\Dll32\luac54 -o bin\GetWallData.lua                           GetWallData.lua
+\EgtProg\Dll32\luac54 -o bin\NestFlipAndRotate.lua                     NestFlipAndRotate.lua
+\EgtProg\Dll32\luac54 -o bin\NestProcess.lua                           NestProcess.lua
+\EgtProg\Dll32\luac54 -o bin\Overturn.lua                              Overturn.lua
+\EgtProg\Dll32\luac54 -o bin\Process.lua                               Process.lua
+\EgtProg\Dll32\luac54 -o bin\Rotate.lua                                Rotate.lua
+\EgtProg\Dll32\luac54 -o bin\Version.lua                               Version.lua
@@ -1,4 +1,4 @@
-- ProcessFreeContour.lua by Egaltech s.r.l. 2022/08/29
+-- ProcessFreeContour.lua by Egaltech s.r.l. 2023/03/02
 -- Gestione calcolo profilo libero per Pareti
 -- 2021/11/15 Penna e chiodature sono sempre riportate sulla faccia sopra anche se nel progetto sono sotto.
 -- 2021/12/10 In taglio con lama aggiunta gestione SCC per testa Gearbox.
@@ -14,6 +14,7 @@
 -- 2022/08/29 Corretta gestione tipo Pocket senza fondo (sono lavorabili da entrambe le parti con fresatura).
 -- 2022/12/13 Aggiunta la funzione Is3EdgesApprox per riconoscere come 3 lati anche facce con lati aggiuntivi molto corti (<15 mm)
 -- 2022/12/14 Aggiunto l'accorciamento della lama in caso di facce vicine orientate verso il basso
+-- 2023/02/28 In lavorazioni con sega a catena per invertire lato mandrino ora Invert + Left invece di MCH_SCC.OPPOSITE.

 -- Tabella per definizione modulo
 local WPF = {}
@@ -1714,23 +1715,22 @@ local function AddSawings( sSawing, vFace, Proc, nRawId, b3Raw)
         local dEal = vFace[i].Whisk - vFace[i].Len - dSawDiam / 2
         EgtSetMachiningParam( MCH_MP.STARTADDLEN, dSal)
         EgtSetMachiningParam( MCH_MP.ENDADDLEN, dEal)
-         -- percorso da non invertire
-         EgtSetMachiningParam( MCH_MP.INVERT, false)
         -- assegno utilizzo faccia
         EgtSetMachiningParam( MCH_MP.FACEUSE, MCH_MILL_FU.PARAL_DOWN)
         -- imposto angolo 3° asse rot
         EgtSetMachiningParam( MCH_MP.BLOCKEDAXIS, sRot3Ang)
         -- assegno affondamento
         EgtSetMachiningParam( MCH_MP.DEPTH, dDepth)
-         -- assegno lato di lavoro
-         EgtSetMachiningParam( MCH_MP.WORKSIDE, MCH_MILL_WS.RIGHT)
-         -- posizione braccio porta testa
+         -- assegno lato di lavoro e inversione direzione movimento
         if vFace[i].Norm:getX() < 0.018 then 
-            EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.NONE)
+            EgtSetMachiningParam( MCH_MP.INVERT, false)
+            EgtSetMachiningParam( MCH_MP.WORKSIDE, MCH_MILL_WS.RIGHT)
         else
-            EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.OPPOSITE)
-            EgtSetMachiningParam( MCH_MP.OFFSR, dSawThick)
+            EgtSetMachiningParam( MCH_MP.INVERT, true)
+            EgtSetMachiningParam( MCH_MP.WORKSIDE, MCH_MILL_WS.LEFT)
         end
+         -- posizione braccio porta testa
+         EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.NONE)
         -- eseguo
         if not EgtApplyMachining( true, false) then
            local _, sErr = EgtGetLastMachMgrError()
@@ -1766,23 +1766,22 @@ local function AddSawings( sSawing, vFace, Proc, nRawId, b3Raw)
         end
         EgtSetMachiningParam( MCH_MP.STARTADDLEN, dSal)
         EgtSetMachiningParam( MCH_MP.ENDADDLEN, dEal)
-         -- percorso da non invertire
-         EgtSetMachiningParam( MCH_MP.INVERT, false)
         -- assegno utilizzo faccia
         EgtSetMachiningParam( MCH_MP.FACEUSE, MCH_MILL_FU.PARAL_DOWN)
         -- imposto angolo 3° asse rot
         EgtSetMachiningParam( MCH_MP.BLOCKEDAXIS, sRot3Ang)
         -- assegno affondamento
         EgtSetMachiningParam( MCH_MP.DEPTH, dDepth)
-         -- assegno lato di lavoro
-         EgtSetMachiningParam( MCH_MP.WORKSIDE, MCH_MILL_WS.RIGHT)
-         -- posizione braccio porta testa
-         if vFace[i].Norm:getX() < 0.018 then 
-            EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.NONE)
+         -- assegno lato di lavoro e inversione direzione movimento
+         if vFace[i].Norm:getX() < 0.018 then
+            EgtSetMachiningParam( MCH_MP.INVERT, false)
+            EgtSetMachiningParam( MCH_MP.WORKSIDE, MCH_MILL_WS.RIGHT)
         else
-            EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.OPPOSITE)
-            EgtSetMachiningParam( MCH_MP.OFFSR, dSawThick)
+            EgtSetMachiningParam( MCH_MP.INVERT, true)
+            EgtSetMachiningParam( MCH_MP.WORKSIDE, MCH_MILL_WS.LEFT)
         end
+         -- posizione braccio porta testa
+         EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.NONE)
         -- eseguo
         if not EgtApplyMachining( true, false) then
            local _, sErr = EgtGetLastMachMgrError()
@@ -2036,7 +2035,7 @@ local function MakeByCut( Proc, nRawId, b3Raw)
      end
   -- altrimenti provo con la sega a catena
   elseif sSawing then
-      local nCsOk, sCSErr, dThick = AddSawings( sSawing, vFace, Proc, nRawId, b3Raw)
+      local nCsOk, sCsErr, dThick = AddSawings( sSawing, vFace, Proc, nRawId, b3Raw)
      if nCsOk == 0 then return false, sCsErr end
      bDone = ( dThick ~= nil)
      -- se ci sono almeno due facce e lavorato almeno un angolo
@@ -90,7 +90,7 @@ function WPMK.Make( Proc, nRawId, b3Raw)
   local b3Tab = EgtGetTableArea()
   local dMaxZTable = b3Tab:getMax():getZ()
   local dDeltaZ = dMinZRaw - dMaxZTable
-   local MIN_Z_OFFSET = 100
+   local MIN_Z_OFFSET = 99.9
   if vtExtr:getZ() < WD.NZ_MINA then
      if dDeltaZ < MIN_Z_OFFSET - GEO.EPS_SMALL or vtExtr:getZ() <= -0.1 then
         local sErr = 'Error : Mark from bottom impossible'
@@ -51,7 +51,7 @@ function WPM.Classify( Proc, b3Raw)
      local b3Tab = EgtGetTableArea()
      local dMaxZTable = b3Tab:getMax():getZ()
      local dDeltaZ = dMinZRaw - dMaxZTable
-      local MIN_Z_OFFSET = 100
+      local MIN_Z_OFFSET = 99.9
      return EgtIf( dDeltaZ < MIN_Z_OFFSET - GEO.EPS_SMALL, vtN:getZ() > WD.NZ_MINA, vtN:getZ() > -0.1)
   end
 end
@@ -1,4 +1,4 @@
-- WallExec.lua by Egaltech s.r.l. 2022/05/12
+-- WallExec.lua by Egaltech s.r.l. 2023/03/06
 -- Libreria esecuzione lavorazioni per Pareti

 -- Tabella per definizione modulo
@@ -75,22 +75,22 @@ function WallExec.ProcessWalls( dRawL, dRawW, dRawH, vWall, bMachGroupOk, bNewPr
   end 
   if sOrigCorner == 'TL' then
      nCorner = MCH_CR.TL
-      OrigOnTab = Point3d( 0, b3Tab:getDimY() - abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
+      OrigOnTab = Point3d( 0 + abs( WD.DELTA_X or 0), b3Tab:getDimY() - abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
   elseif sOrigCorner == 'BL' then
      nCorner = MCH_CR.BL
-      OrigOnTab = Point3d( 0, abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
+      OrigOnTab = Point3d( 0 + abs( WD.DELTA_X or 0), abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
   elseif sOrigCorner == 'TR' then
      nCorner = MCH_CR.TR
-      OrigOnTab = Point3d( b3Tab:getDimX(), b3Tab:getDimY() - abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
+      OrigOnTab = Point3d( b3Tab:getDimX() - abs( WD.DELTA_X or 0), b3Tab:getDimY() - abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
   elseif sOrigCorner == 'BR' then
      nCorner = MCH_CR.BR
-      OrigOnTab = Point3d( b3Tab:getDimX(), abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
+      OrigOnTab = Point3d( b3Tab:getDimX() - abs( WD.DELTA_X or 0), abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
   elseif sOrigCorner == 'TM' then
      nCorner = MCH_CR.TR
-      OrigOnTab = Point3d( WD.MID_REF, b3Tab:getDimY() - abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
+      OrigOnTab = Point3d( WD.MID_REF - abs( WD.DELTA_X or 0), b3Tab:getDimY() - abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
   elseif sOrigCorner == 'BM' then
      nCorner = MCH_CR.BR
-      OrigOnTab = Point3d( WD.MID_REF, abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
+      OrigOnTab = Point3d( WD.MID_REF - abs( WD.DELTA_X or 0), abs( WD.DELTA_Y or 0), ( WD.DELTA_Z or 0))
   end
   -- Impostazione dell'attrezzaggio di default
   EgtImportSetup()
@@ -0,0 +1,4 @@
+-- Version.lua by Egalware s.r.l. 2023/03/02
+-- Gestione della versione di Wall
+
+VERSION = '2.5c2'
Author	SHA1	Message	Date
DarioS	0be8849f2e	DataWall 2.5c2 : - aggiunta possibilità di spostare grezzo da corner di riferimento anche in X.	2023-03-08 08:45:44 +01:00
DarioS	246f64e4ce	DataWall 2.5c1 : - corretto nome variabile restituzione stringa errore per sega a catena.	2023-03-02 12:13:40 +01:00
DarioS	de682d511c	DataWall 2.5b2 : - modifica a FreeContour con sega a catena per non usare MCH_SCC.OPPOSITE sostituiti con Invert e Left.	2023-02-28 15:13:33 +01:00
DarioS	bf08515edf	Merge branch 'master' of https://gitlab.steamware.net/egaltech/DataWall	2023-02-27 17:33:17 +01:00
DarioS	b0b5a7f91d	DataWall 2.5b1 : - aggiunto file Version.lua.	2023-02-27 17:32:51 +01:00
luca.mazzoleni	7cded14384	Improvement/SideMortisingAndMarking: - modificato valore di accettazione offset z a 99.9	2023-01-24 12:47:48 +01:00
luca.mazzoleni	2bf9d01c50	Merge branch 'develop'	2023-01-24 12:02:45 +01:00
DarioS	c654e00984	DataWall : - modifiche per lua54 e compilati unificati 32/64 bit solo bin.	2023-01-12 15:19:08 +01:00
luca.mazzoleni	f9f2b07489	Merge branch 'Improvement/SideMortisingAndMarking' into develop	2023-01-05 16:06:30 +01:00