diff --git a/ConstIni.vb b/ConstIni.vb index 5d78fb7..d094e99 100644 --- a/ConstIni.vb +++ b/ConstIni.vb @@ -101,6 +101,9 @@ Module ConstIni Public Const K_RAWOFFSY As String = "OffsY" Public Const K_RAWKERF As String = "Kerf" + Public Const S_RAWMOVE As String = "RawMove" + Public Const K_RAWSTEP As String = "Step" + Public Const S_CAMERA As String = "Camera" Public Const K_CAM_EXEPATH As String = "ExePath" Public Const K_CAM_IMAGE As String = "Image" diff --git a/MoveRawPartPage.xaml.vb b/MoveRawPartPage.xaml.vb index c627292..a83daea 100644 --- a/MoveRawPartPage.xaml.vb +++ b/MoveRawPartPage.xaml.vb @@ -8,6 +8,8 @@ Public Class MoveRawPartPage Private m_bActive As Boolean = False ' Fase corrente Private m_nCurrPhase As Integer = 0 + ' Dati movimento + Private m_dStep As Double = 0 Private Sub MoveRawPartPage_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC @@ -81,6 +83,9 @@ Public Class MoveRawPartPage 'm_MainWindow.m_CurrentProjectPageUC.SaveFile(m_MainWindow.GetTempDir() & "\QQQQ.nge") ' Aggiorno visualizzazione EgtDraw() + ' carico i parametri di movimento + m_dStep = GetPrivateProfileDouble(S_RAWMOVE, K_RAWSTEP, 50, m_MainWindow.GetIniFile()) + StepMoveTxBx.Text = LenToString(m_dStep, 3) End Sub Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene @@ -127,33 +132,44 @@ Public Class MoveRawPartPage Private Sub UpBtn_Click(sender As Object, e As RoutedEventArgs) Handles UpBtn.Click Dim nRawId As Integer = EgtGetFirstSelectedObj() While nRawId <> GDB_ID.NULL - EgtMoveRawPart(nRawId, New Vector3d(0, 100, 0)) + EgtMoveRawPart(nRawId, New Vector3d(0, m_dStep, 0)) nRawId = EgtGetNextSelectedObj() End While + EgtDraw() End Sub Private Sub DownBtn_Click(sender As Object, e As RoutedEventArgs) Handles DownBtn.Click Dim nRawId As Integer = EgtGetFirstSelectedObj() While nRawId <> GDB_ID.NULL - EgtMoveRawPart(nRawId, New Vector3d(0, -100, 0)) + EgtMoveRawPart(nRawId, New Vector3d(0, -m_dStep, 0)) nRawId = EgtGetNextSelectedObj() End While + EgtDraw() End Sub Private Sub RightBtn_Click(sender As Object, e As RoutedEventArgs) Handles RightBtn.Click Dim nRawId As Integer = EgtGetFirstSelectedObj() While nRawId <> GDB_ID.NULL - EgtMoveRawPart(nRawId, New Vector3d(100, 0, 0)) + EgtMoveRawPart(nRawId, New Vector3d(m_dStep, 0, 0)) nRawId = EgtGetNextSelectedObj() End While + EgtDraw() End Sub Private Sub LeftBtn_Click(sender As Object, e As RoutedEventArgs) Handles LeftBtn.Click Dim nRawId As Integer = EgtGetFirstSelectedObj() While nRawId <> GDB_ID.NULL - EgtMoveRawPart(nRawId, New Vector3d(-100, 0, 0)) + EgtMoveRawPart(nRawId, New Vector3d(-m_dStep, 0, 0)) nRawId = EgtGetNextSelectedObj() End While + EgtDraw() + End Sub + + Private Sub StepMoveTxBx_EgtClosed(sender As Object, e As EventArgs) Handles StepMoveTxBx.EgtClosed + Dim dStep As Double + If StringToLen(StepMoveTxBx.Text, dStep) Then + m_dStep = Math.Max(dStep, 2 * EPS_SMALL) + End If End Sub Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click