Gestione primo taglio inclinato

2022-10-11 18:34:32 +02:00
parent 6b6031379b
commit 4ca3b4ee47
6 changed files with 79 additions and 9 deletions
@@ -391,6 +391,9 @@ Module ConstGen
   Public Function COL_MCH_DRIPCUT() As Color3d
      Return New Color3d(255, 0, 165)
   End Function
+   Public Function COL_MCH_ONENGRAVE_ANG() As Color3d
+      Return New Color3d(255, 255, 100)
+   End Function
   Public Function COL_MCH_DRIPFREE() As Color3d
      Return New Color3d(192, 0, 128)
   End Function
@@ -135,6 +135,7 @@ Module ConstIni
   Public Const K_ENGRAVEDEPTH As String = "EngraveDepth"
   Public Const K_ENGRAVEDEPTH2 As String = "EngraveDepth2"
   Public Const K_ENGRAVESHORT As String = "EngraveShort"
+   Public Const K_ENGRAVEANGLE As String = "EngraveAngle"
   Public Const K_DRIPOFFSET As String = "DripOffset"
   Public Const K_DRIPOFFSET2 As String = "DripOffset2"
   Public Const K_DRIPDEPTH As String = "DripDepth"
@@ -64,7 +64,7 @@
               <ToggleButton Name="DimensionBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowToggleButton}" Visibility="Collapsed"/>
            </Grid>

-            <Grid Name="VariablesGrd" Grid.Row="1" Grid.ColumnSpan="2"/>
+            <Grid Name="VariablesGrd" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
            
            <Grid Name="MessageGrid" Grid.Row="2" Grid.ColumnSpan="2">
               <TextBlock Name="MessageTxBl" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
@@ -1255,6 +1255,8 @@ Public Class DrawPageUC
   Private Sub EngraveBtn_Click(sender As Object, e As RoutedEventArgs) Handles EngraveBtn.Click
      m_SceneButtons.MeasureBtn.IsChecked = False
      If EngraveBtn.IsChecked Then
+         ' Aumento lo spazio disponibile per inserirei i parametri (tolgo spazio ad eventuali messaggi)
+         Grid.SetRowSpan(VariablesGrd, 2)
         ' Imposto modalità
         m_SideAngleUC.m_Mode = SideAngleUC.ModeOpt.ENGRAVE
         If m_ActiveComponentPage = Pages.CompoDimension Then
@@ -1286,6 +1288,7 @@ Public Class DrawPageUC
         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
      Else
+         Grid.SetRowSpan(VariablesGrd, 2)
         VariablesGrd.Children.Remove(m_SideAngleUC)
         If m_PrevSideAnglePage = Pages.CompoDimension Then
            VariablesGrd.Children.Add(m_CompoDimension)
@@ -5,7 +5,7 @@
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
   mc:Ignorable="d" 
-   d:DesignHeight="597.1" d:DesignWidth="255.9">
+   d:DesignHeight="636.9" d:DesignWidth="255.9">

   <!-- Definizione della Grid Laterale -->
   <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
@@ -28,7 +28,7 @@
         <RowDefinition Height="1*"/>
         <RowDefinition Height="1*"/>
         <RowDefinition Height="0.2*"/>
-         <RowDefinition Height="4*"/>
+         <RowDefinition Height="5*"/>
         <!--<RowDefinition Height="0.5*"/>
         <RowDefinition Height="0.5*"/>
         <RowDefinition Height="0.5*"/>-->
@@ -135,7 +135,7 @@
                            Margin="0,0,0,-2"
                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>

-      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4">
+      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4" >
          <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1.5*"/>
                <ColumnDefinition Width="0.3*"/>
@@ -143,10 +143,11 @@
                <ColumnDefinition Width="0.6*"/>
            </Grid.ColumnDefinitions>
            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
            </Grid.RowDefinitions>

            <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
@@ -196,6 +197,16 @@
                                  Margin="0,0,0,-2"
                                  Width="85" Height="30"
               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="Parameter5TxBl" Grid.Row="4" Grid.ColumnSpan="2"
+               Text="Angolo"
+               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+            <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
+                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="4" 
+                                  Margin="0,0,0,-2"
+                                  Width="85" Height="30"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
        </Grid>

        <!--<TextBlock Name="Parameter1TxBl" Grid.Row="11" Text="Offset"
@@ -36,6 +36,7 @@ Public Class SideAngleUC
   Friend m_dDripDepth As Double = 10
   Friend m_dEngraveDepth2 As Double = 15
   Friend m_dDripShort As Double = 0
+   Friend m_dEngraveAngle As Double = 0

   Private CurrEntityDrip As DripEntity

@@ -106,6 +107,9 @@ Public Class SideAngleUC
         ' Accorciamento
         Parameter4TxBl.Visibility = Windows.Visibility.Hidden
         Parameter4TxBx.Visibility = Windows.Visibility.Hidden
+         ' Angolo 
+         Parameter5TxBl.Visibility = Windows.Visibility.Hidden
+         Parameter5TxBx.Visibility = Windows.Visibility.Hidden
      Else
         ' se aggiungo gli ENGRAVE e i DRIP

@@ -117,10 +121,12 @@ Public Class SideAngleUC
            GetAngleTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
            GetHeelTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
         Next
+
         ' Offset
         Parameter1TxBl.Visibility = Windows.Visibility.Visible
         Parameter1TxBx.Visibility = Windows.Visibility.Visible
         Parameter2TxBl.Visibility = Windows.Visibility.Visible
+
         ' Offset2
         If m_Mode <> ModeOpt.ENGRAVE Then
            Parameter2TxBx.Visibility = Windows.Visibility.Visible
@@ -131,6 +137,7 @@ Public Class SideAngleUC
            Parameter2aTxBx.Visibility = Windows.Visibility.Visible
            Parameter2bTxBx.Visibility = Windows.Visibility.Visible
         End If
+
         ' Affondamento
         Parameter3TxBl.Visibility = Windows.Visibility.Visible
         Parameter3TxBx.Visibility = Windows.Visibility.Visible
@@ -146,6 +153,17 @@ Public Class SideAngleUC
            Parameter4TxBx.Visibility = Windows.Visibility.Hidden
         End If

+         ' Angolo
+         If m_Mode = ModeOpt.ENGRAVE Then
+            ' modifico il nome del messaggio 
+            Parameter5TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 9)            ' Angolo
+            Parameter5TxBl.Visibility = Windows.Visibility.Visible
+            Parameter5TxBx.Visibility = Windows.Visibility.Visible
+         Else
+            Parameter5TxBl.Visibility = Windows.Visibility.Hidden
+            Parameter5TxBx.Visibility = Windows.Visibility.Hidden
+         End If
+
      End If

      ' Gestisco Checkbox e nomi in base al numero di lati inclinabili
@@ -167,11 +185,13 @@ Public Class SideAngleUC
         m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
         m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
         m_dEngraveDepth2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH2, 0, m_MainWindow.GetIniFile())
-         Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
+         m_dEngraveAngle = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEANGLE, 0, m_MainWindow.GetIniFile())
+         Parameter1TxBx.Text = LenToString(m_dDripOffset, 3)
         Parameter2aTxBx.Text = m_nEngrNbr2.ToString()
         Parameter2bTxBx.Text = LenToString( m_dDripOffset2, 3)
         Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
         Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
+         Parameter5TxBx.Text = LenToString(m_dEngraveAngle, 3)
      End If

      ' Aggiorno visualizzazione
@@ -501,6 +521,7 @@ Public Class SideAngleUC
         WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH, LenToString(m_dDripDepth, 3), m_MainWindow.GetIniFile())
         WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH2, LenToString(m_dEngraveDepth2, 3), m_MainWindow.GetIniFile())
         'WritePrivateProfileString( S_SIDES, K_ENGRAVESHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
+         WritePrivateProfileString(S_SIDES, K_ENGRAVEANGLE, LenToString(m_dEngraveAngle, 3), m_MainWindow.GetIniFile())
      End If

      EgtDraw()
@@ -881,11 +902,33 @@ Public Class SideAngleUC
         End While
      Else
         ' Assegno colore e attributi
+         Dim nInd As Integer = 0
         nCrvId = EgtGetFirstInGroup(DripLayer)
         While nCrvId <> GDB_ID.NULL
            EgtSetColor(nCrvId, COL_MCH_DRIPCUT())
            'EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
            EgtSetInfo(nCrvId, INFO_STRICT, If(m_dDripShort > EPS_SMALL, "3", "0"))
+            If nInd = 0 Then
+               EgtSetColor(nCrvId, COL_MCH_ONENGRAVE_ANG())
+               EgtSetInfo(nCrvId, INFO_SIDE_ANGLE, m_dEngraveAngle)
+               ' recupero il vettore di estrusione della curva e la direzione della curva
+               Dim vtAux As Vector3d
+               EgtStartVector(nCrvId, vtAux)
+               Dim vtExtrusion As Vector3d
+               EgtCurveExtrusion(nCrvId, vtExtrusion)
+               ' ruoto il vetottore nella nuova direzione
+               vtExtrusion.Rotate(vtAux, m_dEngraveAngle)
+               ' assegno il vettore di estrusione nella nuova direzione indicata (segno negativo perchè dentro il pezzo)
+               EgtModifyCurveExtrusion(nCrvId, vtExtrusion)
+               EgtModifyCurveThickness(nCrvId, -m_dDripDepth)
+            Else
+               If nInd = m_nEngrNbr2 Then
+                  nInd = -1
+               End If
+               EgtModifyCurveThickness(nCrvId, -m_dEngraveDepth2)
+            End If
+            nInd = nInd + 1
+            If nInd > m_nEngrNbr2 Then nInd = 0
            nCrvId = EgtGetNext(nCrvId)
         End While
      End If
@@ -1336,6 +1379,15 @@ Public Class SideAngleUC
      End If
   End Sub

+   Private Sub Parameter5TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter5TxBx.EgtClosed
+      If m_Mode = ModeOpt.ENGRAVE Then
+         ' Recupero il valore
+         StringToLen(Parameter5TxBx.Text, m_dEngraveAngle)
+         ' Creo le geometrie dei gocciolatoi
+         RefreshSideAngleText()
+      End If
+   End Sub
+
   Friend Sub ReLoadSideAnglePage()
      SideAngleUC_Loaded(Me, New RoutedEventArgs)
   End Sub