Cambio colore sfondo per i parametri di lavorazione

This commit is contained in:
NicolaP
2021-10-08 18:11:15 +02:00
parent 2a07343685
commit bdefedae39
4 changed files with 40 additions and 9 deletions
+18 -6
View File
@@ -165,12 +165,13 @@
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.55*"/>
<RowDefinition Height="0.55*"/>
<RowDefinition Height="0.55*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<!--<RowDefinition Height="1*"/>-->
</Grid.RowDefinitions>
<!-- Altezza delle alette -->
<TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
Text="Offset"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
@@ -187,7 +188,7 @@
Width="60" Height="30" Margin="0,0,0,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<!-- Delta angolo (abilitato solo per i frontalini) -->
<TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
Text="Offset2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
@@ -205,7 +206,18 @@
HorizontalAlignment="Right"
Width="60" Height="30" Margin="0,0,0,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<!-- Spessore aletta -->
<TextBlock Name="Parameter5TxBl" Grid.Row="2" Grid.ColumnSpan="2"
Text="Offset2"
Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
<EgtWPFLib:EgtTextBox Name="Parameter5TxBx"
Grid.Column="2" Grid.Row="2"
HorizontalAlignment="Right"
Width="60" Height="30" Margin="0,0,0,0"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>
<!--Gestisco nello spazio di una TextBox due TextBoxs--><!--
<UniformGrid Rows="1" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Width="90" >
<EgtWPFLib:EgtTextBox Name="Parameter2aTxBx"
@@ -239,7 +251,7 @@
Width="85" Height="30"
Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
<UniformGrid Columns="2" Grid.ColumnSpan="4" Grid.Row="2">
<UniformGrid Columns="2" Grid.ColumnSpan="4" Grid.Row="3">
<!--questo bottone è stato creato solo per garantire il corretto allinaemento-->
<Button Name="Vuoto" Visibility="Hidden"/>
<!--Bottone per tornare indietro alla selezione di CompoInterni e Alz&Front-->
+12
View File
@@ -77,6 +77,7 @@ Public Class AlzFrontUC
' nome dei parametri condivisi
Parameter1TxBl.Text = "Altezza"
Parameter2TxBl.Text = "Delta angolo"
Parameter5TxBl.Text = "Spessore"
EgtZoom(ZM.ALL)
End Sub
@@ -98,6 +99,7 @@ Public Class AlzFrontUC
GetPrivateProfileString(S_ALZFRONT, K_FRONT_HEIGHT, "0", Parameter1FTxBx.Text, m_MainWindow.GetIniFile)
GetPrivateProfileString(S_ALZFRONT, K_ALZ_DELTA_ANG, "0", Parameter2ATxBx.Text, m_MainWindow.GetIniFile)
GetPrivateProfileString(S_ALZFRONT, K_FRONT_DELTA_ANG, "0", Parameter2FTxBx.Text, m_MainWindow.GetIniFile)
Parameter5TxBx.Text = Utility.LenToString(m_MainWindow.m_CurrentProjectPageUC.m_dRawHeight, 2)
' Imposto contesto corrente
EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
@@ -621,6 +623,13 @@ Public Class AlzFrontUC
LoadCurrentCompo()
End Sub
Private Sub Parameter5TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter5TxBx.EgtClosed
Dim dValue As Double
StringToDouble(Parameter5TxBx.Text, dValue)
' aggiorno il disegno
LoadCurrentCompo()
End Sub
#End Region ' Altezza, delta angolo di spoglia
#Region "METHODS"
@@ -756,6 +765,9 @@ Public Class AlzFrontUC
If StringToLen(Parameter2FTxBx.Text, dVal) Then
EgtLuaSetGlobNumVar("CMP.F_DeltaAng", dVal)
End If
If StringToLen(Parameter5TxBx.Text, dVal) Then
EgtLuaSetGlobNumVar("CMP.Thickness", dVal)
End If
' parametri per la scrittura dei caratteri
EgtLuaSetGlobNumVar("CMP.BBoxRad", m_dBBoxRad)
EgtLuaSetGlobNumVar("CMP.HeightText", m_dH)
+9 -2
View File
@@ -202,12 +202,19 @@
</Style>
<Style x:Key="OmagCut_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
<!--<Setter Property="Background" Value="#636974"/>
<Setter Property="BorderBrush" Value="#636974"/>-->
<!--<Setter Property="Background" Value="#636974" #3C3F48/>
<Setter Property="BorderBrush" Value="#636974" #3C3F48/>-->
<Setter Property="Background" Value="#3C3F48"/>
<Setter Property="BorderBrush" Value="#3C3F48"/>
</Style>
<Style x:Key="OmagCut_MachiningBorder" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
<!--<Setter Property="Background" Value="#636974" #3C3F48/>
<Setter Property="BorderBrush" Value="#636974" #3C3F48/>-->
<Setter Property="Background" Value="{StaticResource OmagCut_Blue}"/>
<Setter Property="BorderBrush" Value="#3C3F48"/>
</Style>
<Style x:Key="OmagCut_EmptyBorder" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
<Setter Property="CornerRadius" Value="{DynamicResource EmptyBorder_CornerRadius}"/>
+1 -1
View File
@@ -38,7 +38,7 @@
</Grid.RowDefinitions>
<!-- Definizione della Grid con le caratteristiche del progetto -->
<Border Name="CurrProjGrid" Style="{DynamicResource OmagCut_Border}" Grid.Row="0" >
<Border Name="CurrProjGrid" Style="{DynamicResource OmagCut_MachiningBorder}" Grid.Row="0" >
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>