Egalware/OmagCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OmagCUT :

Browse Source 
- modifica per allungamento tagli inclinati
- corretto comando cancellazione file per Num Flexium
- aggiustamenti per modifiche filtro selezione.
This commit is contained in:
Dario Sassi
2016-09-27 18:24:21 +00:00
parent 3b157cf432
commit 8d489a744a
11 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CSVPage.xaml.vb
+1 -1
View File
@@ -72,7 +72,7 @@ Public Class CSVPage
Return
End If
' Verifico se selezionato indicativo di pezzo
EgtSetObjFilterForSelect(True, True, True, True, True)
EgtSetObjFilterForSelWin(True, True, True, True, True)
Dim nSel As Integer
EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
Dim nId As Integer = EgtGetFirstObjInSelWin()
DrawPageUC.xaml.vb
+1 -1
View File
@@ -173,7 +173,7 @@ Public Class DrawPageUC
Return
End If
' Verifico se selezionato indicativo di componente (wall, door o window)
EgtSetObjFilterForSelect(True, True, True, True, True)
EgtSetObjFilterForSelWin(True, True, True, True, True)
Dim nSel As Integer
EgtSelect(e.Location, 2 * Scene.DIM_SEL, 2 * Scene.DIM_SEL, nSel)
Dim sCompo As String = String.Empty
FrameCutPageUC.xaml.vb
+1 -1
View File
@@ -224,7 +224,7 @@ Public Class FrameCutPageUC
Return
End If
' Verifico se selezionato indicativo di pezzo
EgtSetObjFilterForSelect(True, True, True, True, True)
EgtSetObjFilterForSelWin(True, True, True, True, True)
Dim nSel As Integer
EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
Dim nId As Integer = EgtGetFirstObjInSelWin()
ImportPageUC.xaml.vb
+1 -1
View File
@@ -332,7 +332,7 @@ Public Class ImportPageUC
' Solo con il tasto sinistro e se stato NULL
If e.Button <> Windows.Forms.MouseButtons.Left Or Not ImportScene.IsStatusNull() Then Return
' Verifico se selezionato indicativo di pezzo
EgtSetObjFilterForSelect(True, True, True, True, True)
EgtSetObjFilterForSelWin(True, True, True, True, True)
Dim nSel As Integer
EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
Dim nId As Integer = EgtGetFirstObjInSelWin()
M_Num.vb
+3 -1
View File
@@ -1638,8 +1638,10 @@ Namespace Num
If n_ret <> 0 Then
EgtOutLog("Error: FileDelete error : " & n_ret.ToString())
Return n_ret
End If
Return n_ret
Return Manage_Transfer_NC_prog()
End Function
MachineCNPageUC.xaml.vb
+14 -2
View File
@@ -113,11 +113,23 @@ Public Class MachineCNPageUC
End Sub
Private Sub ActivateBtn_Click(sender As Object, e As RoutedEventArgs) Handles ActivateBtn.Click
m_CN.ActivateProgram(DULoadTxBx.Text) '900
If m_MainWindow.m_CNCommunication.m_nNCType = 1 Or m_MainWindow.m_CNCommunication.m_nNCType = 2 Then
Dim nName As Integer = 0
StringToInt(DULoadTxBx.Text, nName)
m_CN.ActivateProgram(nName) ' integer version
Else
m_CN.ActivateProgram(DULoadTxBx.Text) ' string version
End If
End Sub
Private Sub DeleteBtn_Click(sender As Object, e As RoutedEventArgs) Handles DeleteBtn.Click
m_CN.Delete_NC_prog(DULoadTxBx.Text)
Dim DeleteName As String = String.Empty
If m_MainWindow.m_CNCommunication.m_nNCType = 1 Or m_MainWindow.m_CNCommunication.m_nNCType = 2 Then
DeleteName = "%" & DULoadTxBx.Text
Else
DeleteName = DULoadTxBx.Text
End If
m_CN.Delete_NC_prog(DeleteName)
End Sub
Private Sub MDIConfirmBtn_Click(sender As Object, e As RoutedEventArgs) Handles MDIConfirmBtn.Click
MoveRawPartPage.xaml.vb
+1 -1
View File
@@ -121,7 +121,7 @@ Public Class MoveRawPartPage
' Gruppo dei grezzi
Dim nRawGroupId = EgtGetParent(EgtGetFirstRawPart())
' Verifico se selezionato indicativo di grezzo attivo
EgtSetObjFilterForSelect(True, True, True, True, True)
EgtSetObjFilterForSelWin(True, True, True, True, True)
Dim nSel As Integer
EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
Dim nId As Integer = EgtGetFirstObjInSelWin()
NestPageUC.xaml.vb
+1 -1
View File
@@ -97,7 +97,7 @@ Public Class NestPageUC
' Per default no drag
m_bDrag = False
' Verifico se selezionato indicativo di pezzo
EgtSetObjFilterForSelect(True, True, True, True, True)
EgtSetObjFilterForSelWin(True, True, True, True, True)
Dim nSel As Integer
EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
Dim nId As Integer = EgtGetFirstObjInSelWin()
RawPartPageUC.xaml.vb
+1 -1
View File
@@ -225,7 +225,7 @@ Public Class RawPartPageUC
' Verifico cosa selezionato
Dim nSolidId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_RAW_SOLID)
Dim nKerfId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_KERF)
EgtSetObjFilterForSelect(True, True, True, True, True)
EgtSetObjFilterForSelWin(True, True, True, True, True)
Dim nSel As Integer
EgtSelect(e.Location, 2 * Scene.DIM_SEL, 2 * Scene.DIM_SEL, nSel)
' Ricavo nome dell'entità selezionata e identificativo
SplitAuto.vb
+2 -1
View File
@@ -73,7 +73,8 @@ Public Module SplitAuto
Dim dEndAddLen As Double = -10
EgtGetMachiningParam(MCH_MP.ENDADDLEN, dEndAddLen)
' verifico se trasformabile in un taglio di separazione (almeno da un lato)
If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL And
'If Math.Abs(Mach.m_dSideAng) < EPS_ANG_SMALL And
If True And
(dStartAddLen > -EPS_SMALL Or dEndAddLen > -EPS_SMALL) And
Mach.m_sLay = NAME_OUTLOOP And Mach.m_nInterf = FMI_TYPE.NONE Then
Dim nRes As Integer = EgtVerifyCutAsSplitting(nOperId)
ToolsDbPageUC.xaml.vb
+1 -1
View File
@@ -568,7 +568,7 @@ Public Class ToolsDbPageUC
Return
End If
' Verifico se selezionato testo di quota
EgtSetObjFilterForSelect(False, False, False, False, True)
EgtSetObjFilterForSelWin(False, False, False, False, True)
Dim nSel As Integer
EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSel)
Dim nId As Integer = EgtGetFirstObjInSelWin()