Revert "Merge commit 'f1aae48a2b80f96ae94b59a69addd6cc6e48ee14'"

This reverts commit 1f49d0936e, reversing
changes made to 236eeac038.
This commit is contained in:
Dario Sassi
2025-03-21 19:21:02 +01:00
parent 1f49d0936e
commit 00a338c202
120 changed files with 6714 additions and 5977 deletions
+12 -14
View File
@@ -45,8 +45,7 @@ Public Class BeamMachiningsWindowVM
' se modificata, chiedo se salvare
If TableModified Then
' Salvare le modifiche apportate? - Salva
'Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question) ' Salvare le modifiche apportate? Salva
Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
Case MessageBoxResult.Yes
Save()
Case MessageBoxResult.No
@@ -57,7 +56,7 @@ Public Class BeamMachiningsWindowVM
LoadMachiningList()
LoadTypeList()
ReadTableFile()
NotifyPropertyChanged(NameOf(SelMachining))
NotifyPropertyChanged("SelMachining")
End Set
End Property
Private Sub SetSelMachining(value As String)
@@ -65,7 +64,7 @@ Public Class BeamMachiningsWindowVM
LoadMachiningList()
LoadTypeList()
ReadTableFile()
NotifyPropertyChanged(NameOf(SelMachining))
NotifyPropertyChanged("SelMachining")
End Sub
Private m_TableRowList As ObservableCollection(Of GridLine)
@@ -104,37 +103,37 @@ Public Class BeamMachiningsWindowVM
Public ReadOnly Property OnHdr As String
Get
Return EgtMsg(9001) ' On
Return EgtMsg(9001) 'On
End Get
End Property
Public ReadOnly Property NameHdr As String
Get
Return EgtMsg(9002) ' Nome
Return EgtMsg(9002) 'Nome
End Get
End Property
Public ReadOnly Property TypeHdr As String
Get
Return EgtMsg(9003) ' Tipo
Return EgtMsg(9003) 'Tipo
End Get
End Property
Public ReadOnly Property AddRowMsg As String
Get
Return EgtMsg(9004) ' Aggiungi
Return EgtMsg(9004) 'Aggiungi
End Get
End Property
Public ReadOnly Property DeleteRowMsg As String
Get
Return EgtMsg(9005) ' Elimina
Return EgtMsg(9005) 'Elimina
End Get
End Property
Public ReadOnly Property SaveMsg As String
Get
Return EgtMsg(9006) ' Salva
Return EgtMsg(9006) 'Salva
End Get
End Property
@@ -170,7 +169,7 @@ Public Class BeamMachiningsWindowVM
If m_MachiningList.Count > 0 Then
SetSelMachining(m_MachiningList(0))
End If
NotifyPropertyChanged(NameOf(MachiningList))
NotifyPropertyChanged("MachiningList")
End Sub
#End Region ' CONSTRUCTOR
@@ -254,7 +253,7 @@ Public Class BeamMachiningsWindowVM
End If
End If
Next
NotifyPropertyChanged(NameOf(TableRowList))
NotifyPropertyChanged("TableRowList")
Return True
End Function
@@ -454,8 +453,7 @@ Public Class BeamMachiningsWindowVM
' se modificata, chiedo se salvare
If TableModified Then
' Salvare le modifiche apportate? - Salva
'Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question) ' Salvare le modifiche apportate? Salva
Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
Case MessageBoxResult.Yes
Save()
Case MessageBoxResult.No
+82
View File
@@ -4,6 +4,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
<!--x:Name="Self">-->
<UserControl.Resources>
<ResourceDictionary>
@@ -61,10 +62,87 @@
</ResourceDictionary>
</UserControl.Resources>
<!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
<Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
<!--<Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Invert}}">-->
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid.ColumnDefinitions>
@@ -88,6 +166,10 @@
Path=ParamChBx,
Mode=TwoWay,
UpdateSourceTrigger=PropertyChanged}"/>
<!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
Content="{Binding ElementName=LeaveTabTxBx,
Path=(Validation.Errors).CurrentItem,
UpdateSourceTrigger=PropertyChanged}"/>-->
</Grid>
+52 -1
View File
@@ -1,4 +1,6 @@
Imports System.ComponentModel
Imports System.Globalization
Imports System.Windows.Controls.Primitives
Imports System.ComponentModel
Public Class CheckParamV
@@ -40,6 +42,20 @@ Public Class CheckParamV
End Set
End Property
' ------------------------------------------------------------------- Colore TextBlock -------------------------------------------------------------------
'Public Shared ReadOnly ForegroundParamTxBlProperty As DependencyProperty =
' DependencyProperty.Register("ForegroundParamTxBl",
' GetType(Windows.Media.Brush),
' GetType(CheckParamV),
' New PropertyMetadata(Windows.Media.Brushes.Black))
'Public Property ForegroundParamTxBl() As Windows.Media.Brush
' Get
' Return DirectCast(GetValue(ForegroundParamTxBlProperty), Windows.Media.Brush)
' End Get
' Set(ByVal value As Windows.Media.Brush)
' SetValue(ForegroundParamTxBlProperty, value)
' End Set
'End Property
Public Shared ReadOnly ForegroundChxTxBlProperty As DependencyProperty = DependencyProperty.RegisterAttached(
NameOf(ForegroundChxTxBl),
GetType(Brush),
@@ -63,6 +79,41 @@ Public Class CheckParamV
SetValue(ForegroundChxTxBlProperty, value)
End Set
End Property
' ---------------------------------------------------------------------------------------------------------------------------------------------------------
'Private Shared Sub OnParamTxBxChangedCallback(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
' Dim StringParamV As StringParamV = DirectCast(sender, StringParamV)
' If Not IsNothing(sender) Then
' 'StringParamV.ParamValue.Text = CStr(e.NewValue)
' StringParamV.ParamTxBx = CStr(e.NewValue)
' StringParamV.NotifyPropertyChanged("ParamTxBx")
' End If
'End Sub
'Public Property ParamErrorMsg() As String
' Get
' Return CStr(GetValue(ParamErrorMsgProperty))
' End Get
' Set(ByVal value As String)
' SetValue(ParamErrorMsgProperty, value)
' End Set
'End Property
'Public Shared ReadOnly ParamErrorMsgProperty As DependencyProperty =
' DependencyProperty.Register("ParamErrorMsg", GetType(String), GetType(CheckParamV))
'Public Property ParamVisibility() As Visibility
' Get
' Return CType(GetValue(ParamVisibilityProperty), Visibility)
' End Get
' Set(ByVal value As Visibility)
' SetValue(ParamVisibilityProperty, value)
' End Set
'End Property
'Friend Sub ParamValue_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ParamValue.TextChanged
' ParamTxBx = ParamValue.Text
'End Sub
Public Shared ReadOnly ParamVisibilityProperty As DependencyProperty =
DependencyProperty.Register("ParamVisibility", GetType(Visibility), GetType(CheckParamV))
+87 -4
View File
@@ -1,8 +1,10 @@
<UserControl x:Class="ComboParamV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
x:Name="PIPPO">
<!--x:Name="Self">-->
<UserControl.Resources>
<ResourceDictionary>
@@ -31,6 +33,7 @@
</Setter.Value>
</Setter>
</Style>
<!--<Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>-->
<Geometry x:Key="DownArrowGeometry">F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z</Geometry>
<Style x:Key="ComboBoxReadonlyToggleButton" TargetType="{x:Type ToggleButton}">
<Setter Property="OverridesDefaultStyle" Value="true"/>
@@ -127,6 +130,9 @@
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
<Setter Property="Background" Value="#FFF4F4F4"/>
</Trigger>
<!--<Trigger Property="IsDropDownOpen" Value="True">
<Setter Property="Background" Value="White"/>
</Trigger>-->
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsGrouping" Value="true"/>
@@ -170,10 +176,87 @@
</ResourceDictionary>
</UserControl.Resources>
<!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
<Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
<!--<Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Invert}}">-->
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid.ColumnDefinitions>
@@ -192,6 +275,7 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Style="{DynamicResource MachiningsToolTextBlock}"/>
<!--Style="{DynamicResource MachiningsComboBox}-->
<ComboBox x:Name="ComboValue" Grid.Column="1"
ItemsSource="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}},
Path=ParamCmBxList,
@@ -203,15 +287,14 @@
DisplayMemberPath="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}},
Path=ParamDisplayMemberPath,
Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
IsSynchronizedWithCurrentItem="True" Margin="0,3,3,3"/>
IsSynchronizedWithCurrentItem="True" Margin="0,3,3,3"
/>
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
Text="{Binding ParamErrorMsg,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}}}"
Visibility="{Binding ParamErrorMsg,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:ComboParamV}},
Converter={StaticResource ErrorVisibilityConverter}}"
Margin="0,0,0,3"/>
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,0,3"/>
</Grid>
+15
View File
@@ -18,6 +18,20 @@ Public Class ComboParamV
End Set
End Property
' ------------------------------------------------------------------- Colore TextBlock -------------------------------------------------------------------
'Public Shared ReadOnly ForegroundParamTxBlProperty As DependencyProperty =
' DependencyProperty.Register("ForegroundParamTxBl",
' GetType(Windows.Media.Brush),
' GetType(ComboParamV),
' New PropertyMetadata(Windows.Media.Brushes.Black))
'Public Property ForegroundParamTxBl() As Windows.Media.Brush
' Get
' Return DirectCast(GetValue(ForegroundParamTxBlProperty), Windows.Media.Brush)
' End Get
' Set(ByVal value As Windows.Media.Brush)
' SetValue(ForegroundParamTxBlProperty, value)
' End Set
'End Property
' Proprietà che permette di impostare l'altezza della TitleBar
Public Shared ReadOnly ForegroundParamCmBxTxBlProperty As DependencyProperty = DependencyProperty.RegisterAttached(
NameOf(ForegroundParamCmBxTxBl),
@@ -398,6 +412,7 @@ Public Class ComboParamV
' ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#End Region ' ComboBox Manage Page
End Class
+96 -8
View File
@@ -13,17 +13,104 @@
Public Module ConstIni
Public Const S_GENERAL As String = "General"
'Public Const INI_FILE_NAME As String = "EgtCAM5.ini"
Public Const S_GENERAL As String = "General"
'Public Const K_DEBUG As String = "Debug"
'Public Const K_LICENCE As String = "Licence"
'Public Const K_USERLEVEL As String = "UserLevel"
'Public Const K_MAXINST As String = "MaxInstances"
'Public Const K_INSTANCES As String = "Instances"
'Public Const K_COMMANDLOG As String = "CommandLog"
'Public Const K_MESSAGESDIR As String = "MessagesDir"
'Public Const K_MESSAGES As String = "Messages"
Public Const K_WINPLACE As String = "WinPlace"
'Public Const K_LASTNGEDIR As String = "LastNgeDir"
'Public Const K_LASTNGEOBJDIR As String = "LastNgeObjDir"
'Public Const K_LASTLUADIR As String = "LastLuaDir"
'Public Const K_LASTIMPDIR As String = "LastImpDir"
'Public Const K_LASTEXPDIR As String = "LastExpDir"
'Public Const K_DRAW2D As String = "2DDraw"
'Public Const K_DRAW3D As String = "3DDraw"
'Public Const K_MODIFY As String = "Modify"
'Public Const K_TRANSFORM As String = "Transform"
'Public Const K_ONLYDRAW As String = "OnlyDraw"
'Public Const K_SUPPORT As String = "Support"
'Public Const S_LANGUAGES As String = "Languages"
'Public Const K_LANGUAGE As String = "Language"
'Public Const S_LUA As String = "Lua"
'Public Const K_LIBSDIR As String = "LibsDir"
'Public Const K_BASELIB As String = "BaseLib"
Public Const S_GEOMDB As String = "GeomDB"
'Public Const K_DEFAULTFONT As String = "DefaultFont"
'Public Const K_NFEFONTDIR As String = "NfeFontDir"
'Public Const K_DEFAULTCOLOR As String = "DefaultColor"
Public Const K_SAVETYPE As String = "SaveType"
Public Const S_MACH As String = "Mach"
'Public Const S_OPENGL As String = "OpenGL"
'Public Const K_DOUBLEBUFFER As String = "DoubleBuffer"
'Public Const K_COLORBITS As String = "ColorBits"
'Public Const K_DEPTHBITS As String = "DepthBits"
'Public Const K_DRIVER As String = "Driver"
'Public Const S_SCENE As String = "Scene"
'Public Const K_BACKTOP As String = "BackTop"
'Public Const K_BACKBOTTOM As String = "BackBottom"
'Public Const K_SHOWGFRAME As String = "ShowGFrame"
'Public Const K_MARK As String = "Mark"
'Public Const K_SELSURF As String = "SelSurf"
'Public Const K_SHOWMODE As String = "ShowMode"
'Public Const K_CURVEDIR As String = "CurveDir"
'Public Const K_SHOWTRIAADV As String = "ShowTriaAdv"
'Public Const K_SHOWZMAP As String = "ShowZmap"
'Public Const K_ZOOMWIN As String = "ZoomWin"
'Public Const K_DISTLINE As String = "DistLine"
'Public Const K_MMUNITS As String = "MmUnits"
'Public Const S_GRID As String = "Grid"
'Public Const K_DRAWSHOWGRID As String = "DrawShowGrid"
'Public Const K_MACHININGSHOWGRID As String = "MachiningShowGrid"
'Public Const K_SHOWFRAME As String = "ShowFrame"
'Public Const K_SNAPSTEP As String = "SnapStep"
'Public Const K_SNAPSTEPINCH As String = "SnapStepInch"
'Public Const K_MINLINESSTEP As String = "MinLineSStep"
'Public Const K_MAJLINESSTEP As String = "MajLineSStep"
'Public Const K_EXTSSTEP As String = "ExtSStep"
'Public Const K_MINLNCOLOR As String = "MinLnColor"
'Public Const K_MAJLNCOLOR As String = "MajLnColor"
'Public Const S_IMPORT As String = "Import"
'Public Const K_CNCFLAG As String = "CncFlag"
'Public Const S_EXPORT As String = "Export"
'Public Const K_IMGWIDTH As String = "ImgWidth"
'Public Const K_IMGHEIGHT As String = "ImgHeight"
Public Const S_MACH As String = "Mach"
'Public Const K_MACHINESDIR As String = "MachinesDir"
Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
'Public Const K_CURRMACH As String = "CurrMach"
'Public Const K_SELGEOMSAWING As String = "SelGeomSawing"
'Public Const K_SELGEOMDRILLING As String = "SelGeomDrilling"
'Public Const K_SELGEOMMILLING As String = "SelGeomMilling"
'Public Const K_SELGEOMPOCKETING As String = "SelGeomPocketing"
'Public Const K_SELGEOMMORTISING As String = "SelGeomMortising"
'Public Const K_SELGEOMSAWROUGHING As String = "SelGeomSawRoughing"
'Public Const K_SELGEOMSAWFINISHING As String = "SelGeomSawFinishing"
'Public Const K_SELGEOMGENMACHINING As String = "SelGeomGenMachining"
'Public Const K_SELGEOMCHISELING As String = "SelGeomChiseling"
'Public Const K_MACHININGGROUP As String = "MachiningGroup"
'Public Const S_SIMUL As String = "Simul"
'Public Const K_SLIDERX As String = "SliderX"
'Public Const K_SLIDERVAL As String = "SliderVal"
'Public Const S_OPTIONS As String = "Options"
'Public Const K_NEWMACHININGISLASTONE As String = "NewMachiningIsLastOne"
'Public Const K_USEDISPOSITIONSCRIPT As String = "UseDispositionScript"
Public Const S_MRUFILES As String = "MruFiles"
Public Const S_MRUIMPORT As String = "MruImport"
@@ -31,12 +118,12 @@ Public Module ConstIni
Public Const S_MRUDOORS As String = "MruDoors"
Public Const S_MRUGUNSTOCKMOD As String = "MruGunStockMod"
Public Const S_MRUGUNSTOCKPEZ As String = "MruGunStockPez"
Public Const K_FILE As String = "File"
' Aggiunte da OmagOFFICE
Public Const INI_FILE_NAME As String = "OmagOFFICE.ini"
'Public Const S_GENERAL As String = "General"
Public Const K_DEBUG As String = "Debug"
Public Const K_LICENCE As String = "Licence"
Public Const K_USERLEVEL As String = "UserLevel"
@@ -45,6 +132,7 @@ Public Module ConstIni
Public Const K_COMMANDLOG As String = "CommandLog"
Public Const K_MESSAGESDIR As String = "MessagesDir"
Public Const K_MESSAGES As String = "Messages"
'Public Const K_WINPLACE As String = "WinPlace"
Public Const K_CSVWINPLACE As String = "CsvWinPlace"
Public Const K_MMUNITS As String = "MmUnits"
Public Const K_LASTPROJ As String = "LastProj"
@@ -61,9 +149,11 @@ Public Module ConstIni
Public Const K_LIBSDIR As String = "LibsDir"
Public Const K_BASELIB As String = "BaseLib"
'Public Const S_GEOMDB As String = "GeomDB"
Public Const K_DEFAULTFONT As String = "DefaultFont"
Public Const K_NFEFONTDIR As String = "NfeFontDir"
Public Const K_DEFAULTCOLOR As String = "DefaultColor"
'Public Const K_SAVETYPE As String = "SaveType"
Public Const S_OPENGL As String = "OpenGL"
Public Const K_DOUBLEBUFFER As String = "DoubleBuffer"
@@ -167,7 +257,9 @@ Public Module ConstIni
Public Const K_CAM_TOLERANCE As String = "Tolerance"
Public Const K_CAM_TIMEOUT As String = "Timeout"
'Public Const S_MACH As String = "Mach"
Public Const K_MACHINESDIR As String = "MachinesDir"
'Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
Public Const K_CURRMACH As String = "CurrMach"
Public Const S_SIMUL As String = "Simul"
@@ -200,8 +292,4 @@ Public Module ConstIni
' Direttorio THolders
Public Const T_HOLDER As String = "THolders"
' EgtManageDialog
Public Const S_TEMPLETESEL As String = "TempleteSel"
Public Const K_CURRTEMPLETESEL As String = "CurrTempleteSel"
End Module
+280
View File
@@ -10,11 +10,17 @@
Public Const K_CHISEL As String = "Chisel"
Public Const K_COMPO As String = "Compo"
Public Const K_WATERJET As String = "Waterjet"
'Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
'Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
'Public Const K_DRILLHOLDER As String = "DrillHolder"
'Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
'Public Const K_MILLHOLDER As String = "MillHolder"
Public Const K_DRILLMAKER As String = "DrillMaker"
Public Const K_SAWBLADEMAKER As String = "SawbladeMaker"
Public Const K_MILLMAKER As String = "MillMaker"
Public Const K_MORTISEMAKER As String = "MortiseMaker"
Public Const K_CHISELMAKER As String = "ChiselMaker"
'Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
Public Const S_TOOLHOLDER As String = "ToolHolder"
@@ -40,10 +46,24 @@
Public Const S_5AXMILLING As String = "5AxMilling"
Public Const K_5AXSCRIPT As String = "5AxScript"
'Public Const S_TOOLCHANGER As String = "ToolChanger"
'Public Const K_NUMBER As String = "Number"
Public Const K_POS As String = "Pos"
'Public Const K_NAME As String = "Name"
'Public Const K_MANUALNUMBER As String = "ManualNumber"
'Public Const K_MANUALPOS As String = "ManualPos"
'Public Const K_MANUALNAME As String = "ManualName"
'Public Const S_DISPOSITION As String = "Disposition"
'Public Const K_INITSCRIPT As String = "InitScript"
'Public Const S_FIXTURES As String = "Fixtures"
Public Const S_HEADS As String = "Heads"
'Public Const S_SETUP As String = "SetUp"
'Public Const K_DEFAULT As String = "Default"
Public Const S_ESTIMATIONS As String = "Estimations"
'Aggiunti da OmagOFFICE
@@ -160,7 +180,12 @@
Public Const K_PHOTO_TAB2_OFFSETX As String = "Tab2OffsetX"
Public Const K_PHOTO_TAB2_OFFSETY As String = "Tab2OffsetY"
'Public Const S_TOOLS As String = "Tools"
'Public Const K_DRILLBIT As String = "Drillbit"
'Public Const K_SAWBLADE As String = "Sawblade"
'Public Const K_MILL As String = "Mill"
Public Const K_MILLNOTIP As String = "MillNoTip"
'Public Const K_WATERJET As String = "WaterJet"
Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
Public Const K_SHOWUSERNOTES As String = "ShowUserNotes"
@@ -168,10 +193,22 @@
Public Const K_DRILLHOLDER As String = "DrillHolder"
Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
Public Const K_MILLHOLDER As String = "MillHolder"
'Public Const K_DRILLMAKER As String = "DrillMaker"
'Public Const K_SAWBLADEMAKER As String = "SawBladeMaker"
'Public Const K_MILLMAKER As String = "MillMaker"
Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
Public Const K_MAXSAWDIAMFORVAC As String = "MaxSawDiamForVac"
Public Const K_MAXSAWDIAMFORPROBE As String = "MaxSawDiamForProbe"
'Public Const S_MACHININGS As String = "Machinings"
'Public Const K_SAWING As String = "Sawing"
'Public Const K_DRILLING As String = "Drilling"
'Public Const K_MILLING As String = "Milling"
'Public Const K_POCKETING As String = "Pocketing"
'Public Const K_SAWROUGHING As String = "SawRoughing"
'Public Const K_SAWFINISHING As String = "SawFinishing"
'Public Const K_WATERJETTING As String = "WaterJetting"
Public Const S_MACH_NEST As String = "Nest"
Public Const K_MACH_HOLES_OFFSET As String = "HolesOffset"
Public Const K_MACH_HOLES_OVERLAP As String = "HolesOverlap"
@@ -194,6 +231,11 @@
Public Const K_MACH_CUTFSEVENABLE As String = "CutFsevEnable"
Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
' DrillMillC90
' CutLongDxSx
' AngRotMultiCut
' MinDistHeadsMultiCut
' MinSawRbHeight
Public Const S_MACH_RAWMOVE As String = "RawMove"
Public Const K_MACH_RM_ROTATE As String = "Rotate"
@@ -204,6 +246,7 @@
Public Const S_TOOLCHANGER As String = "ToolChanger"
Public Const K_NUMBER As String = "Number"
'Public Const K_POS As String = "Pos"
Public Const K_NAME As String = "Name"
Public Const K_MANUALNUMBER As String = "ManualNumber"
Public Const K_MANUALPOS As String = "ManualPos"
@@ -261,4 +304,241 @@
Public Const S_SETUP As String = "SetUp"
Public Const K_DEFAULT As String = "Default"
' Aggiunte da ConstMachIni di EgtStone (eliminato perché entrava in conflitto)
'Public Const S_NUMERICALCONTROL As String = "NumericalControl"
'Public Const K_TYPE As String = "Type"
'Public Const S_PARTPROGRAM As String = "PartProgram"
'Public Const K_EXTENSION As String = "Extension"
'Public Const S_AXES As String = "Axes"
'Public Const K_AXESNUM As String = "AxesNum"
'Public Const K_SIMULATIONAXESNUM As String = "SimulationAxesNum"
'Public Const K_L1NAME As String = "L1Name"
'Public Const K_L1ID As String = "L1Id"
'Public Const K_L2NAME As String = "L2Name"
'Public Const K_L2ID As String = "L2Id"
'Public Const K_L3NAME As String = "L3Name"
'Public Const K_L3ID As String = "L3Id"
'Public Const K_R1NAME As String = "R1Name"
'Public Const K_R1ID As String = "R1Id"
'Public Const K_R2NAME As String = "R2Name"
'Public Const K_R2ID As String = "R2Id"
'Public Const K_A6NAME As String = "A6Name"
'Public Const K_A6ID As String = "A6Id"
'Public Const K_A7NAME As String = "A7Name"
'Public Const K_A7ID As String = "A7Id"
'Public Const K_A8NAME As String = "A8Name"
'Public Const K_A8ID As String = "A8Id"
'Public Const K_A9NAME As String = "A9Name"
'Public Const K_A9ID As String = "A9Id"
'Public Const K_A10NAME As String = "A10Name"
'Public Const K_A10ID As String = "A10Id"
'Public Const K_DELTA_C As String = "DeltaC"
'Public Const K_ININCHES As String = "InInches"
'Public Const S_NCSIEMENS As String = "NcSiemens"
'Public Const K_COMM_NAME As String = "CommName"
'Public Const K_PATH_HMI As String = "PathHmi"
'Public Const S_NCNUM As String = "NcNUM"
'Public Const K_RESETSENDDELAY As String = "ResetSendDelay"
'Public Const S_NCDATA As String = "NcData"
'Public Const K_COMM As String = "Comm"
'Public Const K_REFRESH As String = "Refresh"
'Public Const K_MODE As String = "Mode"
'Public Const K_JOGINCR As String = "JogIncr"
'Public Const K_FEED As String = "Feed"
'Public Const K_FEEDOVR As String = "FeedOvr"
'Public Const K_SPEED As String = "Speed"
'Public Const K_SPEEDOVR As String = "SpeedOvr"
'Public Const K_POWER As String = "Power"
'Public Const K_SPINDLE As String = "Spindle"
'Public Const K_LASER As String = "Laser"
'Public Const K_COOLANT As String = "Coolant"
'Public Const K_INTERNALCOOLANT As String = "InternalCoolant"
'Public Const K_EXTERNCOOLANT As String = "ExternCoolant"
'Public Const K_CAXES As String = "CAxes"
'Public Const K_BAXES As String = "BAxes"
'Public Const K_THREEAXES As String = "ThreeAxes"
'Public Const K_FIVEAXES As String = "FiveAxes"
'Public Const K_AIRBLOW As String = "AirBlow"
'Public Const K_HOME As String = "Home"
'Public Const K_TABLEUP As String = "TableUp"
'Public Const K_TABLEDOWN As String = "TableDown"
'Public Const K_MANUAL As String = "Manual"
'Public Const K_DOORCLOSED As String = "DoorClosed"
'Public Const K_LIMITZ As String = "LimitZ"
'Public Const K_POWEROVR As String = "PowerOvr"
'Public Const K_VACUUMUP As String = "VacuumUp"
'Public Const K_VACUUMDOWN As String = "VacuumDown"
'Public Const K_VACUUM0 As String = "Vacuum0"
'Public Const K_VACUUM90 As String = "Vacuum90"
'Public Const K_VACUU3STATE As String = "Vacuum3State"
'Public Const K_VACUU4STATE As String = "Vacuum4State"
'Public Const K_VACUU135STATE As String = "Vacuum135State"
'Public Const K_VACUU246STATE As String = "Vacuum246State"
'Public Const K_OPENALLSTATE As String = "OpenAllState"
'Public Const K_CLOSEALLSTATE As String = "CloseAllState"
'Public Const K_BLOWSTATE As String = "BlowState"
'Public Const K_VACUUMSTATE As String = "VacuumState"
'Public Const K_VACUUMON As String = "VacuumOn"
'Public Const K_VACUUMOFF As String = "VacuumOff"
'Public Const K_BYPASSTATE As String = "BypassState"
'Public Const S_PRODUCTIONLINE As String = "ProductionLine"
'Public Const K_ACTIVE As String = "Active"
'Public Const K_NAMEPROG1 As String = "NameProg1"
'Public Const K_VARPROG1 As String = "VarProg1"
'Public Const K_NAMEPROG2 As String = "NameProg2"
'Public Const K_VARPROG2 As String = "VarProg2"
'Public Const K_LINEDATADIR As String = "DataDir"
'Public Const K_VARPROJCOPY As String = "VarProjCopy"
'Public Const K_SPECIALUNLOAD As String = "SpecialUnload"
'Public Const K_SAVEPRODUCED As String = "SaveProduced"
'Public Const K_VARPROGTWINS As String = "VarProgTwins"
'Public Const K_PRODLIENABLESAWPROBE As String = "EnableSawProbe"
'Public Const K_PRODLIPROBINGSTATEVAR As String = "ProbingStateVar"
'Public Const K_PRODLIPROBINGTCPOSVAR As String = "ProbingTcPosVar"
'Public Const K_PRODLISAWDIAMETERVAR As String = "SawDiameterVar"
'Public Const K_PRODLIPROBINGSTATE2VAR As String = "ProbingState2Var"
'Public Const K_PRODLIPROBINGTCPOS2VAR As String = "ProbingTcPos2Var"
'Public Const K_PRODLISAWDIAMETER2VAR As String = "SawDiameter2Var"
'Public Const S_TABLE As String = "Table"
'Public Const K_ADDITIONALTABLE As String = "AdditionalTable"
'Public Const K_TAB2_ADDITIONALTABLE As String = "Tab2AdditionalTable"
'Public Const K_TAB3_ADDITIONALTABLE As String = "Tab3AdditionalTable"
'Public Const K_CENTER_RAW_ONX As String = "CenterRawOnX"
'Public Const S_PHOTO As String = "Photo"
'Public Const K_PHOTO_OFFSETX As String = "OffsetX"
'Public Const K_PHOTO_OFFSETY As String = "OffsetY"
'Public Const K_PHOTO_TAB2_OFFSETX As String = "Tab2OffsetX"
'Public Const K_PHOTO_TAB2_OFFSETY As String = "Tab2OffsetY"
'Public Const S_TOOLS As String = "Tools"
'Public Const K_DRILLBIT As String = "Drillbit"
'Public Const K_SAWBLADE As String = "Sawblade"
'Public Const K_MILL As String = "Mill"
'Public Const K_MILLNOTIP As String = "MillNoTip"
'Public Const K_WATERJET As String = "WaterJet"
'Public Const K_SHOWTOOLCHANGER As String = "ShowToolChanger"
'Public Const K_SHOWHEADEXIT As String = "ShowHeadExit"
'Public Const K_SHOWUSERNOTES As String = "ShowUserNotes"
'Public Const K_SHOWSPECIALS As String = "ShowSpecials"
'Public Const K_DRILLHOLDER As String = "DrillHolder"
'Public Const K_SAWBLADEHOLDER As String = "SawBladeHolder"
'Public Const K_MILLHOLDER As String = "MillHolder"
'Public Const K_DRILLMAKER As String = "DrillMaker"
'Public Const K_SAWBLADEMAKER As String = "SawBladeMaker"
'Public Const K_MILLMAKER As String = "MillMaker"
'Public Const K_MOUNTEDTOOLCONFIG As String = "MountedToolConfig"
'Public Const K_MAXSAWDIAMFORVAC As String = "MaxSawDiamForVac"
'Public Const K_MAXSAWDIAMFORPROBE As String = "MaxSawDiamForProbe"
''Public Const S_MACHININGS As String = "Machinings"
'Public Const K_SAWING As String = "Sawing"
'Public Const K_DRILLING As String = "Drilling"
'Public Const K_MILLING As String = "Milling"
'Public Const K_POCKETING As String = "Pocketing"
'Public Const K_SAWROUGHING As String = "SawRoughing"
'Public Const K_SAWFINISHING As String = "SawFinishing"
'Public Const K_WATERJETTING As String = "WaterJetting"
'Public Const S_MACH_NEST As String = "Nest"
'Public Const K_MACH_HOLES_OFFSET As String = "HolesOffset"
'Public Const K_MACH_HOLES_OVERLAP As String = "HolesOverlap"
'Public Const K_MACH_HOLES_DIAMTOLER As String = "HolesDiamToler"
'Public Const K_MACH_ONEHOLE_INTCORNER As String = "OneHoleOnIntCorner"
'Public Const K_MACH_SAFE_LEN_CUT As String = "SafeLenOnCut"
'Public Const K_MACH_SAFE_LEN_INTCORNER As String = "SafeLenOnIntCorner"
'Public Const K_MACH_REDUCEDCUT As String = "ReducedCut"
'Public Const K_MACH_REDUCEDDEPTH As String = "ReducedDepth"
'Public Const K_MACH_EXTARCMINRAD As String = "ExtArcMinRad"
'Public Const K_MACH_INTARCMAXSIDEANG As String = "IntArcMaxSideAng"
'Public Const K_MACH_MILLING_ON_CORNERS As String = "MillingOnCorners"
'Public Const K_MACH_MILLING_ON_SINKS As String = "MillingOnSinks"
'Public Const K_MACH_MILLING_SHORTENING As String = "MillingShortening"
'Public Const K_MACH_NEST_ALIGNED As String = "Aligned"
'Public Const K_MACH_WASHING As String = "Washing"
'Public Const K_MACH_SACPROBE As String = "SacProbe"
'Public Const K_MACH_ENABLERESTART As String = "EnableRestart"
'Public Const K_MACH_ENABLEPAUSE As String = "EnablePause"
'Public Const K_MACH_CUTFSEVENABLE As String = "CutFsevEnable"
'Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
'Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
'' DrillMillC90
'' CutLongDxSx
'' AngRotMultiCut
'' MinDistHeadsMultiCut
'' MinSawRbHeight
'Public Const S_MACH_RAWMOVE As String = "RawMove"
'Public Const K_MACH_RM_ROTATE As String = "Rotate"
'Public Const K_MACH_RM_FINALMOVE As String = "FinalMove"
'Public Const S_MACH_REG As String = "Reg"
'Public Const K_MACH_MAX_ROT_ANG As String = "MaxRotAng"
'Public Const S_TOOLCHANGER As String = "ToolChanger"
'Public Const K_NUMBER As String = "Number"
'Public Const K_POS As String = "Pos"
'Public Const K_NAME As String = "Name"
'Public Const K_MANUALNUMBER As String = "ManualNumber"
'Public Const K_MANUALPOS As String = "ManualPos"
'Public Const K_MANUALNAME As String = "ManualName"
'Public Const S_MACH_DIRECTCUTS As String = "DirectCuts"
'Public Const K_FINALHOME As String = "FinalHome"
'Public Const S_MACHBUTTONS As String = "MachButtons"
'Public Const S_CONTROLMACHBUTTONS As String = "ControlMachButtons"
'Public Const S_VACUUMMACHBUTTONS As String = "VacuumMachButtons"
'Public Const K_BUTTON As String = "Button"
'Public Const S_MACH_INPROGRESS As String = "InProgress"
'Public Const K_PHASEVAR As String = "PhaseVar"
'Public Const S_MACH_PROBING As String = "Probing"
'Public Const K_PROBINGSTATEVAR As String = "ProbingStateVar"
'Public Const K_SAWDIAMETER As String = "SawDiameter"
'Public Const K_RAWTHICKNESS As String = "RawThickness"
'Public Const K_ENABLERAWPROBE As String = "EnableRawProbe"
'Public Const S_MACH_BARCODEREADER As String = "BarcodeReader"
'Public Const K_ENABLEBCR As String = "EnableBCR"
'Public Const S_MACH_ESTIMATIONS As String = "Estimations"
'Public Const K_ENABLEEST As String = "Enable"
'Public Const S_MACH_MACH As String = "Mach"
'Public Const K_CURRSAW As String = "CurrSaw"
'Public Const K_CURRDRILL As String = "CurrDrill"
'Public Const K_CURRMILL As String = "CurrMill"
'Public Const K_CURRMILLNOTIP As String = "CurrMillNoTip"
'Public Const K_CURRDRIPSAW As String = "CurrDripSaw"
'Public Const K_CURRDRIPDRILL As String = "CurrDripDrill"
'Public Const K_CURRWATERJET As String = "CurrWaterJet"
'Public Const K_CURRSAWING As String = "CurrSawing"
'Public Const K_CURRDRILLING As String = "CurrDrilling"
'Public Const K_CURRMILLING As String = "CurrMilling"
'Public Const K_CURRPOCKETING As String = "CurrPocketing"
'Public Const K_CURRSAWROUGHING As String = "CurrSawRoughing"
'Public Const K_CURRSAWFINISHING As String = "CurrSawFinishing"
'Public Const K_CURRSAWSIDEFINISHING As String = "CurrSawSideFinishing"
'Public Const K_CURRSAWSINGLE As String = "CurrSawSingle"
'Public Const K_CURRDRIPSAWING As String = "CurrDripSawing"
'Public Const K_CURRDRIPDRILLING As String = "CurrDripDrilling"
'Public Const K_CURRWATERJETTING As String = "CurrWaterJetting"
'Public Const S_MATERIALS As String = "Materials"
'Public Const K_CURRMATERIAL As String = "CurrMaterial"
'Public Const K_CURROFFICEMATERIAL As String = "CurrOfficeMaterial"
'Public Const K_MATERIAL As String = "Material"
'Public Const S_SETUP As String = "SetUp"
'Public Const K_DEFAULT As String = "Default"
End Module
+58
View File
@@ -2,15 +2,59 @@
Public Const MSG_EGTCAM5 As Integer = 5000
Public Const MSG_MAINWINDOW As Integer = MSG_EGTCAM5
'Public Const MSG_TOPCOMMANDBAR As Integer = MSG_EGTCAM5 + 100
'Public Const MSG_DRAWPANEL As Integer = MSG_EGTCAM5 + 200
Public Const MSG_GRIDVIEWPANEL As Integer = MSG_EGTCAM5 + 250
'Public Const MSG_SIMULATION As Integer = MSG_EGTCAM5 + 300
'Public Const MSG_DRAWOPTION As Integer = MSG_EGTCAM5 + 350
'Public Const MSG_OPERATION As Integer = MSG_EGTCAM5 + 400
'Public Const MSG_DISPOSITION As Integer = MSG_EGTCAM5 + 430
'Public Const MSG_DISPOSITIONERRORS As Integer = MSG_EGTCAM5 + 460
'Public Const MSG_MACHGROUP As Integer = MSG_EGTCAM5 + 500
Public Const MSG_TOOLSDBPAGE As Integer = MSG_EGTCAM5 + 1000
'Public Const MSG_TOOLSERRORS As Integer = MSG_EGTCAM5 + 1100
'Public Const MSG_MACHININGSDBPAGE As Integer = MSG_EGTCAM5 + 1200
'Public Const MSG_MACHININGSERRORS As Integer = MSG_EGTCAM5 + 1350
'Public Const MSG_SETUP As Integer = MSG_EGTCAM5 + 1450
'Public Const MSG_SETUPERRORS As Integer = MSG_EGTCAM5 + 1470
'Public Const MSG_OPTIONPAGE As Integer = MSG_EGTCAM5 + 1500
'Public Const MSG_DOORS As Integer = MSG_EGTCAM5 + 3000
Public Const MSG_DOORSERRORS As Integer = MSG_EGTCAM5 + 3100
'Public Const MSG_GUNSTOCK As Integer = MSG_EGTCAM5 + 3200
'Public Const MSG_GUNSTOCKERRORS As Integer = MSG_EGTCAM5 + 3250
'Public Const MSG_MISSINGKEYWD As Integer = 10100
Public Const MSG_MESSAGEBOX As Integer = 15000
Public Const MSG_EGTSAVEFILEDIALOG As Integer = MSG_EGTWPFLIB5
'Public Const MSG_NUMERICKEYBOARDWD As Integer = 10200
Public Const MSG_OMAGCUT As Integer = 90000
'Public Const MSG_GENERAL As Integer = MSG_OMAGCUT
'Public Const MSG_WORKINPROGRESSPAGEUC As Integer = MSG_OMAGCUT + 100
'Public Const MSG_DIRECTCUTPAGEUC As Integer = MSG_OMAGCUT + 200
'Public Const MSG_MANUALAXESMOVEPAGEUC As Integer = MSG_OMAGCUT + 220
'Public Const MSG_CADCUTPAGEUC As Integer = MSG_OMAGCUT + 300
'Public Const MSG_NESTPAGEUC As Integer = MSG_OMAGCUT + 330
'Public Const MSG_SPLITPAGEUC As Integer = MSG_OMAGCUT + 340
'Public Const MSG_MOVERAWPAGEUC As Integer = MSG_OMAGCUT + 360
'Public Const MSG_DRAWPAGEUC As Integer = MSG_OMAGCUT + 380
'Public Const MSG_COMPONENTPAGEUC As Integer = MSG_OMAGCUT + 400
'Public Const MSG_IMPORTPAGEUC As Integer = MSG_OMAGCUT + 450
'Public Const MSG_OPENPAGEUC As Integer = MSG_OMAGCUT + 490
'Public Const MSG_RAWPARTPAGEUC As Integer = MSG_OMAGCUT + 500
'Public Const MSG_CHOOSEMACHININGPAGEUC As Integer = MSG_OMAGCUT + 535
'Public Const MSG_SIMULATIONPAGEUC As Integer = MSG_OMAGCUT + 550
'Public Const MSG_FRAMECUTPAGEUC As Integer = MSG_OMAGCUT + 600
'Public Const MSG_MACHINEPAGEUC As Integer = MSG_OMAGCUT + 700
'Public Const MSG_TOOLSDBPAGEUC As Integer = MSG_OMAGCUT + 720
'Public Const MSG_MACHININGSDBPAGEUC As Integer = MSG_OMAGCUT + 760
Public Const MSG_COMBOBOXPARAM As Integer = MSG_OMAGCUT + 800
'Public Const MSG_ALARMSPAGEUC As Integer = MSG_OMAGCUT + 900
'Public Const MSG_MACHINECNPAGEUC As Integer = MSG_OMAGCUT + 950
'Public Const MSG_OPTIONSPAGEUC As Integer = MSG_OMAGCUT + 980
'Public Const MSG_EGTMSGBOX As Integer = MSG_OMAGCUT + 1100
'Public Const MSG_CSVPAGEUC As Integer = MSG_OMAGCUT + 1200
Public Const MSG_EGTWPFLIB5 As Integer = 30000
Public Const MSG_MACHGROUPPANEL As Integer = MSG_EGTWPFLIB5 + 900
@@ -30,22 +74,36 @@
Public Const MSG_VEINMATCHING As Integer = MSG_OMAGOFFICE + 200
' Aggiunto da EgtCAM5
'Public Const MSG_EGTCAM5 As Integer = 5000
'Public Const MSG_MAINWINDOW As Integer = MSG_EGTCAM5
Public Const MSG_TOPCOMMANDBAR As Integer = MSG_EGTCAM5 + 100
Public Const MSG_DRAWPANEL As Integer = MSG_EGTCAM5 + 200
'Public Const MSG_GRIDVIEWPANEL As Integer = MSG_EGTCAM5 + 250
'Public Const MSG_SIMULATION As Integer = MSG_EGTCAM5 + 300
Public Const MSG_DRAWOPTION As Integer = MSG_EGTCAM5 + 350
Public Const MSG_OPERATION As Integer = MSG_EGTCAM5 + 400
Public Const MSG_DISPOSITION As Integer = MSG_EGTCAM5 + 430
Public Const MSG_DISPOSITIONERRORS As Integer = MSG_EGTCAM5 + 460
Public Const MSG_MACHGROUP As Integer = MSG_EGTCAM5 + 500
'Public Const MSG_TOOLSDBPAGE As Integer = MSG_EGTCAM5 + 1000
Public Const MSG_TOOLSERRORS As Integer = MSG_EGTCAM5 + 1100
Public Const MSG_MACHININGSDBPAGE As Integer = MSG_EGTCAM5 + 1200
'Public Const MSG_MACHININGDB As Integer = MSG_EGTWPFLIB5 + 1200
Public Const MSG_MACHININGSERRORS As Integer = MSG_EGTCAM5 + 1370
Public Const MSG_MACHININGOPTIONPAGE As Integer = MSG_EGTCAM5 + 1400
'Public Const MSG_SETUP As Integer = MSG_EGTCAM5 + 1450
'Public Const MSG_SETUPERRORS As Integer = MSG_EGTCAM5 + 1470
Public Const MSG_OPTIONPAGE As Integer = MSG_EGTCAM5 + 1500
Public Const MSG_STATUSBAR As Integer = MSG_EGTCAM5 + 1800
Public Const MSG_DOORS As Integer = MSG_EGTCAM5 + 3000
'Public Const MSG_DOORSERRORS As Integer = MSG_EGTCAM5 + 3100
Public Const MSG_GUNSTOCK As Integer = MSG_EGTCAM5 + 3200
Public Const MSG_GUNSTOCKERRORS As Integer = MSG_EGTCAM5 + 3250
'Public Const MSG_MESSAGEBOX As Integer = 15000
Public Const MSG_MISSINGKEYWD As Integer = 10100
'Public Const MSG_EGTWPFLIB5 As Integer = 30000
'Public Const MSG_EGTSAVEFILEDIALOG As Integer = MSG_EGTWPFLIB5
'Public Const MSG_MACHININGDBERRORS As Integer = MSG_EGTWPFLIB5 + 1400
End Module
+3
View File
@@ -203,7 +203,10 @@ Public Module CurrentMachine
Return False
End Function
'Sub InitCurrentMachine(sMachinesRootDir As String, sMachineName As String,
' bKeyProdLine As Boolean, bKeyMill As Boolean, bKeyWJ As Boolean, Optional bOffice As Boolean = False)
Sub InitCurrentMachine(sMachIniFile As String)
m_sMachIniFile = sMachIniFile
m_sMachDir = Path.GetDirectoryName(m_sMachIniFile)
File diff suppressed because it is too large Load Diff
-374
View File
@@ -1,374 +0,0 @@
Imports System.Globalization
Public Class EgtHexagon
Inherits Panel
#Region "ORIENTATION"
Public Shared ReadOnly OrientationProperty As DependencyProperty = DependencyProperty.RegisterAttached("Orientation",
GetType(Orientation),
GetType(EgtHexagon),
New FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange Or FrameworkPropertyMetadataOptions.[Inherits]))
Public Shared Sub SetOrientation(element As DependencyObject, value As Orientation)
element.SetValue(OrientationProperty, value)
End Sub
Public Shared Function GetOrientation(element As DependencyObject) As Orientation
Return CType(element.GetValue(OrientationProperty), Orientation)
End Function
Public Property Orientation As Orientation
Get
Return CType(GetValue(OrientationProperty), Orientation)
End Get
Set(value As Orientation)
SetValue(OrientationProperty, value)
End Set
End Property
#End Region ' Orientation
#Region "ROW"
Public Shared ReadOnly RowCountProperty As DependencyProperty = DependencyProperty.Register("RowCount",
GetType(Integer),
GetType(EgtHexagon),
New FrameworkPropertyMetadata(1, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange), AddressOf ValidateCountCallback)
Public Property RowCount As Integer
Get
Return CInt(GetValue(RowCountProperty))
End Get
Set(value As Integer)
SetValue(RowCountProperty, value)
End Set
End Property
#End Region ' Row
#Region "COLUMN"
Public Shared ReadOnly ColumnCountProperty As DependencyProperty = DependencyProperty.Register("ColumnCount",
GetType(Integer),
GetType(EgtHexagon),
New FrameworkPropertyMetadata(1, FrameworkPropertyMetadataOptions.AffectsMeasure Or FrameworkPropertyMetadataOptions.AffectsArrange), AddressOf ValidateCountCallback)
Public Property ColumnCount As Integer
Get
Return CInt(GetValue(ColumnCountProperty))
End Get
Set(value As Integer)
SetValue(ColumnCountProperty, value)
End Set
End Property
#End Region 'Column
#Region "VALIDATE"
Private Shared Function ValidateCountCallback(value As Object) As Boolean
If TypeOf value Is Integer Then
Dim count As Integer = CInt(value)
Return count > 0
End If
Return False
End Function
Private Function GetRow(e As UIElement) As Integer
Dim row As Integer = CInt(e.GetValue(Grid.RowProperty))
If row >= RowCount Then row = RowCount - 1
Return row
End Function
Private Function GetColumn(e As UIElement) As Integer
Dim column As Integer = CInt(e.GetValue(Grid.ColumnProperty))
If column >= ColumnCount Then column = ColumnCount - 1
Return column
End Function
Protected Overrides Function MeasureOverride(ByVal availableSize As Size) As Size
Dim w As Double = availableSize.Width
Dim h As Double = availableSize.Height
If Double.IsInfinity(w) OrElse Double.IsInfinity(h) Then
h = 0
w = 0
For Each e As UIElement In InternalChildren
e.Measure(availableSize)
Dim s = e.DesiredSize
If s.Height > h Then h = s.Height
If s.Width > w Then w = s.Width
Next
If Orientation = Orientation.Horizontal Then Return New Size(w * (ColumnCount * 3 + 1) / 4, h * (RowCount * 2 + 1) / 2)
Return New Size(w * (ColumnCount * 2 + 1) / 2, h * (RowCount * 3 + 1) / 4)
End If
Return availableSize
End Function
#End Region ' Validate
#Region "HASSHIFT"
Private Sub HasShift(first As Boolean, last As Boolean)
If Orientation = Orientation.Horizontal Then
HasRowShift(first, last)
Else
HasColumnShift(first, last)
End If
End Sub
Private Sub HasRowShift(firstRow As Boolean, lastRow As Boolean)
lastRow = True
firstRow = lastRow
Dim elements As UIElementCollection = MyBase.InternalChildren
Dim i As Integer = 0
While i < elements.Count AndAlso (firstRow OrElse lastRow)
Dim e = elements(i)
If e.Visibility = Visibility.Collapsed Then Continue While
Dim row As Integer = GetRow(e)
Dim column As Integer = GetColumn(e)
Dim modify As Integer = column Mod 2
If row = 0 AndAlso modify = 0 Then firstRow = False
If row = RowCount - 1 AndAlso modify = 1 Then lastRow = False
i += 1
End While
End Sub
Private Sub HasColumnShift(firstColumn As Boolean, lastColumn As Boolean)
lastColumn = True
firstColumn = lastColumn
Dim elements As UIElementCollection = MyBase.InternalChildren
Dim i As Integer = 0
While i < elements.Count AndAlso (firstColumn OrElse lastColumn)
Dim e = elements(i)
If e.Visibility = Visibility.Collapsed Then Continue While
Dim row As Integer = GetRow(e)
Dim column As Integer = GetColumn(e)
Dim modify As Integer = row Mod 2
If column = 0 AndAlso modify = 0 Then firstColumn = False
If column = ColumnCount - 1 AndAlso modify = 1 Then lastColumn = False
i += 1
End While
End Sub
#End Region ' HasShift
#Region "GETHEXSIZE"
Private Function GetHexSize(gridSize As Size) As Size
Dim minH As Double = 0
Dim minW As Double = 0
For Each e As UIElement In InternalChildren
Dim f = TryCast(e, FrameworkElement)
If f IsNot Nothing Then
If f.MinHeight > minH Then minH = f.MinHeight
If f.MinWidth > minW Then minW = f.MinWidth
End If
Next
Dim first, last As Boolean
HasShift(first, last)
Dim possibleSize = GetPossibleSize(gridSize)
Dim possibleW As Double = possibleSize.Width
Dim possibleH As Double = possibleSize.Height
Dim w = Math.Max(minW, possibleW)
Dim h = Math.Max(minH, possibleH)
Return New Size(w, h)
End Function
Private Function GetPossibleSize(gridSize As Size) As Size
Dim first, last As Boolean
HasShift(first, last)
If Orientation = Orientation.Horizontal Then Return GetPossibleSizeHorizontal(gridSize, first, last)
Return GetPossibleSizeVertical(gridSize, first, last)
End Function
Private Function GetPossibleSizeVertical(gridSize As Size, first As Boolean, last As Boolean) As Size
Dim columns As Integer = ((If(first, 0, 1)) + 2 * ColumnCount - (If(last, 1, 0)))
Dim w As Double = 2 * (gridSize.Width / columns)
Dim rows As Integer = 1 + 3 * RowCount
Dim h As Double = 4 * (gridSize.Height / rows)
Return New Size(w, h)
End Function
Private Function GetPossibleSizeHorizontal(gridSize As Size, first As Boolean, last As Boolean) As Size
Dim columns As Integer = 1 + 3 * ColumnCount
Dim w As Double = 4 * (gridSize.Width / columns)
Dim rows As Integer = (If(first, 0, 1)) + 2 * RowCount - (If(last, 1, 0))
Dim h As Double = 2 * (gridSize.Height / rows)
Return New Size(w, h)
End Function
#End Region ' GetHexSize
#Region "ARRANGE"
Protected Overrides Function ArrangeOverride(finalSize As Size) As Size
Dim first, last As Boolean
HasShift(first, last)
Dim hexSize As Size = GetHexSize(finalSize)
Dim columnWidth, rowHeight As Double
If Orientation = Orientation.Horizontal Then
rowHeight = 0.5 * hexSize.Height
columnWidth = 0.25 * hexSize.Width
Else
rowHeight = 0.25 * hexSize.Height
columnWidth = 0.5 * hexSize.Width
End If
Dim elements As UIElementCollection = MyBase.InternalChildren
For i As Integer = 0 To elements.Count - 1
If elements(i).Visibility = Visibility.Collapsed Then Continue For
ArrangeElement(elements(i), hexSize, columnWidth, rowHeight, first)
Next
Return finalSize
End Function
Private Sub ArrangeElement(e As UIElement, hexSize As Size, columnWidth As Double, rowHeight As Double, shift As Boolean)
Dim row As Integer = GetRow(e)
Dim column As Integer = GetColumn(e)
Dim x As Double
Dim y As Double
If Orientation = Orientation.Horizontal Then
x = 3 * columnWidth * column
y = rowHeight * (2 * row + (If(column Mod 2 = 1, 1, 0)) + (If(shift, -1, 0)))
Else
x = columnWidth * (2 * column + (If(row Mod 2 = 1, 1, 0)) + (If(shift, -1, 0)))
y = 3 * rowHeight * row
End If
e.Arrange(New Rect(x, y, hexSize.Width, hexSize.Height))
End Sub
#End Region ' Arrange
End Class
Public Class EgtHexList
Inherits ListBox
Shared Sub New()
DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtHexList),
New FrameworkPropertyMetadata(GetType(EgtHexList)))
End Sub
Public Shared ReadOnly OrientationProperty As DependencyProperty = EgtHexagon.OrientationProperty.AddOwner(GetType(EgtHexList))
Public Shared ReadOnly RowCountProperty As DependencyProperty = EgtHexagon.RowCountProperty.AddOwner(GetType(EgtHexList))
Public Shared ReadOnly ColumnCountProperty As DependencyProperty = EgtHexagon.ColumnCountProperty.AddOwner(GetType(EgtHexList))
Public Property Orientation As Orientation
Get
Return CType(GetValue(OrientationProperty), Orientation)
End Get
Set(value As Orientation)
SetValue(OrientationProperty, value)
End Set
End Property
Public Property RowCount As Integer
Get
Return CInt(GetValue(RowCountProperty))
End Get
Set(value As Integer)
SetValue(RowCountProperty, value)
End Set
End Property
Public Property ColumnCount As Integer
Get
Return CInt(GetValue(ColumnCountProperty))
End Get
Set(value As Integer)
SetValue(ColumnCountProperty, value)
End Set
End Property
Protected Overrides Function IsItemItsOwnContainerOverride(item As Object) As Boolean
Return (TypeOf item Is EgtHexItem)
End Function
Protected Overrides Function GetContainerForItemOverride() As DependencyObject
Return New EgtHexItem()
End Function
End Class
Public Class EgtHexItem
Inherits ListBoxItem
Shared Sub New()
DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtHexItem),
New FrameworkPropertyMetadata(GetType(EgtHexItem)))
End Sub
Public Shared ReadOnly OrientationProperty As DependencyProperty = EgtHexagon.OrientationProperty.AddOwner(GetType(EgtHexItem))
Public Property Orientation As Orientation
Get
Return CType(GetValue(OrientationProperty), Orientation)
End Get
Set(value As Orientation)
SetValue(OrientationProperty, value)
End Set
End Property
End Class
Public Class HexClipConverter
Implements IMultiValueConverter
Public Function Convert(values() As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IMultiValueConverter.Convert
Dim width As Double = CDbl(values(0))
Dim height As Double = CDbl(values(1))
Dim orientation As Orientation = CType(values(2), Orientation)
If width <= 0 OrElse height <= 0 Then Return Nothing
Dim pathGeometry As New PathGeometry With {
.Figures = New PathFigureCollection()
}
Dim pathFigure As New PathFigure()
If orientation = Orientation.Horizontal Then
pathFigure.StartPoint = New Point(0, height * 0.5)
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.25, 0)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.75, 0)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.5)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.75, height)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.25, height)})
Else
pathFigure.StartPoint = New Point(width * 0.5, 0)
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.25)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width, height * 0.75)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(width * 0.5, height)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(0, height * 0.75)})
pathFigure.Segments.Add(New LineSegment() With {.Point = New Point(0, height * 0.25)})
End If
pathGeometry.Figures.Add(pathFigure)
Return pathGeometry
End Function
Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
Throw New NotImplementedException()
End Function
End Class
+10
View File
@@ -27,8 +27,10 @@
' <MyNamespace:EgtCustomWindow/>
'
Imports System.Windows.Controls.Primitives
Imports System.Windows.Interop
Imports System.Runtime.InteropServices
Imports EgtWPFLib5
<TemplatePart(Name:="PART_MoveRectangle", Type:=GetType(TextBlock))>
<TemplatePart(Name:="PART_ResizeGrid", Type:=GetType(Grid))>
@@ -218,6 +220,8 @@ Public Class EgtCustomWindow
End Sub
Sub New()
' necessario per impostare l'altezza della barra che per default si autoadatta al contenuto
'TitleBarHeight = Double.NaN
End Sub
Sub New(Owner As Window)
@@ -391,6 +395,12 @@ Public Class EgtCustomWindow
End If
End Sub
'Private Sub MoveRectangle_PreviewMouseDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
' If m_IsMovable And e.LeftButton = MouseButtonState.Pressed Then
' Me.DragMove()
' End If
'End Sub
Private mRestoreIfMove As Boolean = False
Private Sub MoveRectangle_MouseLeftButtonDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
+10
View File
@@ -27,6 +27,7 @@
' <MyNamespace:EgtFloatingManager/>
'
Imports System.Windows.Controls.Primitives
Imports System.Collections.ObjectModel
Namespace EgtFloating
@@ -74,10 +75,19 @@ Namespace EgtFloating
End Sub
Private Sub Me_Loaded(sender As Object, e As System.Windows.RoutedEventArgs) Handles Me.Loaded
'm_ParentWindow = Utility.FindAncestor(Of Window)(Me)
m_ParentWindow = Window.GetWindow(Me)
If Me.Items.Count > 0 AndAlso TypeOf Me.Items(Me.Items.Count - 1) Is EgtFloatingTray Then
LastChildFill = False
End If
' PERMETTE DI SPOSTARE LE WINDOW TRAY NEL CASO VENGA SPOSTATA LA MAINWINDOW!!!!!!!
'For TrayIndex = 0 To Me.Items.Count - 1
' If TypeOf Me.Items(TrayIndex) Is EgtFloatingTray Then
' Dim TrayItem As EgtFloatingTray = DirectCast(Me.Items(TrayIndex), EgtFloatingTray)
' AddHandler ParentWindow.LocationChanged, AddressOf TrayItem.Me_LocationChanged
' AddHandler ParentWindow.SizeChanged, AddressOf TrayItem.Me_DimensionChanged
' End If
'Next
End Sub
End Class
+14
View File
@@ -27,6 +27,8 @@
' <MyNamespace:EgtFloatingPanelTray/>
'
Imports System.Collections.ObjectModel
Namespace EgtFloating
<TemplatePart(Name:="PART_StackPanel", Type:=GetType(StackPanel))>
@@ -35,6 +37,16 @@ Namespace EgtFloating
Private m_FloatingManager As EgtFloatingManager ' Riferimento al floating manager da cui è stato creato
'Private m_EgtFloatingPanelList As New ObservableCollection(Of EgtFloatingPanel)
'Public Property EgtFloatingPanelList As ObservableCollection(Of EgtFloatingPanel)
' Get
' Return m_EgtFloatingPanelList
' End Get
' Set(value As ObservableCollection(Of EgtFloatingPanel))
' value = m_EgtFloatingPanelList
' End Set
'End Property
Private m_TrayWindow As Window
Public ReadOnly Property TrayWindow As Window
Get
@@ -65,6 +77,8 @@ Namespace EgtFloating
m_TrayWindow.Height = Me.ActualHeight
m_TrayWindow.Width = Me.ActualWidth
m_TrayWindow.Show()
'DA ABILITARE PER PERMETTERE DI SPOSTARE LE WINDOW TRAY NEL CASO VENGA SPOSTATA LA MAINWINDOW!!!!!!!
'AddHandler m_FloatingManager.ParentWindow.LocationChanged, AddressOf Me_LocationChanged
AddHandler m_FloatingManager.ParentWindow.SizeChanged, AddressOf Me_DimensionChanged
' eseguo il calcolo delle dimensioni all'avvio
Me_DimensionChanged()
+20
View File
@@ -28,6 +28,7 @@
'
Imports System.Runtime.InteropServices
Imports System.Windows.Controls.Primitives
Imports System.Windows.Interop
<TemplatePart(Name:="PART_MoveRectangle", Type:=GetType(TextBlock))>
@@ -118,6 +119,8 @@ Public Class EgtMainWindow
End Sub
Sub New()
' necessario per impostare l'altezza della barra che per default si autoadatta al contenuto
'TitleBarHeight = Double.NaN
End Sub
Sub New(Owner As Window)
@@ -285,6 +288,12 @@ Public Class EgtMainWindow
End If
End Sub
'Private Sub MoveRectangle_PreviewMouseDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
' If m_IsMovable And e.LeftButton = MouseButtonState.Pressed Then
' Me.DragMove()
' End If
'End Sub
Private mRestoreIfMove As Boolean = False
Private Sub MoveRectangle_MouseLeftButtonDown(sender As Object, e As System.Windows.Input.MouseButtonEventArgs)
@@ -355,6 +364,17 @@ Public Class EgtMainWindow
#End Region
''Evento che lancia una finestra come figlia in modalità dialogo
'Friend Sub TitleBarIcon_PreviewMouseDown()
' If Not IsNothing(AboutBox) And TypeOf AboutBox Is Window Then
' If m_bFirst Then
' AboutBox.ShowDialog()
' Else
' AboutBox.Visibility = Windows.Visibility.Visible
' End If
' End If
'End Sub
#Region "Call Win32 MSG"
Const MONITOR_DEFAULTTONEAREST As Integer = &H2
@@ -1,430 +0,0 @@
<EgtWPFLib5:EgtCustomWindow x:Class="EgtManageFileDialogV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
Title="{Binding sTitle}"
WindowStartupLocation="CenterOwner"
WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
IsMinimizable="False" ShowInTaskbar="False"
Height="500" Width="800"
CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
<Grid Margin="5,5,5,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Margin="5,5,5,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Command="{Binding GoBack_Command}"
HorizontalAlignment="Right"
Margin="2.5,0,5,0"
BorderBrush="Transparent"
Height="24"
Width="64"
BorderThickness="1"
FontSize="12">
<Image Source="\Resources\EgtDialog\Restore.png"
Stretch="Uniform"/>
</Button>
<TextBlock Grid.Column="1"
Margin="5"
Text="{Binding sSelPath}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"/>
<ComboBox Grid.Column="2"
HorizontalAlignment="Right"
IsSynchronizedWithCurrentItem="True"
ItemsSource="{Binding ViewModeList}"
SelectedItem="{Binding SelViewMode}"
Width="200"
Height="25"
Margin="2.5,5,2.5,5"
BorderThickness="1"/>
</Grid>
<Grid Grid.Row="1"
Margin="5,5,5,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="4*"/>
</Grid.ColumnDefinitions>
<TreeView x:Name="FileTree"
ItemsSource="{Binding RootList}"
Margin="10"
FontSize="15"
BorderBrush="White">
<TreeView.Resources>
<HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}"
ItemsSource="{Binding TreeItemList_View}">
<StackPanel Orientation="Horizontal">
<Image Source="{Binding sIconSource}"
Height="15"
Stretch="Uniform"/>
<TextBlock Text="{Binding sName}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"/>
</StackPanel>
</HierarchicalDataTemplate>
<DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
<StackPanel Orientation="Horizontal">
<Image Source="{Binding sIconSource}"
Height="15"
Stretch="Uniform"/>
<TextBlock Text="{Binding sName}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"/>
</StackPanel>
</DataTemplate>
</TreeView.Resources>
<TreeView.ItemContainerStyle>
<Style TargetType="{x:Type TreeViewItem}">
<Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
<Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
</Style>
</TreeView.ItemContainerStyle>
</TreeView>
<TabControl Grid.Column="1"
Background="Transparent"
BorderBrush="White"
BorderThickness="0"
SelectedIndex="{Binding nSelTab}">
<TabControl.ItemContainerStyle>
<Style TargetType="{x:Type TabItem}">
<Setter Property="Visibility" Value="Collapsed"/>
</Style>
</TabControl.ItemContainerStyle>
<TabItem Header="LISTBOX">
<ListBox x:Name="FileList"
Grid.Row="1"
Margin="5,5,5,5"
BorderBrush="White"
IsSynchronizedWithCurrentItem="True"
ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
<ListBox.Resources>
<DataTemplate x:Key="ListTemplateView"
DataType="{x:Type EgtWPFLib5:EgtDirectory}">
<Grid Margin="5,5,5,0"
Height="20">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Image Source="{Binding sIconSource}"
Height="15"
Stretch="Uniform"/>
<TextBlock Grid.Column="1"
Text="{Binding sName}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"/>
</Grid>
</DataTemplate>
<DataTemplate x:Key="TilesTemplateView"
DataType="{x:Type EgtWPFLib5:EgtDirectory}">
<Grid Margin="5,5,5,0"
Height="50"
Width="250">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Image Source="{Binding sIconSource}"
Stretch="Uniform"/>
<UniformGrid Grid.Column="1"
Rows="3"
Margin="2.5,0,2.5,5">
<TextBlock TextAlignment="Left"
Text="{Binding sName}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"/>
<TextBlock TextAlignment="Left"
Text="{Binding ghTypeItem}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"/>
<TextBlock TextAlignment="Left"
Text="{Binding sDimension}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"/>
</UniformGrid>
</Grid>
</DataTemplate>
<DataTemplate x:Key="ContentTemplateView"
DataType="{x:Type EgtWPFLib5:EgtDirectory}">
<Grid Margin="5,5,5,0"
Height="50">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Image Source="{Binding sIconSource}"
Stretch="Uniform"/>
<UniformGrid Grid.Column="1"
Rows="2"
Margin="2.5,0,2.5,5">
<TextBlock TextAlignment="Left"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"
Text="{Binding sName}"/>
<TextBlock TextAlignment="Left"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"
Text="{Binding ghTypeItem}"/>
</UniformGrid>
<UniformGrid Grid.Column="2"
Rows="2"
Margin="2.5,0,2.5,5">
<TextBlock TextAlignment="Left"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"
Text="{Binding sLastModifyDate}"/>
<TextBlock TextAlignment="Left"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="12"
Text="{Binding sDimension}"/>
</UniformGrid>
</Grid>
<Border Grid.Row="1"
BorderThickness="1"
BorderBrush="LightGray"/>
</Grid>
</DataTemplate>
</ListBox.Resources>
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type EgtWPFLib5:EgtDirectory}">
<ContentControl Content="{Binding}">
<ContentControl.Style>
<Style TargetType="{x:Type ContentControl}">
<Style.Triggers>
<DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="0">
<Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
</DataTrigger>
<DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
<Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
</DataTrigger>
<DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="2">
<Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
</DataTrigger>
</Style.Triggers>
</Style>
</ContentControl.Style>
</ContentControl>
</DataTemplate>
</ListBox.ItemTemplate>
<ListBox.ItemContainerStyle>
<Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick"/>
</Style>
</ListBox.ItemContainerStyle>
<ListBox.Style>
<Style TargetType="{x:Type ListBox}">
<Style.Triggers>
<DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
Value="0">
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<WrapPanel Orientation="Vertical"/>
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
Value="1">
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal"/>
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
Value="2">
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical"
HorizontalAlignment="Stretch"/>
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</ListBox.Style>
</ListBox>
</TabItem>
<TabItem Header="DATAGRID">
<DataGrid AutoGenerateColumns="False"
IsReadOnly="True"
HeadersVisibility="Column"
ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
SelectedItem="{Binding ItemSelected}">
<DataGrid.Columns>
<DataGridTemplateColumn Width="5*">
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
HorizontalAlignment="Left"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Image Source="{Binding sIconSource}"
Margin="2.5,0,2.5,0"
Stretch="Uniform"/>
<TextBlock Grid.Column="1"
Text="{Binding sName}"
VerticalAlignment="Center"
Margin="2.5,0,0,0"/>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Binding="{Binding sLastModifyDate}"
Width="2*">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
HorizontalAlignment="Left"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Left"/>
<Setter Property="Padding" Value="12,6,12,6"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding ghTypeItem}"
Width="1*">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
HorizontalAlignment="Left"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Left"/>
<Setter Property="Padding" Value="12,6,12,6"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding sDimension}"
Width="1*">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
HorizontalAlignment="Left"/>
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="HorizontalAlignment" Value="Right"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Right"/>
<Setter Property="Padding" Value="12,6,12,6"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
</DataGrid.Columns>
<DataGrid.InputBindings>
<MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
</DataGrid.InputBindings>
</DataGrid>
</TabItem>
</TabControl>
</Grid>
<Grid Grid.Row="2"
Margin="5,5,5,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Margin="5,5,5,5"
Text="{Binding FileName_Msg}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
FontSize="12"/>
<TextBox Grid.Column="1"
Margin="2.5,2.5,2.5,5"
TextAlignment="Left"
HorizontalAlignment="Stretch"
Height="22"
FontSize="12"
VerticalContentAlignment="Center"
VerticalAlignment="Center"
Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
<ComboBox Grid.Column="2"
IsSynchronizedWithCurrentItem="True"
ItemsSource="{Binding FilterList}"
SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
DisplayMemberPath="sNameExstension"
HorizontalAlignment="Right"
Width="200"
Height="25"
Margin="10,2.5,2.5,5"
BorderThickness="1"/>
</Grid>
<UniformGrid Grid.Row="3"
Rows="1"
Margin="2.5,0,2.5,0">
<Button IsDefault="True"
Content="OK"
Command="{Binding Ok_Command}"
HorizontalAlignment="Right"
Margin="15,0,2.5,0"
BorderThickness="1,1,1,0"
Height="24"
Width="64"/>
<Button Content="Cancel"
Command="{Binding Cancel_Command}"
HorizontalAlignment="Left"
Margin="2.5,0,0,0"
BorderThickness="1,1,1,0"
Height="24"
Width="64"/>
</UniformGrid>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
@@ -1,140 +0,0 @@
Imports System.Windows.Forms
Public Class EgtManageFileDialogV
#Region "FIELDS & PROPERTIES"
Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
Private Shadows DialogResult As DialogResult
''' <summary>
''' Stringa che specifica il titolo da mostrare
''' </summary>
Public Overloads Property Title As String
Get
Return m_EgtManageFileDialogVM.sTitle
End Get
Set(value As String)
m_EgtManageFileDialogVM.sTitle = value
End Set
End Property
Public Property Filter As String
Get
Return m_EgtManageFileDialogVM.sFilter
End Get
Set(value As String)
m_EgtManageFileDialogVM.sFilter = value
End Set
End Property
Public Property InitialDirectory As String
Get
Return m_EgtManageFileDialogVM.sInitialDirectory
End Get
Set(value As String)
m_EgtManageFileDialogVM.sInitialDirectory = value
End Set
End Property
Public Property SafeFileName As String
Get
Return m_EgtManageFileDialogVM.sSaveFileName
End Get
Set(value As String)
m_EgtManageFileDialogVM.sSaveFileName = value
End Set
End Property
Public Property FileName As String
Get
Return m_EgtManageFileDialogVM.sFileName
End Get
Set(value As String)
m_EgtManageFileDialogVM.sFileName = value
End Set
End Property
Public Property FilterIndex As Integer
Get
Return m_EgtManageFileDialogVM.nFilterIndex
End Get
Set(value As Integer)
m_EgtManageFileDialogVM.nFilterIndex = value
End Set
End Property
Public Property Mode As Integer
Get
Return m_EgtManageFileDialogVM.nMode
End Get
Set(value As Integer)
m_EgtManageFileDialogVM.nMode = value
End Set
End Property
Public Property CheckFileExists As Boolean
Get
Return m_EgtManageFileDialogVM.bCheckFileExists
End Get
Set(value As Boolean)
m_EgtManageFileDialogVM.bCheckFileExists = value
End Set
End Property
Public Property ValidateNames As Boolean
Get
Return m_EgtManageFileDialogVM.bValidateNames
End Get
Set(value As Boolean)
m_EgtManageFileDialogVM.bValidateNames = value
End Set
End Property
Public Property OverwritePrompt As Boolean
Get
Return m_EgtManageFileDialogVM.bOverwritePrompt
End Get
Set(value As Boolean)
m_EgtManageFileDialogVM.bOverwritePrompt = value
End Set
End Property
#End Region ' FIELDS & PROPERTIES
#Region "CONTRUCTORS"
Sub New(Owner As Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
MyBase.New(Owner)
InitializeComponent()
Me.DataContext = EgtManageFileDialogVM
' Assegno al riferimento locale al VM il VM preso dal DataContext
m_EgtManageFileDialogVM = EgtManageFileDialogVM
End Sub
#End Region
#Region "EVENTS"
Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
Me.DialogResult = DialogResult
Me.Close()
End Sub
#End Region
#Region "METHODS"
Public Overloads Function ShowDialog() As DialogResult
MyBase.ShowDialog()
Return Me.DialogResult
End Function
Private Sub ListBoxItem_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
m_EgtManageFileDialogVM.MouseDoubleClick()
End Sub
#End Region ' METHODS
End Class
@@ -1,926 +0,0 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports System.Windows.Forms
Imports EgtUILib
Imports System.Data
Public Class EgtManageFileDialogVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Public Enum VisualizationContainerType As Integer
LISTBOX = 0
DATAGRID = 1
End Enum
Public Enum VisualizationType As Integer
LISTTEMPLATE = 0
TILESTEMPLATE = 1
CONTENTTEMPLATE = 2
DETAILSTEMPLATE = 3
End Enum
Public Enum ModeTypes As Integer
FILE = 1
FOLDER = 2
End Enum
Private m_sTitle As String
Public Property sTitle As String
Get
Return m_sTitle
End Get
Set(value As String)
m_sTitle = value
End Set
End Property
'Scelta della modalità di salvataggio 1 = file 2 = folder
Private m_nMode As Integer
Public Property nMode As Integer
Get
Return m_nMode
End Get
Set(value As Integer)
m_nMode = value
End Set
End Property
Private m_bCheckFileExists As Boolean
Public Property bCheckFileExists As Boolean
Get
Return m_bCheckFileExists
End Get
Set(value As Boolean)
m_bCheckFileExists = value
End Set
End Property
Private m_bValidateNames As Boolean
Public Property bValidateNames As Boolean
Get
Return m_bValidateNames
End Get
Set(value As Boolean)
m_bValidateNames = value
End Set
End Property
Private m_bOverwritePrompt As Boolean
Public Property bOverwritePrompt As Boolean
Get
Return m_bOverwritePrompt
End Get
Set(value As Boolean)
m_bOverwritePrompt = value
End Set
End Property
Private m_RootList As New ObservableCollection(Of EgtDirectory)
Public Property RootList As ObservableCollection(Of EgtDirectory)
Get
Return m_RootList
End Get
Set(value As ObservableCollection(Of EgtDirectory))
m_RootList = value
End Set
End Property
Public m_SelTreeItem As EgtDirectory
Public Property SelTreeItem As EgtDirectory
Get
Return m_SelTreeItem
End Get
Set(value As EgtDirectory)
m_SelTreeItem = value
NotifyPropertyChanged(NameOf(SelTreeItem))
End Set
End Property
Friend Sub UpdateSelTreeItem(Item As EgtDirectory)
m_SelTreeItem = Item
NotifyPropertyChanged(NameOf(SelTreeItem))
End Sub
Public m_ItemSelected As EgtDirectory
Public Property ItemSelected As EgtDirectory
Get
Return m_ItemSelected
End Get
Set(value As EgtDirectory)
m_ItemSelected = value
Dim Item As EgtItem = TryCast(m_ItemSelected, EgtItem)
If Not IsNothing(Item) Then
sSaveFileName = Item.sName
Else
Dim Folder As EgtFolder = TryCast(m_ItemSelected, EgtFolder)
If Not IsNothing(Folder) Then
sSaveFileName = Folder.sName
End If
End If
End Set
End Property
Friend Sub SetItemSelected(value As EgtDirectory)
m_ItemSelected = value
NotifyPropertyChanged(NameOf(ItemSelected))
End Sub
'Percorso del file o della cartella
Private m_sSelPath As String
Public Overloads Property sSelPath As String
Get
Return m_sSelPath
End Get
Set(value As String)
m_sSelPath = value
NotifyPropertyChanged(NameOf(sSelPath))
End Set
End Property
'Textbox per visualizzare il file o la folder selezionata
Private m_sSaveFileName As String
Public Property sSaveFileName As String
Get
Return m_sSaveFileName
End Get
Set(value As String)
m_sSaveFileName = value
NotifyPropertyChanged(NameOf(sSaveFileName))
End Set
End Property
'Lista filtri estensione
Private m_FilterList As ObservableCollection(Of EgtExstension)
Public Property FilterList As ObservableCollection(Of EgtExstension)
Get
Return m_FilterList
End Get
Set(value As ObservableCollection(Of EgtExstension))
m_FilterList = value
End Set
End Property
'Scelta filtro estensione per visualizzazione
Public m_SelFilter As EgtExstension
Public Property SelFilter As EgtExstension
Get
Return m_SelFilter
End Get
Set(value As EgtExstension)
m_SelFilter = value
Dim CurrItem As EgtFolder = TryCast(m_SelTreeItem, EgtFolder)
If Not IsNothing(CurrItem) Then
CollectionViewSource.GetDefaultView(CurrItem.FolderList).Refresh()
End If
End Set
End Property
' Lista modalita' di visualizzazione
Private m_ViewModeList As ObservableCollection(Of IdNameStruct)
Public Property ViewModeList As ObservableCollection(Of IdNameStruct)
Get
Return m_ViewModeList
End Get
Set(value As ObservableCollection(Of IdNameStruct))
m_ViewModeList = value
End Set
End Property
'Scelta modalita' di visualizzazione
Private m_SelViewMode As IdNameStruct
Public Property SelViewMode As IdNameStruct
Get
Return m_SelViewMode
End Get
Set(value As IdNameStruct)
m_SelViewMode = value
Select Case m_SelViewMode.Id
Case VisualizationType.LISTTEMPLATE
m_nSelTab = VisualizationContainerType.LISTBOX
nSelTempleteListView = 0
WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.LISTTEMPLATE))
Case VisualizationType.TILESTEMPLATE
m_nSelTab = VisualizationContainerType.LISTBOX
nSelTempleteListView = 1
WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.TILESTEMPLATE))
Case VisualizationType.CONTENTTEMPLATE
m_nSelTab = VisualizationContainerType.LISTBOX
nSelTempleteListView = 2
WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.CONTENTTEMPLATE))
Case VisualizationType.DETAILSTEMPLATE
m_nSelTab = VisualizationContainerType.DATAGRID
WriteMainPrivateProfileString(S_TEMPLETESEL, K_CURRTEMPLETESEL, CStr(VisualizationType.DETAILSTEMPLATE))
End Select
NotifyPropertyChanged(NameOf(nSelTab))
End Set
End Property
' Indice modalita' di visualizzazione
Private m_nSelViewModeIndex As Integer
Public Property nSelViewModeIndex As Integer
Get
Return m_nSelViewModeIndex
End Get
Set(value As Integer)
m_nSelViewModeIndex = value
End Set
End Property
' indice di selezione del TabControl che cambia la ListBox/DataGrid
Private m_nSelTab As Integer
Public Property nSelTab As Integer
Get
Return m_nSelTab
End Get
Set(value As Integer)
m_nSelTab = value
End Set
End Property
#Region "Initial data from window opening"
' Indice del filtro estensione impostato durante creazione finestra
Private m_nFilterIndex As Integer
Public Property nFilterIndex As Integer
Get
Return m_nFilterIndex
End Get
Set(value As Integer)
m_nFilterIndex = value
m_SelFilter = m_FilterList.FirstOrDefault(Function(x) x.nIndexExstension = m_nFilterIndex)
End Set
End Property
' lista delle estensioni impostata durante creazione finestra
Private m_sFilter As String
Public Property sFilter As String
Get
Return m_sFilter
End Get
Set(value As String)
m_sFilter = value
Dim nIndex As Integer = 1
If Not IsNothing(sFilter) Then
Dim FilterListSplit As String() = sFilter.Split("|"c)
For i As Integer = 0 To FilterListSplit.Count - 1
If i Mod 2 = 0 Then
Dim strExstension As New EgtExstension() With {.m_nIndexExstension = nIndex, .m_sNameExstension = FilterListSplit(i), .m_sExstension = FilterListSplit(i + 1)}
m_FilterList.Add(strExstension)
nIndex += 1
End If
Next
End If
End Set
End Property
' Path della cartella iniziale impostata durante creazione finestra
Private m_sInitialDirectory As String
Public Property sInitialDirectory As String
Get
Return m_sInitialDirectory
End Get
Set(value As String)
m_sInitialDirectory = value
If m_sFileName = String.Empty Then m_sSaveFileName = "New.icrs"
m_sSelPath = m_sInitialDirectory
Dim DirectoryStart As String() = m_sInitialDirectory.Split("\"c)
Dim m_RootListTmp As New ObservableCollection(Of EgtDirectory)
Dim dir As EgtDirectory
Dim count As Integer = 1
Dim currItem As EgtFolder
m_RootListTmp = m_RootList
For Each directory As String In DirectoryStart
dir = m_RootListTmp.FirstOrDefault(Function(x) x.sName.Trim("\"c) = directory)
dir.IsExpanded = True
currItem = TryCast(dir, EgtFolder)
m_RootListTmp = currItem.FolderList
If count = DirectoryStart.Count Then
dir.IsSelected = True
Else
count += 1
End If
Next
End Set
End Property
' Nome del file iniziale impostato durante creazione finestra
Private m_sFileName As String
Public Property sFileName As String
Get
Return m_sFileName
End Get
Set(value As String)
m_sFileName = value
m_sSaveFileName = Path.GetFileName(m_sFileName)
End Set
End Property
#End Region ' Initial data from window opening
' Scelta per la visualizzazione del templete della lista
Private m_nSelTempleteListView As Integer
Public Property nSelTempleteListView As Integer
Get
Return m_nSelTempleteListView
End Get
Set(value As Integer)
m_nSelTempleteListView = value
NotifyPropertyChanged(NameOf(nSelTempleteListView))
End Set
End Property
#Region "Messages"
Public ReadOnly Property Name_Msg As String
Get
Return EgtMsg(15060) ' Nome
End Get
End Property
Public ReadOnly Property LastModify_Msg As String
Get
Return EgtMsg(15061) ' Ultima Modifica
End Get
End Property
Public ReadOnly Property Type_Msg As String
Get
Return EgtMsg(15062) ' Tipo
End Get
End Property
Public ReadOnly Property Dimension_Msg As String
Get
Return EgtMsg(15063) ' Dimensione
End Get
End Property
Public ReadOnly Property FileName_Msg As String
Get
Return If(m_nMode = ModeTypes.FILE, EgtMsg(15065), EgtMsg(15066)) ' File Name Folder Name
End Get
End Property
#End Region
'Comandi
Private m_cmdCancel As ICommand
Private m_cmdOk As ICommand
Private m_cmdGoBack As ICommand
Private m_cmdDoubleClick As ICommand
Public Event m_CloseWindow(bDialogResult As DialogResult)
#End Region ' FIELDS & PROPERTIES
#Region "CONTRUCTORS"
Sub New()
m_RootList.Clear()
EgtDirectory.refUpdateSelTreeItem = AddressOf UpdateSelTreeItem
Dim drives As DriveInfo() = DriveInfo.GetDrives().Where(Function(d) d.IsReady).ToArray()
m_FilterList = New ObservableCollection(Of EgtExstension)
EgtFolder.SetEgtManageFileDialogVM(Me)
For i As Integer = 0 To drives.Count() - 1
Dim directory As New EgtFolder(drives(i).RootDirectory, Nothing, "\Resources\EgtDialog\Root.png")
m_RootList.Add(directory)
Next
m_SelFilter = New EgtExstension()
SetVisualizzationList()
Dim IndexTemplete As Integer = GetMainPrivateProfileInt(S_TEMPLETESEL, K_CURRTEMPLETESEL, VisualizationContainerType.DATAGRID)
SelViewMode = m_ViewModeList.FirstOrDefault(Function(x) x.Id = IndexTemplete)
NotifyPropertyChanged(NameOf(RootList))
NotifyPropertyChanged(NameOf(FilterList))
NotifyPropertyChanged(NameOf(ViewModeList))
NotifyPropertyChanged(NameOf(FileName_Msg))
NotifyPropertyChanged(NameOf(SelViewMode))
End Sub
#End Region ' CONTRUCTORS
#Region "METHODS"
''' <summary>
''' Inizializza la ComboBox per la scelta dei template
''' </summary>
Private Sub SetVisualizzationList()
m_ViewModeList = New ObservableCollection(Of IdNameStruct)
Dim ItemVisualization As New IdNameStruct With {
.Id = 0,
.Name = EgtMsg(15067) ' List Templete
}
m_ViewModeList.Add(ItemVisualization)
ItemVisualization.Id = 3
ItemVisualization.Name = EgtMsg(15068) ' Detalis Templete
m_ViewModeList.Add(ItemVisualization)
ItemVisualization.Id = 1
ItemVisualization.Name = EgtMsg(15069) ' Tiles Templete
m_ViewModeList.Add(ItemVisualization)
ItemVisualization.Id = 2
ItemVisualization.Name = EgtMsg(15070) ' Content Templete
m_ViewModeList.Add(ItemVisualization)
End Sub
#End Region
#Region "COMMANDS"
#Region "Ok"
Public ReadOnly Property Ok_Command As ICommand
Get
If m_cmdOk Is Nothing Then
m_cmdOk = New Command(AddressOf Ok)
End If
Return m_cmdOk
End Get
End Property
Public Sub Ok()
Dim CurrItem As EgtItem = TryCast(m_ItemSelected, EgtItem)
Dim simbolsCharacter As String() = {"<"c, ">"c, ":"c, "'"c, "/"c, "\"c, "|"c, "?"c, "*"c,
"CON", "PRN", "AUX", "NUL", "COM0", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
"LPT0", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"}
If nMode = ModeTypes.FILE Then
If Not IsNothing(CurrItem) And m_bCheckFileExists And m_bValidateNames Then
For Each simbol As String In simbolsCharacter
If m_sSaveFileName.Contains(simbol) Then
If EgtMessageBoxV.Show(System.Windows.Application.Current.MainWindow, EgtMsg(15072), sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.Cancel Then ' Errore file contiene simboli non conformi
sSaveFileName = CurrItem.sName
Return
End If
Else
m_sFileName = m_SelTreeItem.sFullName & "\" & m_sSaveFileName
End If
Next
ElseIf m_bValidateNames = False And m_bOverwritePrompt Then
If Not IsNothing(CurrItem) Then
If m_sFileName.Equals(m_sSaveFileName) OrElse m_sSaveFileName.Equals(CurrItem.sName) Then
If EgtMessageBoxV.Show(System.Windows.Application.Current.MainWindow, EgtMsg(15073), sTitle, MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then
Return
End If
End If
Else
m_sFileName = m_SelTreeItem.sFullName & "\" & m_sSaveFileName
End If
Else
m_sFileName = m_SelTreeItem.sFullName & "\" & m_sSaveFileName
End If
ElseIf nMode = ModeTypes.FOLDER Then
For Each simbol As String In simbolsCharacter
If m_sSaveFileName.Contains(simbol) Then
If EgtMessageBoxV.Show(System.Windows.Application.Current.MainWindow, EgtMsg(15072), sTitle, MessageBoxButton.OKCancel, MessageBoxImage.Error) = MessageBoxResult.Cancel Then ' Errore file contiene simboli non conformi
Return
End If
Else
m_sFileName = m_SelTreeItem.sFullName
End If
Next
End If
RaiseEvent m_CloseWindow(DialogResult.OK)
End Sub
#End Region 'Ok
#Region "GoBack"
Public ReadOnly Property GoBack_Command As ICommand
Get
If m_cmdGoBack Is Nothing Then
m_cmdGoBack = New Command(AddressOf GoBack)
End If
Return m_cmdGoBack
End Get
End Property
Public Sub GoBack()
If Not IsNothing(m_SelTreeItem) AndAlso Not IsNothing(m_SelTreeItem.m_ParentFolder) Then
If TypeOf m_SelTreeItem.m_ParentFolder Is EgtFolder Then
Dim CurrParentFolder As EgtFolder = DirectCast(m_SelTreeItem.m_ParentFolder, EgtFolder)
CurrParentFolder.SetIsSelected(True, False)
End If
m_sSelPath = DirectCast(m_SelTreeItem, EgtFolder).sFullName
NotifyPropertyChanged(NameOf(sSelPath))
End If
End Sub
#End Region 'GoBack
#Region "Cancel"
Public ReadOnly Property Cancel_Command As ICommand
Get
If m_cmdCancel Is Nothing Then
m_cmdCancel = New Command(AddressOf Cancel)
End If
Return m_cmdCancel
End Get
End Property
Public Sub Cancel()
RaiseEvent m_CloseWindow(DialogResult.Cancel)
End Sub
#End Region 'Cancel
#Region "DoubleClick"
Public ReadOnly Property DoubleClick_Command As ICommand
Get
If m_cmdDoubleClick Is Nothing Then
m_cmdDoubleClick = New Command(AddressOf MouseDoubleClick)
End If
Return m_cmdDoubleClick
End Get
End Property
Public Sub MouseDoubleClick()
m_ItemSelected.IsExpanded = True
If TypeOf m_ItemSelected Is EgtFolder Then
Dim CurrItemSelected As EgtFolder = DirectCast(m_ItemSelected, EgtFolder)
CurrItemSelected.SetIsSelected(True, True)
m_sSelPath = CurrItemSelected.sFullName
Else
m_ItemSelected.IsSelected = True
End If
NotifyPropertyChanged(NameOf(sSelPath))
End Sub
#End Region 'DoubleClick
#End Region ' COMMANDS
End Class
Public Class EgtExstension
Inherits VMBase
' Indice estensione
Public m_nIndexExstension As Integer
Public Property nIndexExstension As Integer
Get
Return m_nIndexExstension
End Get
Set(value As Integer)
m_nIndexExstension = value
NotifyPropertyChanged(NameOf(nIndexExstension))
End Set
End Property
' Nome della stringa Filter Splittata m_sNameExstension = Icarus project
Public m_sNameExstension As String
Public Property sNameExstension As String
Get
Return m_sNameExstension
End Get
Set(value As String)
m_sNameExstension = value
NotifyPropertyChanged(NameOf(sNameExstension))
End Set
End Property
' Estensione della stringa Filter Splittata m_sExstension = *.icrs
Public m_sExstension As String
Public Property sExstension As String
Get
Return m_sExstension
End Get
Set(value As String)
m_sExstension = value
NotifyPropertyChanged(NameOf(sExstension))
End Set
End Property
End Class
Public MustInherit Class EgtDirectory
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Friend Shared refUpdateSelTreeItem As Action(Of EgtDirectory)
Friend Shared m_refEgtManageFileDialogVM As EgtManageFileDialogVM
Friend Shared Sub SetEgtManageFileDialogVM(EgtManageFileDialogVM As EgtManageFileDialogVM)
m_refEgtManageFileDialogVM = EgtManageFileDialogVM
End Sub
Protected m_bIsSelected As Boolean
Public MustOverride Property IsSelected As Boolean
Protected m_bIsExpanded As Boolean
Public Overridable Property IsExpanded As Boolean
Public MustOverride ReadOnly Property sFullName As String
Protected m_sName As String
Public MustOverride ReadOnly Property sName As String
Protected m_sIconSource As String
Public Overridable ReadOnly Property sIconSource As String
Get
Return m_sIconSource
End Get
End Property
Protected m_sTypeItem As String
Public MustOverride ReadOnly Property sTypeItem As String
Protected m_ghTypeItem As String
Public Overridable ReadOnly Property ghTypeItem As String
Protected m_dtLastModifyDate As Date
Public MustOverride ReadOnly Property sLastModifyDate As String
Public m_ParentFolder As EgtFolder
Public Property ParentFolder As EgtFolder
Get
Return m_ParentFolder
End Get
Set(value As EgtFolder)
m_ParentFolder = value
End Set
End Property
#End Region ' FIELDS & PROPERTIES
End Class
Public Class EgtFolder
Inherits EgtDirectory
#Region "FIELDS & PROPERTIES"
Private m_ItemList_View As CollectionView = Nothing
Private m_TreeItemList_ViewSource As CollectionViewSource = Nothing
Private m_TreeItemList_View As CollectionView = Nothing
Public ReadOnly Property TreeItemList_View As CollectionView
Get
Return m_TreeItemList_View
End Get
End Property
Private m_DirectoryInfo As DirectoryInfo
Private m_FolderList As New ObservableCollection(Of EgtDirectory)
Public Property FolderList As ObservableCollection(Of EgtDirectory)
Get
Return m_FolderList
End Get
Set(value As ObservableCollection(Of EgtDirectory))
m_FolderList = value
End Set
End Property
Public Overrides ReadOnly Property sFullName As String
Get
Return m_DirectoryInfo.FullName
End Get
End Property
Public Overrides ReadOnly Property sName As String
Get
Return m_DirectoryInfo.Name
End Get
End Property
Public Overrides ReadOnly Property sTypeItem As String
Get
Return EgtMsg(15064) ' Cartella di File
End Get
End Property
Public Overrides ReadOnly Property sLastModifyDate As String
Get
Return m_DirectoryInfo.LastWriteTime.ToString("dd/MM/yyyy HH:mm:ss")
End Get
End Property
Public Overrides Property IsExpanded As Boolean
Get
Return m_bIsExpanded
End Get
Set(value As Boolean)
m_bIsExpanded = value
NotifyPropertyChanged(NameOf(IsExpanded))
If m_bIsExpanded Then
SetFolderList()
End If
End Set
End Property
Public Overrides Property IsSelected As Boolean
Get
Return m_bIsSelected
End Get
Set(value As Boolean)
m_bIsSelected = value
m_refEgtManageFileDialogVM.sSelPath = m_DirectoryInfo.FullName
If m_bIsSelected Then
SetFolderList()
refUpdateSelTreeItem(Me)
NotifyPropertyChanged(NameOf(IsSelected))
End If
End Set
End Property
Friend Sub SetIsSelected(value As Boolean, bRefreshList As Boolean)
Dim sSelListItemPath As String = ""
If Not IsNothing(m_refEgtManageFileDialogVM.SelTreeItem) Then
sSelListItemPath = m_refEgtManageFileDialogVM.SelTreeItem.sFullName
End If
m_bIsSelected = value
m_refEgtManageFileDialogVM.sSelPath = m_DirectoryInfo.FullName
If m_bIsSelected Then
If bRefreshList Then SetFolderList()
refUpdateSelTreeItem(Me)
End If
If Not IsNothing(sSelListItemPath) Then
Dim SelFolderItem As EgtDirectory = m_FolderList.FirstOrDefault(Function(x) x.sFullName = sSelListItemPath)
If Not IsNothing(SelFolderItem) Then
m_refEgtManageFileDialogVM.SetItemSelected(SelFolderItem)
End If
End If
NotifyPropertyChanged(NameOf(IsSelected))
End Sub
#End Region ' FIELDS & PROPERTIES
#Region "CONTRUCTORS"
Sub New()
End Sub
Sub New(DirectoryInfo As DirectoryInfo, Parent As EgtDirectory, Optional IconSource As String = "\Resources\EgtDialog\Folder.png")
m_DirectoryInfo = DirectoryInfo
m_sIconSource = IconSource
Try
If DirectoryInfo.EnumerateDirectories.Count > 0 Then
m_FolderList.Add(New EgtFolder())
End If
Catch ex As Exception
End Try
m_ParentFolder = CType(Parent, EgtFolder)
m_ItemList_View = CType(CollectionViewSource.GetDefaultView(m_FolderList), CollectionView)
m_ItemList_View.Filter = AddressOf ItemFilter
m_TreeItemList_ViewSource = New CollectionViewSource() With {.Source = m_FolderList}
m_TreeItemList_View = CType(m_TreeItemList_ViewSource.View, CollectionView)
m_TreeItemList_View.Filter = AddressOf TreeItemListFilter
NotifyPropertyChanged(NameOf(sName))
NotifyPropertyChanged(NameOf(sLastModifyDate))
NotifyPropertyChanged(NameOf(sTypeItem))
NotifyPropertyChanged(NameOf(sIconSource))
NotifyPropertyChanged(NameOf(FolderList))
NotifyPropertyChanged(NameOf(ParentFolder))
End Sub
#End Region ' CONTRUCTORS
#Region "METHODS"
''' <summary>
''' Funzione per la visualizzazione delle sole cartelle nell'albero TreeView
''' </summary>
''' <param name="CurrItem"></param>
''' <returns></returns>
Private Function TreeItemListFilter(CurrItem As Object) As Boolean
Return TypeOf CurrItem Is EgtFolder
End Function
''' <summary>
''' Funzione per il controllo del filtro per i singoli Item se l'estensione scelta e' .icrs verrano visualizzati tutti i file con l'estensione .icrs
''' </summary>
''' <param name="Item"></param>
''' <returns></returns>
Private Function ItemFilter(Item As Object) As Boolean
Dim CurrItem As EgtItem = TryCast(Item, EgtItem)
If Not IsNothing(CurrItem) AndAlso Not IsNothing(m_refEgtManageFileDialogVM.m_SelFilter.m_sExstension) Then
If CurrItem.sTypeItem = m_refEgtManageFileDialogVM.m_SelFilter.m_sExstension.TrimStart("*"c) Then
Return True
ElseIf m_refEgtManageFileDialogVM.m_SelFilter.m_sExstension.TrimStart("*"c) = ".*" Then
Return True
Else
Return False
End If
End If
Return True
End Function
''' <summary>
''' Funzione per popolare la lista FolderList
''' </summary>
Private Sub SetFolderList()
Dim DirectoryList() As DirectoryInfo
Dim FileList() As FileInfo
Try
DirectoryList = m_DirectoryInfo.GetDirectories().Where(Function(file) (file.Attributes And FileAttributes.Hidden And CType(file.Name <> EgtMsg(15071), Global.System.IO.FileAttributes)) = 0).ToArray() ' ProgramData
FileList = m_DirectoryInfo.GetFiles().Where(Function(file) (file.Attributes And FileAttributes.Hidden) = 0).ToArray()
Catch ex As Exception
DirectoryList = Nothing
FileList = Nothing
End Try
m_FolderList.Clear()
If Not IsNothing(DirectoryList) AndAlso m_FolderList.Count = 0 Then
For Each subDir As DirectoryInfo In DirectoryList
Dim directory As New EgtFolder(subDir, Me)
m_FolderList.Add(directory)
Next
End If
If Not IsNothing(FileList) Then
For Each files As FileInfo In FileList
Dim file As New EgtItem(files)
m_FolderList.Add(file)
Next
End If
End Sub
#End Region
End Class
Public Class EgtItem
Inherits EgtDirectory
#Region "FIELDS & PROPERTIES"
Private m_FileInfo As FileInfo
Public Overrides ReadOnly Property sFullName As String
Get
Return m_FileInfo.FullName
End Get
End Property
Public Overrides ReadOnly Property sName As String
Get
Return m_FileInfo.Name
End Get
End Property
Public Overrides ReadOnly Property sTypeItem As String
Get
If Not IsNothing(m_FileInfo) AndAlso Not IsNothing(m_FileInfo.Extension) AndAlso Not String.IsNullOrWhiteSpace(m_FileInfo.Extension) Then
Return m_FileInfo.Extension
Else
Return ""
End If
End Get
End Property
Public Overrides ReadOnly Property ghTypeItem As String
Get
Return If(Not String.IsNullOrWhiteSpace(sTypeItem), "File " & sTypeItem.ToUpper(), "")
End Get
End Property
Public ReadOnly Property sDimension As String
Get
Return If(m_FileInfo.Length / 1024 / 1024 > 1, String.Format("{0:#,##0.00}", m_FileInfo.Length / 1024 / 1024) & " Mb", String.Format("{0:#,##0.00}", m_FileInfo.Length / 1024) & " Kb")
End Get
End Property
Public Overrides ReadOnly Property sLastModifyDate As String
Get
Return m_FileInfo.LastWriteTime.ToString("dd/MM/yyyy HH:mm:ss")
End Get
End Property
Public Overrides Property IsSelected As Boolean
Get
Return m_bIsSelected
End Get
Set(value As Boolean)
m_bIsSelected = value
refUpdateSelTreeItem(Me)
End Set
End Property
#End Region ' FIELDS & PROPERTIES
#Region "CONTRUCTORS"
Sub New(FileInfo As FileInfo)
m_FileInfo = FileInfo
m_sIconSource = "\Resources\EgtDialog\New.png"
NotifyPropertyChanged(NameOf(sName))
NotifyPropertyChanged(NameOf(sDimension))
NotifyPropertyChanged(NameOf(sLastModifyDate))
NotifyPropertyChanged(NameOf(sTypeItem))
NotifyPropertyChanged(NameOf(sIconSource))
End Sub
#End Region ' CONTRUCTORS
End Class
-52
View File
@@ -1,52 +0,0 @@
<EgtWPFLib5:EgtCustomWindow x:Class="EgtMessageBoxV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
Title="{Binding sTitle}"
SizeToContent="WidthAndHeight"
WindowStartupLocation="CenterOwner"
WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
IsMinimizable="False" ShowInTaskbar="False"
CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
<Grid Margin="2.5,2.5,2.5,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Margin="20,20,20,20">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Image Source="{Binding sIconSource}"
Margin="0,0,0,0"/>
<TextBlock Grid.Column="1"
Text="{Binding sMessage}"
Margin="5,0,5,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"/>
</Grid>
<ItemsControl Grid.Row="1"
ItemsSource="{Binding ButtonList}"
HorizontalAlignment="Center">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Rows="1"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Button IsDefault="{Binding bIsDefault}"
Content="{Binding sMessage}"
Command="{Binding Command_Command}"
Margin="2.5,0,2.5,0"
Height="24"
Width="64"
BorderThickness="1,1,1,0"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</EgtWPFLib5:EgtCustomWindow>
-107
View File
@@ -1,107 +0,0 @@
Public Class EgtMessageBoxV
#Region "FIELDS & PROPERTIES"
Private WithEvents m_EgtMessageBoxVM As EgtMessageBoxVM
Private Shadows DialogResult As MessageBoxResult
#End Region ' FIELDS & PROPERTIES
#Region "CONTRUCTORS"
Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
MyBase.New(Owner)
' This call is required by the designer.
InitializeComponent()
Me.DataContext = EgtMessageBoxVM
' Assegno al riferimento locale al VM il VM preso dal DataContext
m_EgtMessageBoxVM = EgtMessageBoxVM
End Sub
#End Region
#Region "METHODS"
''' <summary>
''' Apre una EgtMessageBox con un messaggio che ritorna un risultato
''' </summary>
''' <param name="Owner">Finestra di appartenenza</param>
''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String) As MessageBoxResult
Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText))
NewMessagebox.ShowDialog()
Return NewMessagebox.DialogResult
End Function
''' <summary>
''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
''' </summary>
''' <param name="Owner">Finestra di appartenenza</param>
''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String) As MessageBoxResult
Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption))
NewMessagebox.ShowDialog()
Return NewMessagebox.DialogResult
End Function
''' <summary>
''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
''' </summary>
''' <param name="Owner">Finestra di appartenenza</param>
''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton) As MessageBoxResult
Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button))
NewMessagebox.ShowDialog()
Return NewMessagebox.DialogResult
End Function
''' <summary>
''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
''' </summary>
''' <param name="Owner">Finestra di appartenenza</param>
''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
''' <param name="Icon">Valore che specifica quale icona mostrare</param>
''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage) As MessageBoxResult
Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon))
NewMessagebox.ShowDialog()
Return NewMessagebox.DialogResult
End Function
''' <summary>
''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
''' </summary>
''' <param name="Owner">Finestra di appartenenza</param>
''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
''' <param name="Icon">Valore che specifica quale icona mostrare</param>
''' <param name="DefaultResult">Valore che specifica il bottone di default</param>
''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult) As MessageBoxResult
Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon, DefaultResult))
NewMessagebox.ShowDialog()
Return NewMessagebox.DialogResult
End Function
#End Region ' METHODS
#Region "EVENTS"
Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
Me.DialogResult = DialogResult
Me.Close()
End Sub
#End Region
End Class
-232
View File
@@ -1,232 +0,0 @@
Imports EgtUILib
Public Class EgtMessageBoxVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Public Event m_CloseWindow(DialogResult As MessageBoxResult)
Private m_sTitle As String = ""
Public ReadOnly Property sTitle As String
Get
Return m_sTitle
End Get
End Property
Private m_sMessage As String = ""
Public ReadOnly Property sMessage As String
Get
Return m_sMessage
End Get
End Property
Private m_Button As MessageBoxButton
Private m_Icon As MessageBoxImage
Public ReadOnly Property sIconSource As String
Get
Select Case m_Icon
Case MessageBoxImage.Hand
Return "\Resources\EgtMessageBox\Hand.png"
Case MessageBoxImage.Question
Return "\Resources\EgtMessageBox\Question.png"
Case MessageBoxImage.Exclamation
Return "\Resources\EgtMessageBox\Exclamation.png"
Case MessageBoxImage.Asterisk
Return "\Resources\EgtMessageBox\Asterisk.png"
Case MessageBoxImage.Stop
Return "\Resources\EgtMessageBox\Hand.png"
Case MessageBoxImage.Error
Return "\Resources\EgtMessageBox\Hand.png"
Case MessageBoxImage.Warning
Return "\Resources\EgtMessageBox\Exclamation.png"
Case MessageBoxImage.Information
Return "\Resources\EgtMessageBox\Asterisk.png"
Case Else ' MessageBoxImage.None
Return ""
End Select
End Get
End Property
Private m_ButtonList As New List(Of EgtMsgBoxButton)
Public Property ButtonList As List(Of EgtMsgBoxButton)
Get
Return m_ButtonList
End Get
Set(value As List(Of EgtMsgBoxButton))
m_ButtonList = value
End Set
End Property
#End Region ' FIELDS & PROPERTIES
#Region "CONTRUCTORS"
Sub New(sMessageBoxText As String)
EgtMsgBoxButton.SetOwner(Me)
m_sMessage = sMessageBoxText
m_Button = MessageBoxButton.OK
m_Icon = MessageBoxImage.None
NotifyPropertyChanged(NameOf(ButtonList))
NotifyPropertyChanged(NameOf(sIconSource))
End Sub
Sub New(sMessageBoxText As String, sCaption As String)
MyClass.New(sMessageBoxText)
m_sTitle = sCaption
End Sub
Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton)
MyClass.New(sMessageBoxText, sCaption)
m_Button = Button
Select Case m_Button
Case MessageBoxButton.OK
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.OK))
Case MessageBoxButton.OKCancel
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.OK))
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.CANCEL))
Case MessageBoxButton.YesNoCancel
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.YES))
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.NO))
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.CANCEL))
Case MessageBoxButton.YesNo
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.YES))
m_ButtonList.Add(New EgtMsgBoxButton(EgtMsgBoxButton.Types.NO))
End Select
NotifyPropertyChanged(NameOf(ButtonList))
End Sub
Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage)
MyClass.New(sMessageBoxText, sCaption, Button)
m_Icon = Icon
NotifyPropertyChanged(NameOf(sIconSource))
End Sub
Sub New(sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult)
MyClass.New(sMessageBoxText, sCaption, Button, Icon)
Dim DefaultBtn As EgtMsgBoxButton = m_ButtonList.FirstOrDefault(Function(x) (x.Type = EgtMsgBoxButton.Types.OK AndAlso DefaultResult = MessageBoxResult.OK) OrElse
(x.Type = EgtMsgBoxButton.Types.CANCEL AndAlso DefaultResult = MessageBoxResult.Cancel) OrElse
(x.Type = EgtMsgBoxButton.Types.YES AndAlso DefaultResult = MessageBoxResult.Yes) OrElse
(x.Type = EgtMsgBoxButton.Types.NO AndAlso DefaultResult = MessageBoxResult.No))
If Not IsNothing(DefaultBtn) Then
DefaultBtn.SetIsDefault(True)
End If
NotifyPropertyChanged(NameOf(ButtonList))
End Sub
#End Region ' CONTRUCTORS
#Region "METHODS"
Friend Sub CloseWindow(DialogResult As MessageBoxResult)
RaiseEvent m_CloseWindow(DialogResult)
End Sub
#End Region ' METHODS
End Class
Public Class EgtMsgBoxButton
Inherits VMBase
#Region "FIELDS & PROPERTIES"
Public Enum Types As Integer
OK = 1
CANCEL = 2
YES = 3
NO = 4
End Enum
Private Shared Owner As EgtMessageBoxVM
Private m_Type As Types
Public ReadOnly Property Type As Types
Get
Return m_Type
End Get
End Property
Private m_sMessage As String
Public ReadOnly Property sMessage As String
Get
Return m_sMessage
End Get
End Property
Private m_bIsDefault As Boolean = False
Public ReadOnly Property bIsDefault As Boolean
Get
Return m_bIsDefault
End Get
End Property
Friend Sub SetIsDefault(bValue As Boolean)
m_bIsDefault = bValue
End Sub
' Definizione comandi
Private m_cmdCommand As ICommand
#End Region ' FIELDS & PROPERTIES
#Region "CONTRUCTORS"
Sub New(Type As Types)
m_Type = Type
Select Case m_Type
Case Types.OK
m_sMessage = EgtMsg(35001) ' Ok
Case Types.CANCEL
m_sMessage = EgtMsg(35002) ' Cancel
Case Types.YES
m_sMessage = EgtMsg(35003) ' Yes
Case Types.NO
m_sMessage = EgtMsg(35004) ' No
End Select
End Sub
Sub New(Type As Types, bIsDefault As Boolean)
MyClass.New(Type)
m_bIsDefault = bIsDefault
End Sub
#End Region ' CONTRUCTORS
#Region "METHODS"
Friend Shared Sub SetOwner(value As EgtMessageBoxVM)
Owner = value
End Sub
#End Region ' METHODS
#Region "COMMANDS"
#Region "Command"
Public ReadOnly Property Command_Command As ICommand
Get
If m_cmdCommand Is Nothing Then
m_cmdCommand = New Command(AddressOf Command)
End If
Return m_cmdCommand
End Get
End Property
Public Sub Command()
Select Case m_Type
Case Types.OK
Owner.CloseWindow(MessageBoxResult.OK)
Case Types.CANCEL
Owner.CloseWindow(MessageBoxResult.Cancel)
Case Types.YES
Owner.CloseWindow(MessageBoxResult.Yes)
Case Types.NO
Owner.CloseWindow(MessageBoxResult.No)
End Select
End Sub
#End Region ' Ok
#End Region ' COMMANDS
End Class
+4 -4
View File
@@ -51,7 +51,7 @@ Public Class EgtOpenFileDialog
End Get
Set(value As List(Of String))
m_FileList = value
NotifyPropertyChanged(NameOf(FileList))
NotifyPropertyChanged("FileList")
End Set
End Property
@@ -62,7 +62,7 @@ Public Class EgtOpenFileDialog
End Get
Set(value As String)
m_SelectedFile = value
NotifyPropertyChanged(NameOf(SelectedFile))
NotifyPropertyChanged("SelectedFile")
End Set
End Property
@@ -80,12 +80,12 @@ Public Class EgtOpenFileDialog
Public ReadOnly Property OpenMsg As String
Get
Return EgtMsg(30006) ' Apri
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 6)
End Get
End Property
Public ReadOnly Property CancelMsg As String
Get
Return EgtMsg(30002) ' Annulla
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
End Get
End Property
+3
View File
@@ -27,6 +27,9 @@
' <MyNamespace:EgtPanelWindow/>
'
Imports System.Windows.Controls.Primitives
<TemplatePart(Name:="PART_MoveRectangle", Type:=GetType(Rectangle))>
Public Class EgtPanelWindow
Inherits System.Windows.Window
+1
View File
@@ -28,6 +28,7 @@
'
Imports System.Windows.Controls.Primitives
Imports EgtWPFLib5
Public Class EgtScrollViewer
Inherits System.Windows.Controls.ScrollViewer
+21
View File
@@ -7,7 +7,16 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<!--<UserControl.Resources>
<LinearGradientBrush x:Key="BrushBorderIsMouseOverFText" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
<GradientStop Color="#ABADB3" Offset="0.05"/>
<GradientStop Color="#E2E3EA" Offset="0.07"/>
<GradientStop Color="#E3E9EF" Offset="1"/>
</LinearGradientBrush>
</UserControl.Resources>-->
<Grid>
<Border x:Name="Brd"
BorderThickness="1"
Padding="1"
@@ -15,32 +24,38 @@
FocusVisualStyle="{x:Null}"
ScrollViewer.PanningMode="VerticalFirst"
Stylus.IsFlicksEnabled="False">
<!--Background="{Binding CCBackground, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"-->
<Border.Style>
<Style TargetType="Border">
<Style.Triggers>
<Trigger Property="IsEnabled" Value="True">
<!--<Setter Property="Background" Value="{DynamicResource BackgroundBorderEnableTText}"/>-->
<Setter Property="Background" Value="{Binding BackgroundBrdEnable,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<!--<Setter Property="Background" Value="{DynamicResource BackgroundBorderEnableFText}"/>-->
<Setter Property="Background" Value="{Binding BackgroundBrdDisable,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<!--<Setter Property="BorderBrush" Value="{DynamicResource BrushBorderIsMouseOverTText}"/>-->
<Setter Property="BorderBrush" Value="{Binding BorderBrushIsMouseOver,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Setter Property="Cursor" Value="IBeam"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="False">
<!--<Setter Property="BorderBrush" Value="{DynamicResource BrushBorderIsMouseOverFText}"/>-->
<Setter Property="BorderBrush" Value="{Binding GeneralBorderBrush,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Setter Property="Cursor" Value="Arrow"/>
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<!--<Setter Property="BorderBrush" Value="{DynamicResource BrushBorderIsKeyboardFocusedTText}"/>-->
<Setter Property="BorderBrush" Value="{Binding BorderBrushBrdIsFocused,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -55,17 +70,21 @@
<Style TargetType="TextBlock">
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<!--<Setter Property="Background" Value="{DynamicResource BackgroundTextBlockIsEnableFText}"/>-->
<Setter Property="Background" Value="{Binding BackgroundTxBlDisable,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<!--<Setter Property="Foreground" Value="{DynamicResource ForegroundTextBlockIsEnableFText}"/>-->
<Setter Property="Foreground" Value="{Binding ForegroundTxBlDisable,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="True">
<!--<Setter Property="Background" Value="{DynamicResource BackgroundTextBlockIsEnableTText}"/>-->
<Setter Property="Background" Value="{Binding GeneralBackground,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<!--<Setter Property="Foreground" Value="{DynamicResource ForegroundTextBlockIsEnableTText}"/>-->
<Setter Property="Foreground" Value="{Binding ForegroundTxBlEnable,
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtTextBox}},
Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -76,6 +95,8 @@
</TextBlock>
</Border>
<!--Background="{DynamicResource BackgroundTextBoxText}"-->
<!--Foreground="{DynamicResource ForegroundTextBoxText}"-->
<TextBox Name="TxBx"
Visibility="Hidden"
Padding="1,1,1,0"
+6
View File
@@ -658,6 +658,12 @@ Public Class EgtTextBox
EnterKeyPress = 2
End Enum
'Shared Sub New()
' 'This OverrideMetadata call tells the system that this element wants to provide a style that is different than its base class.
' 'This style is defined in themes\generic.xaml
' DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtTextBox), New FrameworkPropertyMetadata(GetType(EgtTextBox)))
'End Sub
Private Shared Sub OnIsFocusedPropertyChanged(d As DependencyObject, e As DependencyPropertyChangedEventArgs)
If CBool(e.NewValue) Then
Dim CurrEgtTextBox As EgtTextBox = TryCast(d, EgtTextBox)
+17
View File
@@ -27,6 +27,13 @@
' <MyNamespace:EgtTextBox2/>
'
Imports System.Globalization
Imports System.Runtime
Imports System.Text
Imports System.Windows.Markup
Imports System.Windows.Threading
Imports System.Xml
<TemplatePart(Name:="PART_TextBox", Type:=GetType(TextBox))>
Public Class EgtTextBox2
Inherits System.Windows.Controls.Control
@@ -310,6 +317,16 @@ Public Class EgtTextBox2
'This OverrideMetadata call tells the system that this element wants to provide a style that is different than its base class.
'This style is defined in themes\generic.xaml
DefaultStyleKeyProperty.OverrideMetadata(GetType(EgtTextBox2), New FrameworkPropertyMetadata(GetType(EgtTextBox2)))
' il codice seguent permette di vedere lo stile xaml di un controllo base (tipo TextBox) e salvarlo in un file
'Dim Style As Style = Application.Current.TryFindResource(GetType(TextBox))
'If IsNothing(Style) Then Return
'Dim settings As XmlWriterSettings = New XmlWriterSettings()
'settings.Indent = True
'Dim sb As StringBuilder = New StringBuilder()
'Dim writer As XmlWriter = XmlWriter.Create(sb, settings)
'XamlWriter.Save(Style, writer)
'IO.File.WriteAllText("c:\Temp\TextBox.txt", sb.ToString())
End Sub
Sub New()
+1 -51
View File
@@ -92,17 +92,7 @@
<Compile Include="CheckParamV.xaml.vb">
<DependentUpon>CheckParamV.xaml</DependentUpon>
</Compile>
<Compile Include="EgtColorPicker\EgtColorPickerVM.vb" />
<Compile Include="EgtColorPicker\EgtHexagon.vb" />
<Compile Include="EgtMainWindow.vb" />
<Compile Include="EgtManageFileDialog\EgtManageFileDialogV.xaml.vb">
<DependentUpon>EgtManageFileDialogV.xaml</DependentUpon>
</Compile>
<Compile Include="EgtManageFileDialog\EgtManageFileDialogVM.vb" />
<Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
<DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
</Compile>
<Compile Include="EgtMessageBox\EgtMessageBoxVM.vb" />
<Compile Include="EgtTextBox.xaml.vb">
<DependentUpon>EgtTextBox.xaml</DependentUpon>
</Compile>
@@ -280,6 +270,7 @@
<Compile Include="Utility\MachineModel.vb" />
<Compile Include="Utility\MsgConversion.vb" />
<Compile Include="Utility\TableUtility.vb" />
<Compile Include="Utility\TMDbParamVisibility.vb" />
<Compile Include="Utility\Utility.vb" />
<Compile Include="EgtPanelWindow.vb" />
<Compile Include="EgtScrollViewer.vb" />
@@ -348,14 +339,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="EgtManageFileDialog\EgtManageFileDialogV.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Include="EgtTextBox.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -577,39 +560,6 @@
<Resource Include="Resources\Rotazione\CCW.png" />
<Resource Include="Resources\Rotazione\CW.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtMessageBox\Information.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtMessageBox\Question.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtMessageBox\Error.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtMessageBox\Warning.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtDialog\Folder.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtDialog\New.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtDialog\Restore.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtDialog\Root.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtMessageBox\Asterisk.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtMessageBox\Exclamation.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtMessageBox\Hand.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PostBuildEvent>IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Dll32\EgtWPFLib5.dll
+20 -9
View File
@@ -300,6 +300,16 @@
</Grid.RowDefinitions>
<Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
<Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
<!--<Border.OpacityMask>
<MultiBinding ConverterParameter="7" UpdateSourceTrigger="Default">
<MultiBinding.Converter>
<BorderGapMaskConverter/>
</MultiBinding.Converter>
<Binding ElementName="Header" Path="ActualWidth"/>
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
</MultiBinding>
</Border.OpacityMask>-->
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
<Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
</Border>
@@ -380,6 +390,16 @@
</Grid.RowDefinitions>
<Border BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3"/>
<Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" CornerRadius="4" Grid.Row="1" Grid.RowSpan="3">
<!--<Border.OpacityMask>
<MultiBinding ConverterParameter="7" UpdateSourceTrigger="Default">
<MultiBinding.Converter>
<BorderGapMaskConverter/>
</MultiBinding.Converter>
<Binding ElementName="Header" Path="ActualWidth"/>
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
</MultiBinding>
</Border.OpacityMask>-->
<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3">
<Border BorderBrush="White" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
</Border>
@@ -417,13 +437,4 @@
<!-- ______________________________________________________________________________________________________________________________________________ -->
<!-- EgtMessageBox -->
<Style x:Key="DialogWindow_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontSize" Value="12"/>
</Style>
</ResourceDictionary>
@@ -1,4 +1,6 @@
Public Class EstimationsDetailsWndV
Imports EgtWPFLib5
Public Class EstimationsDetailsWndV
Private m_EstimationsDetailsWndVM As EstimationsDetailsWndVM
@@ -23,12 +23,15 @@ Public Class EstimationsDetailsWndVM
Public ReadOnly Property TitleMsg As String
Get
Return EgtMsg(31616) ' Estimation details
Return EgtMsg(MSG_SIMULATION + 16) ' Estimation details
End Get
End Property
#End Region ' Messages
' Definizione comandi
Private m_cmdOk As ICommand
Private m_cmdCancel As ICommand
#End Region 'FIELDS & PROPERTIES
@@ -41,4 +44,8 @@ Public Class EstimationsDetailsWndVM
#End Region ' CONSTRUCTOR
#Region "METHODS"
#End Region ' METHODS
End Class
+7 -7
View File
@@ -19,8 +19,8 @@ Public Class InstrumentPanelVM
Else
LibMap.refSceneHostVM.MainScene.ResetStatusAnalyze()
End If
NotifyPropertyChanged(NameOf(GetDistIsChecked))
NotifyPropertyChanged(NameOf(AnalyzeIsChecked))
NotifyPropertyChanged("GetDistIsChecked")
NotifyPropertyChanged("AnalyzeIsChecked")
End If
End Set
End Property
@@ -33,7 +33,7 @@ Public Class InstrumentPanelVM
Set(value As Boolean)
If value <> m_AnalyzeIsEnabled Then
m_AnalyzeIsEnabled = value
NotifyPropertyChanged(NameOf(AnalyzeIsEnabled))
NotifyPropertyChanged("AnalyzeIsEnabled")
End If
End Set
End Property
@@ -55,8 +55,8 @@ Public Class InstrumentPanelVM
LibMap.refStatusBarVM.ClearOutputMessage()
OnPostGetDistIsChecked()
End If
NotifyPropertyChanged(NameOf(GetDistIsChecked))
NotifyPropertyChanged(NameOf(AnalyzeIsChecked))
NotifyPropertyChanged("GetDistIsChecked")
NotifyPropertyChanged("AnalyzeIsChecked")
End If
End Set
End Property
@@ -71,12 +71,12 @@ Public Class InstrumentPanelVM
Public ReadOnly Property AnalyzeToolTip As String
Get
Return EgtMsg(5267) ' Analizza
Return EgtMsg(MSG_GRIDVIEWPANEL + 17)
End Get
End Property
Public ReadOnly Property GetDistToolTip As String
Get
Return EgtMsg(5268) ' Distanza
Return EgtMsg(MSG_GRIDVIEWPANEL + 18)
End Get
End Property
+9 -9
View File
@@ -1,5 +1,7 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Public Class MachGroupPanelVM
Inherits VMBase
@@ -50,7 +52,7 @@ Public Class MachGroupPanelVM
End If
OnPostSetCurrMachGroup()
End If
NotifyPropertyChanged(NameOf(SelectedMachGroup))
NotifyPropertyChanged("SelectedMachGroup")
End Set
End Property
@@ -67,7 +69,7 @@ Public Class MachGroupPanelVM
Else
m_MachGroupPanel_Visibility = Visibility.Collapsed
End If
NotifyPropertyChanged(NameOf(MachGroupPanel_Visibility))
NotifyPropertyChanged("MachGroupPanel_Visibility")
End Sub
@@ -79,7 +81,7 @@ Public Class MachGroupPanelVM
End Get
Set(value As Boolean)
m_IsEnabledAddRemove = value
NotifyPropertyChanged(NameOf(IsEnabledAddRemove))
NotifyPropertyChanged("IsEnabledAddRemove")
End Set
End Property
' Variabile che definisce lo stato (attivi/disattivi) di tutti i gruppi tranne quello selezionato
@@ -262,7 +264,7 @@ Public Class MachGroupPanelVM
End If
Next
m_IsEnabledAddRemove = True
NotifyPropertyChanged(NameOf(IsEnabledAddRemove))
NotifyPropertyChanged("IsEnabledAddRemove")
m_IsEnabledMachGroups = True
Return True
Else
@@ -274,7 +276,7 @@ Public Class MachGroupPanelVM
End If
Next
m_IsEnabledAddRemove = False
NotifyPropertyChanged(NameOf(IsEnabledAddRemove))
NotifyPropertyChanged("IsEnabledAddRemove")
m_IsEnabledMachGroups = False
Return True
End If
@@ -359,8 +361,7 @@ Public Class MachGroupPanelVM
' non c'è alcunchè da cancellare
ElseIf MachGroupList.Count = 1 Then
'chiedo conferma prima di resettare il gruppo di lavorazione
'Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Case MessageBoxResult.Yes
' cancello il gruppo corrente e ne creo uno nuovo con lo stesso nome
OnPreRemoveCurrMachGroup()
@@ -373,8 +374,7 @@ Public Class MachGroupPanelVM
End Select
Else
'chiedo conferma prima di cancellare il gruppo di lavorazione
'Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, "Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
Case MessageBoxResult.Yes
' cancello quello selezionato (ovvero il corrente)
OnPreRemoveCurrMachGroup()
@@ -31,7 +31,8 @@
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding MachineMsg}"
Grid.Row="1"
Margin="0,0,5,0"/>
Margin="0,0,5,0"
Style="{StaticResource OptionTextBlock}"/>
<ComboBox Text="{Binding Machine}"
ItemsSource="{Binding MachineList}"
DisplayMemberPath="Name"
@@ -1,4 +1,5 @@
Imports EgtUILib
Imports EgtWPFLib5
Public Class NewMachGroupWndVM
Inherits VMBase
@@ -45,7 +46,7 @@ Public Class NewMachGroupWndVM
Set(value As Machine)
If value IsNot m_SelectedMachine Then
m_SelectedMachine = value
NotifyPropertyChanged(NameOf(SelectedMachine))
NotifyPropertyChanged("SelectedMachine")
End If
End Set
End Property
@@ -74,17 +75,17 @@ Public Class NewMachGroupWndVM
Public ReadOnly Property TitleMsg As String
Get
Return EgtMsg(30901) ' Nuovo gruppo di lavorazione
Return EgtMsg(MSG_MACHGROUPPANEL + 1)
End Get
End Property
Public ReadOnly Property NameMsg As String
Get
Return EgtMsg(30902) ' Nome:
Return EgtMsg(MSG_MACHGROUPPANEL + 2)
End Get
End Property
Public ReadOnly Property MachineMsg As String
Get
Return EgtMsg(30903) ' Macchina:
Return EgtMsg(MSG_MACHGROUPPANEL + 3)
End Get
End Property
+7 -2
View File
@@ -1,4 +1,5 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports EgtUILib
Public Class MachinePanelVM
@@ -28,7 +29,7 @@ Public Class MachinePanelVM
'EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
If EgtSetCurrMachine(value.Name) Then
m_SelectedMachine = value
NotifyPropertyChanged(NameOf(SelectedMachine))
NotifyPropertyChanged("SelectedMachine")
End If
End If
End Set
@@ -41,7 +42,7 @@ Public Class MachinePanelVM
End Get
Set(value As Brush)
m_SetUp_Background = value
NotifyPropertyChanged(NameOf(SetUp_Background))
NotifyPropertyChanged("SetUp_Background")
End Set
End Property
@@ -62,6 +63,10 @@ Public Class MachinePanelVM
#End Region ' CONSTRUCTOR
#Region "METHODS"
#End Region
#Region "COMMANDS"
#Region "ToolDbCommand"
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="BeamMillingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -428,7 +502,10 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0"
Grid.Column="1"
ItemsSource="{Binding Path=ToolList,
@@ -436,6 +513,9 @@
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
+80 -1
View File
@@ -19,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -285,7 +358,10 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0"
Grid.Column="1"
ItemsSource="{Binding Path=ToolList,
@@ -293,6 +369,9 @@
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
@@ -19,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -262,7 +335,10 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0"
Grid.Column="1"
ItemsSource="{Binding Path=ToolList,
@@ -270,6 +346,9 @@
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
+80 -1
View File
@@ -19,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -263,7 +336,10 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0"
Grid.Column="1"
ItemsSource="{Binding Path=ToolList,
@@ -271,6 +347,9 @@
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
@@ -69,9 +69,9 @@ Public Class ImportExportMachiningWindowVM
Public ReadOnly Property OkMsg As String
Get
If WindowMode = WindowModeEnum.IMPORT Then
Return EgtMsg(31450) ' Importa
Return EgtMsg(31450)
Else
Return EgtMsg(31451) ' Esporta
Return EgtMsg(31451)
End If
End Get
End Property
@@ -120,8 +120,8 @@ Public Class ImportExportMachiningWindowVM
EgtMdbImport(ImportFilePath, vsImportMachiningName, vsFinalName, m_vsImported)
' Report
Dim ImportedMachiningList As New List(Of String)(vsImported)
'MessageBox.Show(EgtMsg(31455) & " " & vbCrLf & String.Join(vbCrLf, ImportedMachiningList.ToArray()), "", MessageBoxButton.OK)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31455) & " " & vbCrLf & String.Join(vbCrLf, ImportedMachiningList.ToArray()), "", MessageBoxButton.OK) ' Le seguenti Lavorazioni sono state importate correttamente:
MessageBox.Show(EgtMsg(31455) & " " & vbCrLf &
String.Join(vbCrLf, ImportedMachiningList.ToArray()), "", MessageBoxButton.OK)
Case WindowModeEnum.EXPORT
' recupero le lavorazioni checkate
@@ -141,11 +141,6 @@ Public Class ImportExportMachiningWindowVM
.Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
.FileName = String.Empty
}
'Dim SaveFileDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
' .Title = EgtMsg(31451) & " " & EgtMsg(31452), ' Esporta lavorazioni
' .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
' .FileName = String.Empty
'}
If SaveFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
Dim sFilePath As String = String.Empty
sFilePath = SaveFileDlg.FileName
@@ -181,9 +176,9 @@ Public Class ImportExportMachiningWindowVM
#Region "METHODS"
Private Sub EnableOkBtn()
Private sub EnableOkBtn()
NotifyPropertyChanged(NameOf(IsEnabledOkBtn))
End Sub
End sub
#End Region ' Methods
@@ -274,20 +269,18 @@ Public Class ImpExpMachiningItem
' se esiste gia' chiedo se sovrascriverla
If value Then
If m_AlreadyExist Then
'Select Case System.Windows.MessageBox.Show(EgtMsg(31453), "", MessageBoxButton.YesNoCancel)
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31453), "", MessageBoxButton.YesNoCancel) ' La lavorazione esiste già, sovrascriverla?
Select Case System.Windows.MessageBox.Show(EgtMsg(31453), "", MessageBoxButton.YesNoCancel)
Case MessageBoxResult.Yes
m_ChangeName = False
m_Active = True
Case MessageBoxResult.No
'System.Windows.MessageBox.Show(EgtMsg(31454), "", MessageBoxButton.OK)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31454), "", MessageBoxButton.OK) ' La lavorazione verrà importata col nome seguito da "_imp"
System.Windows.MessageBox.Show(EgtMsg(31454), "", MessageBoxButton.OK)
m_ChangeName = True
m_Active = True
Case Else
m_Active = False
End Select
NotifyPropertyChanged(NameOf(Active))
NotifyPropertyChanged("Active")
Else
m_Active = True
End If
@@ -295,7 +288,7 @@ Public Class ImpExpMachiningItem
m_ChangeName = False
m_Active = False
End If
If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn()
If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn
End Set
End Property
@@ -315,7 +308,7 @@ Public Class ImpExpMachiningItem
End Get
Set(value As Boolean)
m_ChangeName = value
NotifyPropertyChanged(NameOf(Name))
NotifyPropertyChanged("Name")
End Set
End Property
+73
View File
@@ -1,6 +1,7 @@
<EgtWPFLib5:EgtCustomWindow x:Class="MachiningDbWindowV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
Title="{Binding Title}"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
@@ -17,8 +18,80 @@
</EgtWPFLib5:EgtCustomWindow.InputBindings>
<EgtWPFLib5:EgtCustomWindow.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</EgtWPFLib5:EgtCustomWindow.Resources>
<Grid>
+32 -40
View File
@@ -1,4 +1,6 @@
Imports System.Collections.ObjectModel
Imports System.Windows.Forms.Integration
Imports System.Collections.ObjectModel
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5.MachiningTreeViewItem
@@ -444,43 +446,43 @@ Public Class MachiningDbWindowVM
Private m_Title As String
Public ReadOnly Property Title As String
Get
Return EgtMsg(5004) ' Db Lavorazioni
Return EgtMsg(MSG_MAINWINDOW + 4)
End Get
End Property
Public ReadOnly Property NewMsg As String
Get
Return EgtMsg(31701) ' Nuovo
Return EgtMsg(31701)
End Get
End Property
Public ReadOnly Property SaveMsg As String
Get
Return EgtMsg(31702) ' Salva
Return EgtMsg(31702)
End Get
End Property
Public ReadOnly Property RemoveMsg As String
Get
Return EgtMsg(31703) ' Rimuovi
Return EgtMsg(31703)
End Get
End Property
Public ReadOnly Property ImportMsg As String
Get
Return EgtMsg(31450) ' Importa
Return EgtMsg(31450)
End Get
End Property
Public ReadOnly Property ExportMsg As String
Get
Return EgtMsg(31451) ' Esorta
Return EgtMsg(31451)
End Get
End Property
Public ReadOnly Property ResetMsg As String
Get
Return EgtMsg(31456) ' Reset
Return EgtMsg(31456)
End Get
End Property
@@ -1333,8 +1335,7 @@ Public Class MachiningDbWindowVM
' Se il materiale spcificato nel file INI della macchina non corrisponde a STONE, WOOD o BEAM (STONE5 è
' comunque STONE nell'INI ma prevede pagine esclusive per EgtCAM5) viene emesso un messaggio di errore
MachiningTreeViewItem.m_MatType = Nothing
'MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31409), EgtMsg(31551), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) ' ateriale della macchina non riconosciuto Errore
MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
Exit Sub
End Select
@@ -1354,7 +1355,7 @@ Public Class MachiningDbWindowVM
LibMap.SetRefMachiningDbWindowVM(Me)
NotifyPropertyChanged(NameOf(ParamPageV))
NotifyPropertyChanged("ParamPageV")
End Sub
#End Region ' Constructor
@@ -1373,16 +1374,16 @@ Public Class MachiningDbWindowVM
End Function
Private Sub ccc()
NotifyPropertyChanged(NameOf(ParamPageV))
NotifyPropertyChanged("ParamPageV")
End Sub
Private Sub IsEnabledBtns(bIsEnabledNewBtn As Boolean, bIsEnabledSaveBtn As Boolean, bIsEnabledDeleteBtn As Boolean)
m_IsEnabledNewBtn = bIsEnabledNewBtn
m_IsEnabledSaveBtn = bIsEnabledSaveBtn
m_IsEnabledRemoveBtn = bIsEnabledDeleteBtn
NotifyPropertyChanged(NameOf(IsEnabledNewBtn))
NotifyPropertyChanged(NameOf(IsEnabledSaveBtn))
NotifyPropertyChanged(NameOf(IsEnabledRemoveBtn))
NotifyPropertyChanged("IsEnabledNewBtn")
NotifyPropertyChanged("IsEnabledSaveBtn")
NotifyPropertyChanged("IsEnabledRemoveBtn")
End Sub
' Quando chiamato, disattiva tutti gli item dell'albero o li riattiva a seconda che ci sia o meno un errore
@@ -1416,7 +1417,7 @@ Public Class MachiningDbWindowVM
' Se esiste almeno una famiglia di lavorazioni, la seleziono
If MachiningsList.Count > 0 Then
MachiningsList(0).IsSelected = True
MachiningsList(0).NotifyPropertyChanged(NameOf(MachiningTreeViewItem.IsSelected))
MachiningsList(0).NotifyPropertyChanged("IsSelected")
End If
End Sub
@@ -1470,14 +1471,13 @@ Public Class MachiningDbWindowVM
' Verifico salvataggio
SelMachining.WriteMachiningParam()
If EgtMdbIsCurrMachiningModified() Or SelMachining.m_IsModifiedName Or SelMachining.NewMachining Then
'Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNoCancel, EgtMsg(MSG_MACHININGDBERRORS + 2))
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31401), EgtMsg(31402), MessageBoxButton.YesNoCancel) ' Salvare la lavorazione modificata? SALVA
Case MessageBoxResult.Yes
Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNoCancel, EgtMsg(MSG_MACHININGDBERRORS + 2))
Case MsgBoxResult.Yes
SelMachining.NewMachining = False
SelMachining.m_Name = SelMachining.m_Name.Trim()
SelMachining.WriteMachiningName()
EgtMdbSaveCurrMachining()
Case MessageBoxResult.No
Case MsgBoxResult.No
If SelMachining.NewMachining Then
RemoveMachining(SelMachining)
ElseIf SelMachining.m_IsModifiedName Then
@@ -1485,7 +1485,7 @@ Public Class MachiningDbWindowVM
EgtMdbGetCurrMachiningParam(MCH_MP.NAME, DbName)
SelMachining.NamePar = DbName
End If
Case MessageBoxResult.Cancel
Case MsgBoxResult.Cancel
Return False
End Select
End If
@@ -1527,7 +1527,7 @@ Public Class MachiningDbWindowVM
NewMachiningItem.NewMachining = True
If Not MachiningFamily.IsExpanded Then MachiningFamily.IsExpanded = True
NewMachiningItem.IsSelected = True
NewMachiningItem.NotifyPropertyChanged(NameOf(MachiningTreeViewItem.IsSelected))
NewMachiningItem.NotifyPropertyChanged("IsSelected")
' Se il Materiale della nuova Lav. è Stone setto Lato Testa e Lato Lavoro a Destra di default
If NewMachiningItem.MatType = MaterialType.STONE Then
NewMachiningItem.SelectedHeadSide = IdNameStruct.IndFromId(MCH_SAW_HS.RIGHT, NewMachiningItem.HeadSideList)
@@ -1551,7 +1551,7 @@ Public Class MachiningDbWindowVM
' Reimposto la lavorazione vecchia nel Db per deselezionarla e fare le verifiche correttamente
EgtMdbSetCurrMachining(MachiningCopied.Name)
MachiningCopied.IsSelected = False
MachiningCopied.NotifyPropertyChanged(NameOf(MachiningTreeViewItem.IsSelected))
MachiningCopied.NotifyPropertyChanged("IsSelected")
NewMachiningItem.IsSelected = True
Exit For
End If
@@ -1614,8 +1614,9 @@ Public Class MachiningDbWindowVM
EgtSetCurrentContext(m_ProjectSceneContext)
Dim MachiningToRemove As MachiningTreeViewItem = DirectCast(param, MachiningTreeViewItem)
' Chiedo conferma cancellazione lavorazione
'If MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 5) & " " & MachiningToRemove.Name & EgtMsg(MSG_MACHININGDBERRORS + 6), EgtMsg(MSG_MACHININGDBERRORS + 7), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return
If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31405) & " " & MachiningToRemove.Name & EgtMsg(31406), EgtMsg(31407), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then Return ' Sei sicuro di voler cancellare xxx ? CANCELLA
If MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 5) & " " & MachiningToRemove.Name & EgtMsg(MSG_MACHININGDBERRORS + 6), EgtMsg(MSG_MACHININGDBERRORS + 7), MessageBoxButton.YesNo, MessageBoxImage.Question) <> MessageBoxResult.Yes Then
Return
End If
RemoveMachining(MachiningToRemove)
End Sub
@@ -1667,17 +1668,10 @@ Public Class MachiningDbWindowVM
.ValidateNames = True
}
If ImportFileDlg.ShowDialog() <> True Then Return
'Dim ImportFileDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
' .Title = EgtMsg(31161) & " " & EgtMsg(31163), ' Importa Utensili
' .Filter = "Machinings (.data)|*.data",
' .CheckFileExists = True,
' .ValidateNames = True
'}
'If ImportFileDlg.ShowDialog() <> Windows.Forms.DialogResult.OK Then Return
Dim ImportFilePath As String = ImportFileDlg.FileName
' recupero liste lavorazioni da importare
Dim ImportFileMachiningNameList As String() = Nothing
Dim ImportFileMachiningFamilyList As Integer() = Nothing
Dim ImportFileMachiningNameList As String()
Dim ImportFileMachiningFamilyList As Integer()
EgtMdbToBeImported(ImportFilePath, ImportFileMachiningNameList, ImportFileMachiningFamilyList)
' li inserisco in lista per finestra di scelta
Dim MachiningToImportList As New ObservableCollection(Of ImpExpMachiningFamily)
@@ -1847,14 +1841,13 @@ Public Class MachiningDbWindowVM
If CurrMachining.IsValid Then
CurrMachining.WriteMachiningParam()
If EgtMdbIsCurrMachiningModified() Or CurrMachining.m_IsModifiedName Or CurrMachining.NewMachining Then
'Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGDBERRORS + 2))
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31401), EgtMsg(31402), MessageBoxButton.YesNo) ' Salvare la lavorazione modificata? SALVA
Case MessageBoxResult.Yes
Select Case MsgBox(EgtMsg(MSG_MACHININGDBERRORS + 1), MsgBoxStyle.YesNo, EgtMsg(MSG_MACHININGDBERRORS + 2))
Case MsgBoxResult.Yes
CurrMachining.NewMachining = False
CurrMachining.m_Name = CurrMachining.m_Name.Trim()
CurrMachining.WriteMachiningName()
EgtMdbSaveCurrMachining()
Case MessageBoxResult.No
Case MsgBoxResult.No
If CurrMachining.NewMachining Then
RemoveMachining(CurrMachining)
ElseIf CurrMachining.m_IsModifiedName Then
@@ -1866,8 +1859,7 @@ Public Class MachiningDbWindowVM
End If
Else
'Lavorazione non valida, correggerla o cancellarla prima di uscire. - Errore
'MessageBox.Show(EgtMsg(31410), EgtMsg(31126))
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31410), EgtMsg(31126)) ' Lavorazione non valida, correggerla o cancellarla prima di uscire. Errore
MessageBox.Show(EgtMsg(31410), EgtMsg(31126))
Return
End If
End If
File diff suppressed because it is too large Load Diff
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="MortisingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -306,12 +380,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0" Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="PocketingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -332,12 +406,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0" Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
@@ -1,6 +1,7 @@
<UserControl x:Class="Stone5DrillingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -278,12 +352,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"/>
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
</Grid>
</GroupBox>
+82 -2
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="Stone5MillingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -280,12 +354,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"/>
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
</Grid>
</GroupBox>
@@ -1,6 +1,7 @@
<UserControl x:Class="Stone5SawFinishingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -322,12 +396,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"/>
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
</Grid>
</GroupBox>
@@ -1,6 +1,7 @@
<UserControl x:Class="Stone5SawRoughingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -310,12 +384,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"/>
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
</Grid>
</GroupBox>
+82 -2
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="Stone5SawingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -381,12 +455,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"/>
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
</Grid>
</GroupBox>
@@ -1,6 +1,7 @@
<UserControl x:Class="Stone5WaterjettingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -404,12 +478,18 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList,Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"/>
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
</Grid>
</GroupBox>
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="StoneDrillingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
x:Name="PIPPO">
@@ -64,7 +65,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -377,12 +451,18 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="StoneMillingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
x:Name="PIPPO">
@@ -64,7 +65,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -379,12 +453,18 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
@@ -1,6 +1,7 @@
<UserControl x:Class="StoneSawFinishingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
x:Name="PIPPO">
@@ -66,7 +67,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -422,12 +496,18 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
@@ -1,6 +1,7 @@
<UserControl x:Class="StoneSawRoughingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
x:Name="PIPPO">
@@ -66,7 +67,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -410,12 +484,18 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="StoneSawingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
x:Name="PIPPO">
@@ -123,7 +124,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -519,13 +593,19 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
@@ -1,6 +1,7 @@
<UserControl x:Class="SurfFinishingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -1,6 +1,7 @@
<UserControl x:Class="SurfRoughingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="WaterjettingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
x:Name="PIPPO">
@@ -66,7 +67,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -495,12 +569,18 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"/>
Foreground="{Binding ElementName=PIPPO, Path=MyForegroundGrbColor}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Column="1"
ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Background="{Binding ElementName=PIPPO, Path=BackgroundCmBxTxBl}"
Foreground="{Binding ElementName=PIPPO, Path=ForegroundCmBxTxBl}"
BorderThickness="{Binding ElementName=PIPPO, Path=BorderThicknessCmBxTxBl}"
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="WoodDrillingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -278,11 +352,17 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="WoodMillingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -458,11 +532,17 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
+81 -1
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="WoodSawingParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -18,7 +19,80 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -351,11 +425,17 @@
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ToolTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"/>
<ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding Path=ToolList, Mode=OneWay}"
Style="{DynamicResource MachiningsToolComboBox}"
SelectedIndex="{Binding Path=SelectedTool}"
IsSynchronizedWithCurrentItem="True"
Visibility="{Binding Path=Type,
Converter={StaticResource MachiningParamVisibilityConverter},
ConverterParameter={StaticResource Tool}}"
Margin="0,3,3,3"/>
<UniformGrid Columns="1" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
+14 -2
View File
@@ -1,4 +1,7 @@
Imports System.IO
Imports System.Collections
Imports System.ComponentModel
Imports System.Diagnostics
Imports System.IO
Imports System.Runtime.InteropServices
Imports System.Threading
Imports EgtUILib
@@ -172,6 +175,15 @@ Public Class MapiMailMessage
''' Displays the mail message dialog asynchronously.
''' </summary>
Public Sub ShowDialog()
'' Create the mail message in an STA thread
'Dim t As New Thread(New ThreadStart(AddressOf _ShowMail))
't.IsBackground = True
't.SetApartmentState(ApartmentState.STA)
't.Start()
'' only return when the new thread has built it's interop representation
'Dim x = _manualResetEvent.WaitOne()
'Dim y = _manualResetEvent.Reset()
_ShowMail()
End Sub
@@ -215,7 +227,7 @@ Public Class MapiMailMessage
' Check for error
m_ErrorCode = [error]
If [error] <> SUCCESS_SUCCESS Then
EgtOutLog(_LogErrorMapi(CType([error], MAPIError)))
EgtOutLog(_LogErrorMapi([error]))
End If
End Using
End Sub
+6 -1
View File
@@ -1,4 +1,9 @@
Public Class NameDialogV
Imports System.ComponentModel
Imports System.IO
Imports EgtUILib
Public Class NameDialogV
'Implements INotifyPropertyChanged
Private m_NameDialogVM As NameDialogVM
+6 -9
View File
@@ -42,18 +42,15 @@ Public Class NameDialogVM
If TempName.Length = value.Length Then
m_Name = value
Else
'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
' EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
' MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31404), ' I caratteri \ / : * ? " < > | non sono permessi
EgtMsg(31407), ' Cancella
MessageBoxButton.OK, MessageBoxImage.Error)
MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
MessageBoxButton.OK, MessageBoxImage.Error)
m_Name = TempName
End If
Else
m_Name = value
End If
NotifyPropertyChanged(NameOf(Name))
NotifyPropertyChanged("Name")
End Set
End Property
@@ -61,12 +58,12 @@ Public Class NameDialogVM
Public ReadOnly Property SaveMsg As String
Get
Return EgtMsg(30001) ' Salva
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 1)
End Get
End Property
Public ReadOnly Property CancelMsg As String
Get
Return EgtMsg(30002) ' Annulla
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
End Get
End Property
+9 -7
View File
@@ -1,4 +1,6 @@
Imports EgtUILib
Imports System.Collections.ObjectModel
Imports System.IO
Imports EgtUILib
Public Class EstimationsVM
Inherits VMBase
@@ -64,37 +66,37 @@ Public Class EstimationsVM
Public ReadOnly Property EstimationMsg As String
Get
Return EgtMsg(90569) 'Stime
Return EgtMsg(MSG_ESTIMATIONS + 19) 'Stime
End Get
End Property
Public ReadOnly Property TimeMsg As String
Get
Return EgtMsg(90565) 'Tempo totale
Return EgtMsg(MSG_ESTIMATIONS + 15) 'Tempo totale
End Get
End Property
Public ReadOnly Property CutLenMsg As String
Get
Return EgtMsg(90566) 'Lunghezza totale
Return EgtMsg(MSG_ESTIMATIONS + 16) 'Lunghezza totale
End Get
End Property
Public ReadOnly Property NetAreaMsg As String
Get
Return EgtMsg(90567) 'Area utilizzata
Return EgtMsg(MSG_ESTIMATIONS + 17) 'Area utilizzata
End Get
End Property
Public ReadOnly Property UsageMsg As String
Get
Return EgtMsg(90568) 'Percentuale di utilizzo
Return EgtMsg(MSG_ESTIMATIONS + 18) 'Percentuale di utilizzo
End Get
End Property
Public ReadOnly Property DetailsMsg As String
Get
Return EgtMsg(90570) 'Dettagli
Return EgtMsg(MSG_ESTIMATIONS + 20) 'Dettagli
End Get
End Property
+4 -4
View File
@@ -12,8 +12,8 @@ Public Class MachineAxis
Set(value As Boolean)
If value <> m_IsReadOnlyAxesValue Then
m_IsReadOnlyAxesValue = value
NotifyPropertyChanged(NameOf(IsReadOnlyAxesValue))
NotifyPropertyChanged(NameOf(IsEnabledAxesValue))
NotifyPropertyChanged("IsReadOnlyAxesValue")
NotifyPropertyChanged("IsEnabledAxesValue")
End If
End Set
End Property
@@ -47,7 +47,7 @@ Public Class MachineAxis
Set(value As String)
If value <> m_Token Then
m_Token = value
NotifyPropertyChanged(NameOf(Token))
NotifyPropertyChanged("Token")
End If
End Set
End Property
@@ -81,7 +81,7 @@ Public Class MachineAxis
End Property
Friend Sub SetValue(value As String)
m_Value = value
NotifyPropertyChanged(NameOf(value))
NotifyPropertyChanged("Value")
End Sub
Sub New()
+24 -23
View File
@@ -1,4 +1,5 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports EgtUILib
Public Class SimulationVM
@@ -63,7 +64,7 @@ Public Class SimulationVM
Set(value As String)
If value <> m_GCode Then
m_GCode = value
NotifyPropertyChanged(NameOf(GCode))
NotifyPropertyChanged("GCode")
End If
End Set
End Property
@@ -76,7 +77,7 @@ Public Class SimulationVM
Set(value As String)
If value <> m_FValue Then
m_FValue = value
NotifyPropertyChanged(NameOf(FValue))
NotifyPropertyChanged("FValue")
End If
End Set
End Property
@@ -89,7 +90,7 @@ Public Class SimulationVM
Set(value As String)
If value <> m_TName Then
m_TName = value
NotifyPropertyChanged(NameOf(TName))
NotifyPropertyChanged("TName")
End If
End Set
End Property
@@ -102,7 +103,7 @@ Public Class SimulationVM
Set(value As String)
If value <> m_SValue Then
m_SValue = value
NotifyPropertyChanged(NameOf(SValue))
NotifyPropertyChanged("SValue")
End If
End Set
End Property
@@ -115,7 +116,7 @@ Public Class SimulationVM
Set(value As String)
If value <> m_OpeName Then
m_OpeName = value
NotifyPropertyChanged(NameOf(OpeName))
NotifyPropertyChanged("OpeName")
End If
End Set
End Property
@@ -138,7 +139,7 @@ Public Class SimulationVM
End Get
Set(value As String)
m_StatusMsg = value
NotifyPropertyChanged(NameOf(StatusMsg))
NotifyPropertyChanged("StatusMsg")
End Set
End Property
@@ -151,7 +152,7 @@ Public Class SimulationVM
If Math.Abs(value - m_SliderValue) > EPS_SMALL Then
m_SliderValue = value
EgtSimSetStep(m_SliderValue * m_SliderX)
NotifyPropertyChanged(NameOf(SliderValue))
NotifyPropertyChanged("SliderValue")
End If
End Set
End Property
@@ -163,13 +164,13 @@ Public Class SimulationVM
End Get
Set(value As Boolean)
m_VMillActive = value
NotifyPropertyChanged(NameOf(VMillActive))
NotifyPropertyChanged("VMillActive")
VMillActiveInfoTitle(m_VMillActive)
End Set
End Property
Public Sub SetVMillActive(value As Boolean)
m_VMillActive = value
NotifyPropertyChanged(NameOf(VMillActive))
NotifyPropertyChanged("VMillActive")
End Sub
Private m_VMill_Visibility As Visibility = Visibility.Collapsed
@@ -179,7 +180,7 @@ Public Class SimulationVM
End Get
Set(value As Visibility)
m_VMill_Visibility = value
NotifyPropertyChanged(NameOf(VMill_Visibility))
NotifyPropertyChanged("VMill_Visibility")
End Set
End Property
@@ -190,7 +191,7 @@ Public Class SimulationVM
End Get
Set(value As Boolean)
m_VMill_IsEnabled = value
NotifyPropertyChanged(NameOf(VMill_IsEnabled))
NotifyPropertyChanged("VMill_IsEnabled")
End Set
End Property
@@ -203,13 +204,13 @@ Public Class SimulationVM
Public ReadOnly Property SimulationMsg As String
Get
Return EgtMsg(31607) ' Simulazione
Return EgtMsg(MSG_SIMULATION + 7) 'Simulazione
End Get
End Property
Public ReadOnly Property VMillMsg As String
Get
Return EgtMsg(5316) ' Virtual Milling
Return EgtMsg(5316) 'Virtual Milling
End Get
End Property
@@ -237,17 +238,17 @@ Public Class SimulationVM
Public ReadOnly Property OneStepToolTip As String
Get
Return EgtMsg(31608) ' Un passo alla volta
Return EgtMsg(MSG_SIMULATION + 8)
End Get
End Property
Public ReadOnly Property PlayPauseToolTip As String
Get
Return EgtMsg(31609) ' Play/Pausa
Return EgtMsg(MSG_SIMULATION + 9)
End Get
End Property
Public ReadOnly Property StopHomeToolTip As String
Get
Return EgtMsg(31610) ' Stop/Home
Return EgtMsg(MSG_SIMULATION + 10)
End Get
End Property
@@ -488,17 +489,17 @@ Public Class SimulationVM
SimulationStatus = MCH_SIM_ST.UI_STEP
' Aggiorno bottone
m_bShowPlay = False
NotifyPropertyChanged(NameOf(PlayPauseImage))
NotifyPropertyChanged("PlayPauseImage")
ExecSim()
' Aggiorno bottone
m_bShowPlay = True
NotifyPropertyChanged(NameOf(PlayPauseImage))
NotifyPropertyChanged("PlayPauseImage")
' Alrimenti imposto solo il nuovo stato
Else
SimulationStatus = MCH_SIM_ST.UI_STEP
' Aggiornamenti per bottone Play/Pause
m_bShowPlay = False
NotifyPropertyChanged(NameOf(PlayPauseImage))
NotifyPropertyChanged("PlayPauseImage")
End If
End Sub
@@ -528,7 +529,7 @@ Public Class SimulationVM
VMill_IsEnabled = False
' Aggiorno bottone
m_bShowPlay = False
NotifyPropertyChanged(NameOf(PlayPauseImage))
NotifyPropertyChanged("PlayPauseImage")
' Eseguo
If m_nStatus = MCH_SIM_ST.UI_STOP Then
' Lancio simulazione
@@ -536,14 +537,14 @@ Public Class SimulationVM
ExecSim()
' Aggiorno bottone
m_bShowPlay = True
NotifyPropertyChanged(NameOf(PlayPauseImage))
NotifyPropertyChanged("PlayPauseImage")
ElseIf m_nStatus = MCH_SIM_ST.UI_PAUSE Then
SimulationStatus = MCH_SIM_ST.UI_PLAY
End If
Else
' Aggiorno bottone
m_bShowPlay = True
NotifyPropertyChanged(NameOf(PlayPauseImage))
NotifyPropertyChanged("PlayPauseImage")
' Se play o step, imposto stato pausa
If m_nStatus = MCH_SIM_ST.UI_PLAY Or m_nStatus = MCH_SIM_ST.UI_STEP Then
SimulationStatus = MCH_SIM_ST.UI_PAUSE
@@ -589,7 +590,7 @@ Public Class SimulationVM
End If
' Aggiorno bottone
m_bShowPlay = True
NotifyPropertyChanged(NameOf(PlayPauseImage))
NotifyPropertyChanged("PlayPauseImage")
' Imposto il nuovo stato
SimulationStatus = MCH_SIM_ST.UI_STOP
End Sub
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 374 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 605 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

+5
View File
@@ -9,12 +9,17 @@
Height="130" Width="300" Topmost="True"
DataContext="{Binding RelativeSource={RelativeSource Self}}">
<!--<EgtWPFLib5:EgtCustomWindow.Resources>
<EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
</EgtWPFLib5:EgtCustomWindow.Resources>-->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<TextBox Margin="5" Height="24" x:Name="FilePath"
Text="{Binding WriteFileName, UpdateSourceTrigger=PropertyChanged}"
VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+4 -1
View File
@@ -1,6 +1,9 @@
Imports System.IO
Imports System.ComponentModel
Imports System.IO
Imports EgtUILib
Public Class SaveFileDialogV
'Implements INotifyPropertyChanged
Private m_SaveFileDialogVM As SaveFileDialogVM
+12 -18
View File
@@ -9,9 +9,9 @@ Public Class SaveFileDialogVM
Get
If IsNothing(m_Title) Then
If IsFolder Then
Return EgtMsg(30011) ' Nome File
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 11)
Else
Return EgtMsg(30010) ' Nome Cartella
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 10)
End If
Else
Return m_Title
@@ -74,14 +74,11 @@ Public Class SaveFileDialogVM
If TempName.Length = value.Length Then
m_WriteFileName = value
Else
'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
' EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
' MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31404), ' I caratteri \ / : * ? " < > | non sono permessi
EgtMsg(31407), ' CANCELLA
MessageBoxButton.OK, MessageBoxImage.Error)
MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
MessageBoxButton.OK, MessageBoxImage.Error)
End If
NotifyPropertyChanged(NameOf(WriteFileName))
NotifyPropertyChanged("WriteFileName")
End Set
End Property
@@ -89,12 +86,12 @@ Public Class SaveFileDialogVM
Public ReadOnly Property SaveMsg As String
Get
Return EgtMsg(30001) ' Salva
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 1)
End Get
End Property
Public ReadOnly Property CancelMsg As String
Get
Return EgtMsg(30002) ' Annulla
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
End Get
End Property
@@ -116,28 +113,25 @@ Public Class SaveFileDialogVM
If Not String.IsNullOrWhiteSpace(m_FileName) Then
m_WriteFileName = m_FileName
End If
NotifyPropertyChanged(NameOf(WriteFileName))
NotifyPropertyChanged("WriteFileName")
If IsFolder Then m_sExtension = ""
End Sub
Friend Function Save() As Boolean
Dim sCompleteFileName As String = m_sDirectory & "\" & m_WriteFileName & If(IsFolder, "", m_sExtension)
If String.IsNullOrWhiteSpace(m_WriteFileName) Then
'MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(30008), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error) ' Il nome non può essere vuoto! - ERRORE
MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
Return False
End If
If IsFolder Then
If System.IO.Directory.Exists(sCompleteFileName) Then
'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' esiste già - Sostituirlo? - ATTENZIONE
If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
Return False
End If
End If
Else
If File.Exists(sCompleteFileName) Then
'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' esiste già - Sostituirlo? - ATTENZIONE
If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
Return False
End If
End If
@@ -1,4 +1,9 @@
Public Class SaveFileDialogWithListV
Imports System.ComponentModel
Imports System.IO
Imports EgtUILib
Public Class SaveFileDialogWithListV
'Implements INotifyPropertyChanged
Private m_SaveFileDialogWithListVM As SaveFileDialogWithListVM
@@ -30,4 +35,26 @@
Return MyBase.ShowDialog()
End Function
End Class
'Private Sub FilePath_TextChanged(sender As Object, e As TextChangedEventArgs) Handles FilePath.TextChanged
' FileNameList.UnselectAll()
'End Sub
End Class
'''' <summary>
'''' Class that represent a Converter that convert the complete file path in the file name and vice versa.
'''' </summary>
'Public Class FileNameConverter
' Implements IValueConverter
' Dim TempPath As String
' Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert
' TempPath = CStr(value)
' Return Path.GetFileNameWithoutExtension(TempPath)
' End Function
' Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack
' Return Path.GetDirectoryName(TempPath) & "\" & CStr(value) & Path.GetExtension(TempPath)
' End Function
'End Class
@@ -9,9 +9,9 @@ Public Class SaveFileDialogWithListVM
Get
If IsNothing(m_Title) Then
If IsFolder Then
Return EgtMsg(30011) ' Nome Cartella
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 11)
Else
Return EgtMsg(30010) ' Nome File
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 10)
End If
Else
Return m_Title
@@ -74,14 +74,11 @@ Public Class SaveFileDialogWithListVM
If TempName.Length = value.Length Then
m_WriteFileName = value
Else
'MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
' EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
' MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31404), ' I caratteri \ / : * ? " < > | non sono permessi
EgtMsg(31407), ' CANCELLA
MessageBoxButton.OK, MessageBoxImage.Error)
MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 4),
EgtMsg(MSG_EGTSAVEFILEDIALOG + 7),
MessageBoxButton.OK, MessageBoxImage.Error)
End If
NotifyPropertyChanged(NameOf(WriteFileName))
NotifyPropertyChanged("WriteFileName")
End Set
End Property
@@ -119,7 +116,7 @@ Public Class SaveFileDialogWithListVM
End Get
Set(value As List(Of String))
m_FileList = value
NotifyPropertyChanged(NameOf(FileList))
NotifyPropertyChanged("FileList")
End Set
End Property
@@ -130,11 +127,11 @@ Public Class SaveFileDialogWithListVM
End Get
Set(value As String)
m_SelectedFile = value
NotifyPropertyChanged(NameOf(SelectedFile))
NotifyPropertyChanged("SelectedFile")
If Not IsNothing(m_SelectedFile) Then
m_WriteFileName = Path.GetFileNameWithoutExtension(SelectedFile)
NotifyPropertyChanged(NameOf(WriteFileName))
NotifyPropertyChanged("WriteFileName")
End If
End Set
End Property
@@ -143,12 +140,12 @@ Public Class SaveFileDialogWithListVM
Public ReadOnly Property SaveMsg As String
Get
Return EgtMsg(30001) ' Salva
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 1)
End Get
End Property
Public ReadOnly Property CancelMsg As String
Get
Return EgtMsg(30002) ' Annulla
Return EgtMsg(MSG_EGTSAVEFILEDIALOG + 2)
End Get
End Property
@@ -252,21 +249,18 @@ Public Class SaveFileDialogWithListVM
Friend Function Save() As Boolean
Dim sCompleteFileName As String = m_sDirectory & "\" & m_WriteFileName & If(IsFolder, "", m_sExtension)
If String.IsNullOrWhiteSpace(m_WriteFileName) Then
'MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(30008), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error) ' Il nome non può essere vuoto! - ERRORE
MessageBox.Show(EgtMsg(MSG_EGTSAVEFILEDIALOG + 8), EgtMsg(MSG_EGTSAVEFILEDIALOG + 7), MessageBoxButton.OK, MessageBoxImage.Error)
Return False
End If
If IsFolder Then
If System.IO.Directory.Exists(sCompleteFileName) Then
'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' eiste già - Sostituirlo? - ATTENZIONE
If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
Return False
End If
End If
Else
If File.Exists(sCompleteFileName) Then
'If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
If EgtMessageBoxV.Show(Application.Current.MainWindow, m_WriteFileName & " " & EgtMsg(30003) & vbCrLf & EgtMsg(30004), EgtMsg(30009), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then ' eiste già - Sostituirlo? - ATTENZIONE
If MessageBox.Show(m_WriteFileName & " " & EgtMsg(MSG_EGTSAVEFILEDIALOG + 3) & vbCrLf & EgtMsg(MSG_EGTSAVEFILEDIALOG + 4), EgtMsg(MSG_EGTSAVEFILEDIALOG + 9), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) <> MessageBoxResult.Yes Then
Return False
End If
End If
+6 -1
View File
@@ -1,4 +1,9 @@
Public Class SceneHostV
Imports System.Windows.Interop
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Public Class SceneHostV
Private m_SceneHostVM As SceneHostVM
+178
View File
@@ -1,5 +1,6 @@
Imports System.IO
Imports EgtUILib
Imports EgtWPFLib5
Public Class SceneHostVM
Inherits VMBase
@@ -91,6 +92,8 @@ Public Class SceneHostVM
If Not String.IsNullOrWhiteSpace(sFile) Then
sFile = Path.GetDirectoryName(sFile) & "\"
End If
'sFile.TrimEnd("\"c)
'sFile += "\New" & m_nInstance.ToString() & ".nge" 'KK?
End If
Return m_MainController.SaveAsProject(sFile, nType)
@@ -208,4 +211,179 @@ Public Class SceneHostVM
#End Region
'#Region "EVENTS"
' Private Sub OnNewProject(sender As Object, bOk As Boolean) Handles m_Controller.OnNewProject
' OmagOFFICEMap.refMainWindowVM.Title = " New - OmagOFFICE"
' End Sub
' Private Sub OnOpenProject(sender As Object, sFile As String, bOk As Boolean) Handles m_Controller.OnOpenProject
' OmagOFFICEMap.refMainWindowVM.Title = sFile & " - OmagOFFICE"
' WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)
' If bOk Then
' OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Add(sFile)
' Else
' OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Remove(sFile)
' Dim sMsg As String = EgtMsg(10003) & " '" & sFile & "'" 'Error opening file
' MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) 'Error
' End If
' End Sub
' Private Sub OnSavingProject(ByVal sender As Object, sFile As String) Handles m_Controller.OnSavingProject
' ' Recupero tutti i file di texture associabili ai gruppi di lavoro del progetto
' Dim sDirToSearch As String = Path.GetDirectoryName(sFile)
' Dim sFileToSearch As String = Path.GetFileNameWithoutExtension(sFile) & "." & PHOTO_NAME & "*"
' Dim vsTxrFile As New List(Of String)
' For Each sTxrFile In My.Computer.FileSystem.GetFiles(sDirToSearch, FileIO.SearchOption.SearchTopLevelOnly, sFileToSearch)
' vsTxrFile.Add(sTxrFile)
' Next
' ' Rinomino path di eventuali fotografie
' Dim nPhotoId As Integer = EgtGetFirstInGroup(EgtGetFirstNameInGroup(GDB_ID.ROOT, PHOTO_GRP))
' While nPhotoId <> GDB_ID.NULL
' ' Path originale
' Dim sPhoto As String = String.Empty
' If EgtGetPhotoPath(nPhotoId, sPhoto) Then
' ' Nome della foto
' Dim sName As String = String.Empty
' EgtGetName(nPhotoId, sName)
' ' Nuova path
' Dim sNewPhoto As String = Path.GetDirectoryName(sFile) & "\" &
' Path.GetFileNameWithoutExtension(sFile) & "." & sName &
' Path.GetExtension(sPhoto)
' ' Se diverse, eseguo copia
' If String.Compare(sPhoto, sNewPhoto, True) <> 0 Then
' Try
' ' Eseguo copia
' File.Copy(sPhoto, sNewPhoto, True)
' ' Notifico a foto il cambio di path
' EgtChangePhotoPath(nPhotoId, sNewPhoto)
' ' Eventuale notifica a VeinMatching del cambio di path
' VeinMatching.ChangePhotoPath(sPhoto, sNewPhoto)
' Catch ex As Exception
' End Try
' End If
' ' Tolgo da lista file texture associabili, se presente
' vsTxrFile.Remove(sNewPhoto)
' End If
' ' passo alla successiva
' nPhotoId = EgtGetNext(nPhotoId)
' End While
' ' Se rimasti file associabili, li cancello
' For Each sTxrFile In vsTxrFile
' Try
' My.Computer.FileSystem.DeleteFile(sTxrFile)
' Catch
' End Try
' Next
' End Sub
' Private Sub OnSavedProject(ByVal sender As Object, ByVal sFile As String, ByVal bOk As Boolean) Handles m_Controller.OnSavedProject
' ' Se salvataggio non riuscito, esco subito
' If Not bOk Then
' OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Remove(sFile)
' Dim sMsg As String = EgtMsg(10004) & " '" & sFile & "'" 'Error saving file
' MessageBox.Show(sMsg, EgtMsg(10001), MessageBoxButton.OK, MessageBoxImage.Error) ' Error
' Return
' End If
' ' Eventuale salvataggio VM
' Dim sVmFile As String = Path.ChangeExtension(sFile, ".vme")
' VeinMatching.Save(sVmFile)
' ' Eventuale salvataggio CSV
' CsvM.SaveCsvPartList()
' ' Aggiornamento titolo
' OmagOFFICEMap.refMainWindowVM.Title = sFile & " - OmagOFFICE"
' ' Riabilito visualizzazione pezzi in parcheggio
' EstCalc.ShowParkedParts()
' ' Inserisco nome in MRU
' OmagOFFICEMap.refTopCommandBarVM.m_MruFiles.Add(sFile)
' ' Salvo nome ultimo file
' WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)
' End Sub
' Private Sub OnMouseDownScene(sender As Object, e As Windows.Forms.MouseEventArgs) Handles OmagOFFICEScene.OnMouseDownScene
' ' Si può selezionare solo con il tasto sinistro e se stato NULL
' If e.Button <> Windows.Forms.MouseButtons.Left Or Not OmagOFFICEScene.IsStatusNull() Then
' Return
' End If
' ' Chiamo l'opportuno gestore
' Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
' Case OptionPanelVM.Tabs.RAWPART
' OmagOFFICEMap.refRawPartTabVM.OnMouseDownScene(sender, e)
' Case OptionPanelVM.Tabs.NESTING
' OmagOFFICEMap.refNestingTabVM.OnMouseDownScene(sender, e)
' Case OptionPanelVM.Tabs.MACHINING
' OmagOFFICEMap.refMachiningTabVM.OnMouseDownScene(sender, e)
' Case OptionPanelVM.Tabs.SIMUL
' End Select
' End Sub
' Private Sub OnMouseMoveScene(sender As Object, e As Windows.Forms.MouseEventArgs) Handles OmagOFFICEScene.OnMouseMoveScene
' ' Chiamo l'opportuno gestore
' Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
' Case OptionPanelVM.Tabs.RAWPART
' OmagOFFICEMap.refRawPartTabVM.OnMouseMoveScene(sender, e)
' Case OptionPanelVM.Tabs.NESTING
' OmagOFFICEMap.refNestingTabVM.OnMouseMoveScene(sender, e)
' Case OptionPanelVM.Tabs.MACHINING
' Case OptionPanelVM.Tabs.SIMUL
' End Select
' End Sub
' Private Sub OnMouseUpScene(sender As Object, e As Windows.Forms.MouseEventArgs) Handles OmagOFFICEScene.OnMouseUpScene
' ' Chiamo l'opportuno gestore
' Select Case OmagOFFICEMap.refOptionPanelVM.SelItem
' Case OptionPanelVM.Tabs.RAWPART
' OmagOFFICEMap.refRawPartTabVM.OnMouseUpScene(sender, e)
' Case OptionPanelVM.Tabs.NESTING
' OmagOFFICEMap.refNestingTabVM.OnMouseUpScene(sender, e)
' Case OptionPanelVM.Tabs.MACHINING
' Case OptionPanelVM.Tabs.SIMUL
' End Select
' End Sub
' Private Sub OnCursorPos(ByVal sender As Object, ByVal sCursorPos As String) Handles OmagOFFICEScene.OnCursorPos
' OmagOFFICEMap.refStatusBarVM.SetCurrPos(sCursorPos)
' End Sub
' Private Sub OnShowDistance(ByVal sender As Object, ByVal sDistance As String) Handles OmagOFFICEScene.OnShowDistance
' OmagOFFICEMap.refStatusBarVM.SetOutputMessage(sDistance)
' End Sub
' Private Sub OnChangedSnapPointType(ByVal sender As Object, ByVal nSpType As SP, ByVal bUser As Boolean) Handles OmagOFFICEScene.OnChangedSnapPointType
' Dim BtnColor As Brush
' If bUser Then
' BtnColor = New SolidColorBrush(SystemColors.ControlColor)
' Else
' BtnColor = Brushes.Bisque
' End If
' Select Case nSpType
' Case SP.PT_SKETCH
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1102), BtnColor) 'Sketch Point
' Case SP.PT_GRID
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1104), BtnColor) 'Grid Point
' Case SP.PT_END
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1106), BtnColor) 'End Point
' Case SP.PT_MID
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1108), BtnColor) 'Mid Point
' Case SP.CENTER
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1110), BtnColor) 'Center
' Case SP.CENTROID
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1112), BtnColor) 'Centroid
' Case SP.PT_NEAR
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1114), BtnColor) 'Near Point
' Case SP.PT_INTERS
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1116), BtnColor) 'Inters Point
' Case SP.PT_TANGENT
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1118), BtnColor) 'Tang Point
' Case SP.PT_PERPENDICULAR
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1120), BtnColor) 'Perp Point
' Case SP.PT_MINDIST
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType(EgtMsg(1122), BtnColor) 'MinDist Point
' Case Else
' OmagOFFICEMap.refStatusBarVM.SetSnapPointType("---", BtnColor)
' End Select
' End Sub
'#End Region ' EVENTS
End Class
+2
View File
@@ -87,6 +87,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
<TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
<Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
@@ -136,6 +137,7 @@
HorizontalAlignment="Left">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<!--<WrapPanel Orientation="Horizontal" MaxWidth="200"/>-->
<UniformGrid Columns="1"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
+137 -53
View File
@@ -34,7 +34,7 @@ Public Class SetUpWindowVM
Private m_Title As String
Public ReadOnly Property Title As String
Get
Return EgtMsg(31501) ' SetUp
Return EgtMsg(MSG_SETUP + 1)
End Get
End Property
@@ -88,28 +88,28 @@ Public Class SetUpWindowVM
Public ReadOnly Property TitleMsg As String
Get
Return EgtMsg(31501) ' SetUp
Return EgtMsg(MSG_SETUP + 1)
End Get
End Property
Public ReadOnly Property ApplyMsg As String
Get
Return EgtMsg(31502) ' Applica
Return EgtMsg(MSG_SETUP + 2)
End Get
End Property
Public ReadOnly Property ArchiveMsg As String
Get
Return EgtMsg(31503) ' Archivia
Return EgtMsg(MSG_SETUP + 3)
End Get
End Property
Public ReadOnly Property RetrievesMsg As String
Get
Return EgtMsg(31504) ' Recupera
Return EgtMsg(MSG_SETUP + 4)
End Get
End Property
Public ReadOnly Property AutomaticMsg As String
Get
Return EgtMsg(31505) ' Auto
Return EgtMsg(MSG_SETUP + 5)
End Get
End Property
@@ -155,8 +155,7 @@ Public Class SetUpWindowVM
Case Else
' Se il materiale spcificato nel file INI della macchina non corrisponde ai 3 sopracitati viene emesso un messaggio di errore
EgtWPFLib5.ToolDbWindowVM.m_MatType = Nothing
'MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31409), EgtMsg(31551), MessageBoxButton.YesNo, MessageBoxImage.Exclamation) ' Materiale della macchina non riconosciuto - Errore
MsgBox(EgtMsg(31409), MsgBoxStyle.Exclamation, EgtMsg(31551))
Exit Sub
End Select
@@ -214,7 +213,7 @@ Public Class SetUpWindowVM
ElseIf sFamilyName = EgtMsg(90756) And nType = MCH_TY.MILL_POLISHING Then
' --- MOLA LUCIDANTE ---
FamilyToolItem.Items.Add(New ToolItem(ToolName, ExitPar, nType, Head, TcPos, Uuid, IsInCurrMachGroup))
ElseIf sFamilyName = EgtMsg(31103) And nType = MCH_TY.MILL_STD Then
ElseIf sFamilyName = EgtMsg(MSG_TOOLDB + 3) And nType = MCH_TY.MILL_STD Then
' --- FRESA ---
FamilyToolItem.Items.Add(New ToolItem(ToolName, ExitPar, nType, Head, TcPos, Uuid, IsInCurrMachGroup))
End If
@@ -444,12 +443,10 @@ Public Class SetUpWindowVM
EgtTdbGetToolFromUUID(sToolList(ToolIndex), sSearchedTool)
If Not String.IsNullOrWhiteSpace(sSearchedTool) Then
' Impossibile trovare l'utensile xxx nel DB utensili
'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31553) & " " & sSearchedTool & " " & EgtMsg(31554), EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Error)
MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
Else
' Impossibile trovare l'utensile nel DB utensili
'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31553) & " " & EgtMsg(31554), EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Error)
MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
End If
End If
End If
@@ -459,6 +456,94 @@ Public Class SetUpWindowVM
End If
End Sub
'' Funzione che dati l'indice della posizione e la sua stringa di attrezzaggio, carica l'attrezzaggio descritto
'Private Sub ReadPositionString(nIndex As Integer, sPosition As String)
' Dim sTcPos As String = String.Empty
' Dim sHead As String = String.Empty
' Dim sExitList As New List(Of String)
' Dim sToolList As New List(Of String)
' ' la spezzo sui ;
' Dim sItems() As String = sPosition.Split(";".ToCharArray)
' ' se c'è almeno un elemento sono sicuro che ci sia la T
' If sItems.Count() >= 1 Then
' Dim nGroup As Integer = 0
' sTcPos = sItems(0)
' ' recupero il suo gruppo
' If Not GetGroupFromTcPos(sTcPos, nGroup) Then
' ' se non lo trovo lo metto nel primo
' nGroup = 1
' End If
' If Not VerifyIndexValidity(nGroup) Then
' ' se mi viene passato un indice non valido, lo metto nel primo
' nGroup = 1
' End If
' ' se ci sono almeno due elementi sono sicuro che ci sia la H
' If sItems.Count >= 2 Then
' sHead = sItems(1)
' m_PositionGroupList(nGroup - 1).PositionList.Add(New Position(sTcPos, sHead, EgtGetHeadExitCount(sHead)))
' ' se ci sono almeno tre elementi sono sicuro che ci sia almeno un'uscita attrezzata
' If sItems.Count >= 3 Then
' ' separo le uscite divise dalla ,
' Dim sExitToolAssList() As String = sItems(2).Split(",".ToCharArray)
' sExitList.Clear()
' sToolList.Clear()
' ' creo le liste di uscite e utensili attrezzati ricavati
' For AssIndex = 0 To sExitToolAssList.Count() - 1
' Dim sExitToolAssItem() As String = sExitToolAssList(AssIndex).Split("/".ToCharArray)
' If sExitToolAssItem.Count > 1 Then
' sExitList.Add(sExitToolAssItem(0))
' sToolList.Add(sExitToolAssItem(1))
' End If
' Next
' ' analizzo la lista di utensili attrezzati
' For ToolIndex = 0 To sToolList.Count - 1
' If Not String.IsNullOrEmpty(sToolList(ToolIndex)) Then
' Dim TempTool As ToolItem = Nothing
' Dim bFound As Boolean = False
' ' cerco l'utensile attrezzato nella lista utensili
' For FamilyListIndex = 0 To m_ToolsList.Count - 1
' For ToolListIndex = 0 To m_ToolsList(FamilyListIndex).Items.Count - 1
' TempTool = DirectCast(m_ToolsList(FamilyListIndex).Items(ToolListIndex), ToolItem)
' If TempTool.Uuid = sToolList(ToolIndex) Then
' ' lo salvo in una variabile temporanea e lo tolgo dalla lista
' m_ToolsList(FamilyListIndex).Items.Remove(m_ToolsList(FamilyListIndex).Items(ToolListIndex))
' bFound = True
' Exit For
' End If
' Next
' If bFound Then Exit For
' Next
' ' se lo trovo
' If bFound Then
' ' cerco la relativa uscita
' For ExitIndex = 0 To m_PositionGroupList(nGroup - 1).PositionList(m_PositionGroupList(nGroup - 1).PositionList.Count - 1).ExitToolAssociationList.Count - 1
' Dim CurrExitToolAss As ExitToolAssociation = m_PositionGroupList(nGroup - 1).PositionList(m_PositionGroupList(nGroup - 1).PositionList.Count - 1).ExitToolAssociationList(ExitIndex)
' If CurrExitToolAss.ExitPar = sExitList(ToolIndex) Then
' ' vi metto l'utensile e segno l'uscita come occupata
' CurrExitToolAss.Tool = TempTool
' CurrExitToolAss.IsOccupied = True
' ' lo metto anche come utensile originale
' CurrExitToolAss.OrigTool = TempTool
' Exit For
' End If
' Next
' ' altrimenti, se non l'ho trovato
' Else
' Dim sSearchedTool As String = String.Empty
' EgtTdbGetToolFromUUID(sToolList(ToolIndex), sSearchedTool)
' MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 3) & " " & sSearchedTool & " " & EgtMsg(MSG_SETUPERRORS + 4), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Error)
' End If
' End If
' Next
' End If
' ' non è presente la H, quindi la recupero dal modello delle posizioni nel file MachIni
' Else
' CreateStdPosFromPosIndex(nIndex)
' End If
' End If
'End Sub
' Funzione che data una T restituisce il gruppo a cui appartiene
Private Function GetGroupFromTcPos(sTcPos As String, ByRef nGroup As Integer) As Boolean
Dim sGroup As String = String.Empty
@@ -510,7 +595,7 @@ Public Class SetUpWindowVM
' Funzione che verifica se ci sono state modifiche all'attrezzaggio corrente e permette di attivare e disattivare il bottone applica
Private Sub IsEnabledBtns()
m_IsEnabledApplyBtn = IsModifiedSetUp()
NotifyPropertyChanged(NameOf(IsEnabledApplyBtn))
NotifyPropertyChanged("IsEnabledApplyBtn")
End Sub
#Region "ToolDoubleClickCommand"
@@ -524,12 +609,11 @@ Public Class SetUpWindowVM
' verifico se ci sono errori
If ErrorList.Count > 0 Then
' li raccolgo tutti nello stesso messaggio
Dim sError As String = EgtMsg(31556) & Environment.NewLine ' La posizione predefinita dell'utensile è già occupata.
Dim sError As String = EgtMsg(MSG_SETUPERRORS + 6) & Environment.NewLine
For ErrorIndex = 0 To ErrorList.Count - 1
sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine
Next
'MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' Avviso
MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
End If
IsEnabledBtns()
End Sub
@@ -576,8 +660,7 @@ Public Class SetUpWindowVM
' se la posizione non è valida, restituisco errore
If sHead = INVALIDPOS Then
EgtOutLog("SetUp warning: try to set " & SelTool.Name & " on " & Position.TcPos)
'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 5), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31555), EgtMsg(31551), MessageBoxButton.OK, MessageBoxImage.Error)
MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 5), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
Return False
' altrimenti, se la posizione nell'attrezzaggio è vuota
ElseIf Not PosIsOccupied Then
@@ -604,11 +687,13 @@ Public Class SetUpWindowVM
' altrimenti restituisco falso
Else
ErrorList.Add(SelTool.Name)
'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & SelTool.Name & " " & EgtMsg(MSG_SETUPERRORS + 6), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
Return False
End If
' altrimenti restituisco falso
Else
ErrorList.Add(SelTool.Name)
'MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & SelTool.Name & " " & EgtMsg(MSG_SETUPERRORS + 6), EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
Return False
End If
Return True
@@ -694,7 +779,7 @@ Public Class SetUpWindowVM
Next
Next
m_IsEnabledApplyBtn = False
NotifyPropertyChanged(NameOf(IsEnabledApplyBtn))
NotifyPropertyChanged("IsEnabledApplyBtn")
' aggiorno le librerie sottostanti
EgtUpdateCurrSetup()
End Sub
@@ -732,7 +817,7 @@ Public Class SetUpWindowVM
End If
' Apertura dialogo di salvataggio
Dim SaveFileDialogViewVM As New SaveFileDialogWithListVM With {
.Title = EgtMsg(31503) & " " & EgtMsg(31501), ' Archivia SetUp
.Title = EgtMsg(MSG_SETUP + 3) & " " & EgtMsg(MSG_SETUP + 1),
.Extension = ".stu",
.Filter = "*.stu",
.Directory = sDir,
@@ -798,7 +883,7 @@ Public Class SetUpWindowVM
End If
' Apertura dialogo di salvataggio
Dim OpenFileDialogView As New EgtWPFLib5.EgtOpenFileDialog With {
.Title = EgtMsg(31504) & " " & EgtMsg(31501), ' Recupera SetUp
.Title = EgtMsg(MSG_SETUP + 4) & " " & EgtMsg(MSG_SETUP + 1),
.Filter = "*.stu",
.Directory = sDir,
.FileName = String.Empty
@@ -889,12 +974,11 @@ Public Class SetUpWindowVM
' verifico se ci sono errori
If ErrorList.Count > 0 Then
' li raccolgo tutti nello stesso messaggio
Dim sError As String = EgtMsg(31556) & Environment.NewLine ' La posizione predefinita dell'utensile è già occupata.
Dim sError As String = EgtMsg(MSG_SETUPERRORS + 6) & Environment.NewLine
For ErrorIndex = 0 To ErrorList.Count - 1
sError &= "- " & ErrorList(ErrorIndex) & Environment.NewLine
Next
'MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
EgtMessageBoxV.Show(Application.Current.MainWindow, sError, EgtMsg(31552), MessageBoxButton.OK, MessageBoxImage.Exclamation) ' Avviso
MessageBox.Show(sError, EgtMsg(MSG_SETUPERRORS + 2), MessageBoxButton.OK, MessageBoxImage.Exclamation)
End If
' abilito e disabilito tutte le uscite in base all'utensile selezionato
@@ -935,8 +1019,7 @@ Public Class SetUpWindowVM
' Verifico se l'attrezzaggio è stato modificato
If IsModifiedSetUp() Then
' se modificato chiedo se salvarlo prima di uscire
'If MessageBox.Show(EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31506), EgtMsg(31502), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then ' Applicare l'attrezzaggio corrente prima di uscire? - Applica
If MessageBox.Show(EgtMsg(MSG_SETUP + 6), EgtMsg(MSG_SETUP + 2), MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
' lo salvo
Apply()
End If
@@ -1224,7 +1307,7 @@ Public Class ExitToolAssociation
Set(value As Boolean)
If value <> m_IsOccupied Then
m_IsOccupied = value
NotifyPropertyChanged(NameOf(IsOccupied))
NotifyPropertyChanged("IsOccupied")
End If
End Set
End Property
@@ -1240,7 +1323,7 @@ Public Class ExitToolAssociation
Set(value As Boolean)
If value <> m_IsEnabledPos Then
m_IsEnabledPos = value
NotifyPropertyChanged(NameOf(IsEnabledPos))
NotifyPropertyChanged("IsEnabledPos")
End If
End Set
End Property
@@ -1255,7 +1338,7 @@ Public Class ExitToolAssociation
End Get
Set(value As Boolean?)
m_IsValidPos = value
NotifyPropertyChanged(NameOf(ExitBtnBackgroundCol))
NotifyPropertyChanged("ExitBtnBackgroundCol")
End Set
End Property
@@ -1312,7 +1395,7 @@ Public Class ExitToolAssociation
Set(value As ToolItem)
m_Tool = value
m_IsModifiedTool = m_Tool IsNot m_OrigTool
NotifyPropertyChanged(NameOf(Tool))
NotifyPropertyChanged("Tool")
End Set
End Property
@@ -1331,31 +1414,31 @@ Public Class ExitToolAssociation
Dim sLen As String = LenToString(dValue, 4)
EgtTdbGetCurrToolParam(MCH_TP.MAXMAT, dValue)
Dim MaxMat As String = LenToString(dValue, 4)
Return (EgtMsg(31053) & ": " & ConvertToolTypeToString(nType) & Environment.NewLine & ' Tipo
EgtMsg(31056) & ": " & sDiam & Environment.NewLine & ' Diametro
EgtMsg(31062) & ": " & sLen & Environment.NewLine & ' Lunghezza
EgtMsg(31064) & ": " & MaxMat) ' Massimo Materiale
Return (EgtMsg(MSG_TOOLDB + 53) & ": " & ConvertToolTypeToString(nType) & Environment.NewLine &
EgtMsg(MSG_TOOLDB + 56) & ": " & sDiam & Environment.NewLine &
EgtMsg(MSG_TOOLDB + 62) & ": " & sLen & Environment.NewLine &
EgtMsg(MSG_TOOLDB + 64) & ": " & MaxMat)
End Get
End Property
Private Function ConvertToolTypeToString(ToolType As Integer) As String
Select Case ToolType
Case MCH_TY.DRILL_STD
Return EgtMsg(31001) ' Punta
Return EgtMsg(MSG_TOOLDB + 1)
Case MCH_TY.DRILL_LONG
Return EgtMsg(31006) ' Punta lunga
Return EgtMsg(MSG_TOOLDB + 6)
Case MCH_TY.SAW_STD
Return EgtMsg(31002) ' Lama
Return EgtMsg(MSG_TOOLDB + 2)
Case MCH_TY.SAW_FLAT
Return EgtMsg(31007) ' Lama piatta
Return EgtMsg(MSG_TOOLDB + 7)
Case MCH_TY.MILL_STD
Return EgtMsg(31003) ' Fresa
Return EgtMsg(MSG_TOOLDB + 3)
Case MCH_TY.MILL_NOTIP
Return EgtMsg(31008) ' Fresa senza punta
Return EgtMsg(MSG_TOOLDB + 8)
Case MCH_TY.MORTISE_STD
Return EgtMsg(31004) ' Mortasatrice
Return EgtMsg(MSG_TOOLDB + 4)
Case MCH_TY.COMPO
Return EgtMsg(31005) ' Composito
Return EgtMsg(MSG_TOOLDB + 5)
Case Else
Return String.Empty
End Select
@@ -1399,7 +1482,7 @@ Public Class ExitToolAssociation
' se quello selezionato nella lista non è un utensile esco
If Not TypeOf param Is ToolItem Then
m_IsOccupied = False
NotifyPropertyChanged(NameOf(IsOccupied))
NotifyPropertyChanged("IsOccupied")
Return
End If
Dim SelTool As ToolItem = DirectCast(param, ToolItem)
@@ -1419,7 +1502,7 @@ Public Class ExitToolAssociation
EgtTdbGetToolFromUUID(SelTool.Uuid, sToolName)
EgtOutLog("Error in setup! Tool:" & sToolName & " TcPos: " & m_MyPos.TcPos)
m_IsOccupied = False
NotifyPropertyChanged(NameOf(IsOccupied))
NotifyPropertyChanged("IsOccupied")
Return
End If
' se la testa restituita non coincide con quella della posizione
@@ -1447,7 +1530,7 @@ Public Class ExitToolAssociation
ElseIf sh_ToolsList(Index).Name = EgtMsg(90756) And SelTool.Type = MCH_TY.MILL_POLISHING Then
' --- MOLA LUCIDANTE ---
sh_ToolsList(Index).Items.Remove(SelTool)
ElseIf sh_ToolsList(Index).Name = EgtMsg(31003) And SelTool.Type = MCH_TY.MILL_STD Then
ElseIf sh_ToolsList(Index).Name = EgtMsg(MSG_TOOLDB + 3) And SelTool.Type = MCH_TY.MILL_STD Then
' --- FRESA ---
sh_ToolsList(Index).Items.Remove(SelTool)
End If
@@ -1460,7 +1543,7 @@ Public Class ExitToolAssociation
Exit For
End If
Next
NotifyPropertyChanged(NameOf(ToolTipMsg))
NotifyPropertyChanged("ToolTipMsg")
Else
' lo rimetto nella lista utensili
For Index = 0 To sh_ToolsList.Count - 1
@@ -1503,7 +1586,7 @@ Public Class ExitToolAssociation
' espando la famiglia in cui l'ho messo
sh_ToolsList(Index).IsExpanded = True
Exit For
ElseIf sh_ToolsList(Index).Name = EgtMsg(31003) And Tool.Type = MCH_TY.MILL_STD Then
ElseIf sh_ToolsList(Index).Name = EgtMsg(MSG_TOOLDB + 3) And Tool.Type = MCH_TY.MILL_STD Then
' --- FRESA ---
Dim TempList As New List(Of String)
Dim ToolIndex As Integer
@@ -1556,7 +1639,7 @@ Public Class ExitToolAssociation
' seleziono utensile rimesso in lista
m_Tool.IsSelected = True
Tool.NotifyPropertyChanged(NameOf(Tool.IsSelected))
Tool.NotifyPropertyChanged("IsSelected")
' e lo tolgo dalla posizione di attrezzaggio
Tool = Nothing
IsOccupied = False
@@ -1645,7 +1728,7 @@ Public Class FamilyToolItem
m_HaveToolsInCurrMachGroup = True
End If
Next
NotifyPropertyChanged(NameOf(FamilyColor))
NotifyPropertyChanged("FamilyColor")
End Sub
End Class
@@ -1696,6 +1779,7 @@ Public Class ToolItem
Set(value As Boolean)
If value <> m_IsInCurrMachGroup Then
m_IsInCurrMachGroup = value
'NotifyPropertyChanged("IsInCurrMachGroup")
End If
End Set
End Property
@@ -1769,9 +1853,9 @@ Public Class ToolItem
Public ReadOnly Property ToolTipMsg As String
Get
Return (EgtMsg(31075) & ": " & m_Name & Environment.NewLine & ' Nome
EgtMsg(31078) & ": " & m_TcPos & Environment.NewLine & ' Posizione
EgtMsg(31074) & ": " & m_Head & "." & m_Exit) ' Testa
Return (EgtMsg(MSG_TOOLDB + 75) & ": " & m_Name & Environment.NewLine &
EgtMsg(MSG_TOOLDB + 78) & ": " & m_TcPos & Environment.NewLine &
EgtMsg(MSG_TOOLDB + 74) & ": " & m_Head & "." & m_Exit)
End Get
End Property
+8 -8
View File
@@ -12,25 +12,25 @@ Public Class ShowPanelVM
Public ReadOnly Property RenderingWFToolTip As String
Get
Return EgtMsg(5251) ' Wireframe
Return EgtMsg(MSG_GRIDVIEWPANEL + 1)
End Get
End Property
Public ReadOnly Property RenderingHLToolTip As String
Get
Return EgtMsg(5252) ' Linee Nascoste
Return EgtMsg(MSG_GRIDVIEWPANEL + 2)
End Get
End Property
Public ReadOnly Property RenderingSHToolTip As String
Get
Return EgtMsg(5253) ' Ombreggiature
Return EgtMsg(MSG_GRIDVIEWPANEL + 3)
End Get
End Property
Public ReadOnly Property CurveDirToolTip As String
Get
Return EgtMsg(5266) ' Mostra Direzione Curve
Return EgtMsg(MSG_GRIDVIEWPANEL + 16)
End Get
End Property
@@ -46,7 +46,7 @@ Public Class ShowPanelVM
m_WireframeIsChecked = value
If value Then
LibMap.refSceneHostVM.ShowMode(SM.WIREFRAME)
NotifyPropertyChanged(NameOf(WireframeIsChecked))
NotifyPropertyChanged("WireframeIsChecked")
End If
End If
End Set
@@ -62,7 +62,7 @@ Public Class ShowPanelVM
m_HiddenLineIsChecked = value
If value Then
LibMap.refSceneHostVM.ShowMode(SM.HIDDENLINE)
NotifyPropertyChanged(NameOf(HiddenLineIsChecked))
NotifyPropertyChanged("HiddenLineIsChecked")
End If
End If
End Set
@@ -78,7 +78,7 @@ Public Class ShowPanelVM
m_ShadingIsChecked = value
If value Then
LibMap.refSceneHostVM.ShowMode(SM.SHADING)
NotifyPropertyChanged(NameOf(ShadingIsChecked))
NotifyPropertyChanged("ShadingIsChecked")
End If
End If
End Set
@@ -93,7 +93,7 @@ Public Class ShowPanelVM
If value <> m_CurveDirIsChecked Then
m_CurveDirIsChecked = value
EgtSetShowCurveDirection(value)
NotifyPropertyChanged(NameOf(CurveDirIsChecked))
NotifyPropertyChanged("CurveDirIsChecked")
End If
End Set
End Property
+17 -15
View File
@@ -1,4 +1,6 @@
Public Class StatusBarVM
Imports EgtWPFLib5
Public Class StatusBarVM
Inherits VMBase
#Region "FIELDS & PROPERTIES"
@@ -50,7 +52,7 @@
End Get
Set(value As String)
m_OutputMessage = value
NotifyPropertyChanged(NameOf(OutputMessage))
NotifyPropertyChanged( "OutputMessage")
End Set
End Property
@@ -61,7 +63,7 @@
End Get
Set(value As Brush)
m_OutputMessage_Foreground = value
NotifyPropertyChanged(NameOf(OutputMessage_Foreground))
NotifyPropertyChanged("OutputMessage_Foreground")
End Set
End Property
@@ -123,7 +125,7 @@
Public Sub SetLoadingProgress(sProgress As Integer)
m_LoadingProgress = sProgress
NotifyPropertyChanged(NameOf(LoadingProgress))
NotifyPropertyChanged("LoadingProgress")
End Sub
Public Sub SetLoadingProgress_Visibility(IsVisible As Boolean)
@@ -138,13 +140,13 @@
m_LoadingProgress_Visibility = Visibility.Hidden
m_StopProgress_Visibility = Visibility.Hidden
End If
NotifyPropertyChanged(NameOf(LoadingProgress_Visibility))
NotifyPropertyChanged(NameOf(StopProgress_Visibility))
NotifyPropertyChanged("LoadingProgress_Visibility")
NotifyPropertyChanged("StopProgress_Visibility")
End Sub
Public Sub SetStopProgress_IsEnabled(IsEnabled As Boolean)
m_StopProgress_IsEnabled = IsEnabled
NotifyPropertyChanged(NameOf(StopProgress_IsEnabled))
NotifyPropertyChanged("StopProgress_IsEnabled")
End Sub
Public Sub SetStopProgress_IsActive(IsActive As Boolean)
@@ -154,13 +156,13 @@
Public Overloads Sub SetOutputMessage(sMessage As String, Optional nMsgType As MSG_TYPE = MSG_TYPE.INFO)
SetMsgColor(nMsgType)
m_OutputMessage = sMessage
NotifyPropertyChanged(NameOf(OutputMessage))
NotifyPropertyChanged("OutputMessage")
End Sub
Public Overloads Sub SetOutputMessage(sMessage As String, nTime As Integer, Optional nMsgType As MSG_TYPE = MSG_TYPE.INFO)
SetMsgColor(nMsgType)
m_OutputMessage = sMessage
NotifyPropertyChanged(NameOf(OutputMessage))
NotifyPropertyChanged("OutputMessage")
OutputMessageTimer.Interval = TimeSpan.FromSeconds(nTime)
OutputMessageTimer.IsEnabled = True
OutputMessageTimer.Start()
@@ -170,7 +172,7 @@
m_OutputMessage_Foreground = Brushes.Black
NotifyPropertyChanged("MsgColor")
m_OutputMessage = String.Empty
NotifyPropertyChanged(NameOf(OutputMessage))
NotifyPropertyChanged("OutputMessage")
If OutputMessageTimer.IsEnabled Then
OutputMessageTimer.Stop()
OutputMessageTimer.IsEnabled = False
@@ -179,12 +181,12 @@
Public Sub SetMeasureUnit(nMeasureUnit As Integer)
m_MeasureUnit = If(nMeasureUnit = 0, "in", "mm")
NotifyPropertyChanged(NameOf(MeasureUnit))
NotifyPropertyChanged("MeasureUnit")
End Sub
Public Sub SetCurrPos(sCurrPos As String)
m_CurrPos = sCurrPos
NotifyPropertyChanged(NameOf(CurrPos))
NotifyPropertyChanged("CurrPos")
End Sub
Public Sub SetMsgColor(nMsgType As MSG_TYPE)
@@ -196,14 +198,14 @@
Case MSG_TYPE.ERROR_
m_OutputMessage_Foreground = Brushes.Red
End Select
NotifyPropertyChanged(NameOf(OutputMessage_Foreground))
NotifyPropertyChanged("OutputMessage_Foreground")
End Sub
Public Sub SetSnapPointType(sSnapPntType As String, Optional SnapPntTypeBackground As Brush = Nothing)
m_SnapPointType = sSnapPntType
NotifyPropertyChanged(NameOf(SnapPointType))
NotifyPropertyChanged("SnapPointType")
If Not IsNothing(SnapPntTypeBackground) Then
m_SnapPointType_Background = DirectCast(SnapPntTypeBackground, SolidColorBrush)
m_SnapPointType_Background = SnapPntTypeBackground
NotifyPropertyChanged("SnapPointTypeBackground")
End If
End Sub
+93
View File
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<!--x:Name="Self">-->
<UserControl.Resources>
<ResourceDictionary>
@@ -12,10 +13,84 @@
</ResourceDictionary>
</UserControl.Resources>
<!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
<Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid.ColumnDefinitions>
@@ -81,6 +156,24 @@
RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:StringParamV}},
Converter={StaticResource ErrorVisibilityConverter}}"
Margin="0,0,0,3"/>
<!--Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
<!--Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:StringParamV}},
Path=ParamErrorMsgVisibility,
Mode=TwoWay,
UpdateSourceTrigger=PropertyChanged,
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
<!--<TextBlock x:Name="ParamMsg" Style="{DynamicResource MachiningsToolTextBlock}"/>
<EgtWPFLib5:EgtTextBox x:Name="ParamValue" Grid.Column="1" Style="{DynamicResource MachiningsToolTextBox}"
/>
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource ValidationErrorTextBlock}"
x:Name="ErrorMsg"
Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
</Grid>
</UserControl>
+51 -1
View File
@@ -1,4 +1,6 @@
Imports System.ComponentModel
Imports System.Globalization
Imports System.Windows.Controls.Primitives
Imports System.ComponentModel
Public Class StringParamV
@@ -420,6 +422,41 @@ Public Class StringParamV
' ---------------------------------------------------------------------------------------------------------------------------------------------------------
' Gestione BorderBrushIsFocused textbox
'Public Shared ReadOnly EgtBorderBrushIsFocusedProperty As DependencyProperty = DependencyProperty.RegisterAttached(
' NameOf(EgtBorderBrushIsFocused),
' GetType(Brush),
' GetType(StringParamV),
' New FrameworkPropertyMetadata(DirectCast(New BrushConverter().ConvertFromString("#FF569DE5"), Brush),
' New PropertyChangedCallback(AddressOf EgtBorderBrushIsFocused_PropertyChanged)) With {.BindsTwoWayByDefault = True})
'' Declare a get accessor method.
'Public Shared Function GetEgtBorderBrushIsFocused(element As StringParamV) As Brush
' Return DirectCast(element.GetValue(EgtBorderBrushIsFocusedProperty), Brush)
'End Function
'' Declare a set accessor method.
'Public Shared Sub SetEgtBorderBrushIsFocused(element As StringParamV, value As Brush)
' element.SetValue(EgtBorderBrushIsFocusedProperty, value)
'End Sub
'' Declare public property.
'Public Property EgtBorderBrushIsFocused As Brush
' Get
' Return CType(GetValue(EgtBorderBrushIsFocusedProperty), Brush)
' End Get
' Set(value As Brush)
' SetValue(EgtBorderBrushIsFocusedProperty, value)
' End Set
'End Property
'' Declare method invoke by changing property.
'Private Shared Sub EgtBorderBrushIsFocused_PropertyChanged(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
' Dim TempMe As StringParamV = DirectCast(sender, StringParamV)
'End Sub
' ---------------------------------------------------------------------------------------------------------------------------------------------------------
Public Shared ReadOnly ParamTxBxProperty As DependencyProperty =
DependencyProperty.Register("ParamTxBx", GetType(String), GetType(StringParamV), New FrameworkPropertyMetadata() With {.BindsTwoWayByDefault = True})
Public Property ParamTxBx As String
@@ -431,6 +468,15 @@ Public Class StringParamV
End Set
End Property
'Private Shared Sub OnParamTxBxChangedCallback(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
' Dim StringParamV As StringParamV = DirectCast(sender, StringParamV)
' If Not IsNothing(sender) Then
' 'StringParamV.ParamValue.Text = CStr(e.NewValue)
' StringParamV.ParamTxBx = CStr(e.NewValue)
' StringParamV.NotifyPropertyChanged("ParamTxBx")
' End If
'End Sub
Public Property ParamErrorMsg() As String
Get
Return CStr(GetValue(ParamErrorMsgProperty))
@@ -452,6 +498,10 @@ Public Class StringParamV
End Set
End Property
'Friend Sub ParamValue_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ParamValue.TextChanged
' ParamTxBx = ParamValue.Text
'End Sub
Public Shared ReadOnly ParamVisibilityProperty As DependencyProperty =
DependencyProperty.Register("ParamVisibility", GetType(Visibility), GetType(StringParamV))
+96 -1
View File
@@ -1,7 +1,10 @@
<UserControl x:Class="StringParamWithButtonV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5"
xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
<!--x:Name="Self">-->
<UserControl.Resources>
<ResourceDictionary>
@@ -61,16 +64,90 @@
</ResourceDictionary>
</UserControl.Resources>
<!--Visibility="{Binding ParamVisibility, ElementName=Self,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">-->
<Grid Style="{DynamicResource Param_GpBxHeaderAlignment}">
<Grid.Resources>
<EgtWPFLib5:MachiningParamVisibilityConverter x:Key="MachiningParamVisibilityConverter"/>
<EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Invert">0</sys:Int32>
<sys:Int32 x:Key="LeaveTab">1</sys:Int32>
<sys:Int32 x:Key="WorkSide">2</sys:Int32>
<sys:Int32 x:Key="HeadSide">3</sys:Int32>
<sys:Int32 x:Key="LeadInType">4</sys:Int32>
<sys:Int32 x:Key="ExtLinkType">5</sys:Int32>
<sys:Int32 x:Key="LeadOutType">6</sys:Int32>
<sys:Int32 x:Key="CurveUse">7</sys:Int32>
<sys:Int32 x:Key="StepType">8</sys:Int32>
<sys:Int32 x:Key="LeadLinkType">9</sys:Int32>
<sys:Int32 x:Key="Speed">10</sys:Int32>
<sys:Int32 x:Key="Feed">11</sys:Int32>
<sys:Int32 x:Key="StartFeed">12</sys:Int32>
<sys:Int32 x:Key="EndFeed">13</sys:Int32>
<sys:Int32 x:Key="TipFeed">14</sys:Int32>
<sys:Int32 x:Key="OffSr">15</sys:Int32>
<sys:Int32 x:Key="OffSl">16</sys:Int32>
<sys:Int32 x:Key="SideAngle">17</sys:Int32>
<sys:Int32 x:Key="Approx">18</sys:Int32>
<sys:Int32 x:Key="StartPos">19</sys:Int32>
<sys:Int32 x:Key="StartSlowLen">20</sys:Int32>
<sys:Int32 x:Key="EndSlowLen">21</sys:Int32>
<sys:Int32 x:Key="ThrouAddLen">22</sys:Int32>
<sys:Int32 x:Key="StepPar">23</sys:Int32>
<sys:Int32 x:Key="ReturnPos">24</sys:Int32>
<sys:Int32 x:Key="TabLen">25</sys:Int32>
<sys:Int32 x:Key="TabDist">26</sys:Int32>
<sys:Int32 x:Key="TabHeight">27</sys:Int32>
<sys:Int32 x:Key="TabAngle">28</sys:Int32>
<sys:Int32 x:Key="LiTang">29</sys:Int32>
<sys:Int32 x:Key="LiPerp">30</sys:Int32>
<sys:Int32 x:Key="LiElev">31</sys:Int32>
<sys:Int32 x:Key="LiCompLen">32</sys:Int32>
<sys:Int32 x:Key="LoTang">33</sys:Int32>
<sys:Int32 x:Key="LoPerp">34</sys:Int32>
<sys:Int32 x:Key="LoElev">35</sys:Int32>
<sys:Int32 x:Key="LoCompLen">36</sys:Int32>
<sys:Int32 x:Key="StartAddLen">37</sys:Int32>
<sys:Int32 x:Key="EndAddLen">38</sys:Int32>
<sys:Int32 x:Key="StepExtArc">39</sys:Int32>
<sys:Int32 x:Key="StepIntArc">40</sys:Int32>
<sys:Int32 x:Key="SideStep">41</sys:Int32>
<sys:Int32 x:Key="VertFeed">42</sys:Int32>
<sys:Int32 x:Key="NamePar">43</sys:Int32>
<sys:Int32 x:Key="Tool">44</sys:Int32>
<sys:Int32 x:Key="DepthStr">45</sys:Int32>
<sys:Int32 x:Key="UserNotes">46</sys:Int32>
<sys:Int32 x:Key="OverLap">47</sys:Int32>
<sys:Int32 x:Key="SubType">49</sys:Int32>
<sys:Int32 x:Key="SelectedSolChoiceType">50</sys:Int32>
<sys:Int32 x:Key="InitAngs">51</sys:Int32>
<sys:Int32 x:Key="BlockedAxis">52</sys:Int32>
<sys:Int32 x:Key="FaceUseType">53</sys:Int32>
<sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
<sys:Int32 x:Key="StepBack">55</sys:Int32>
<sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
<sys:Int32 x:Key="BackFeed">57</sys:Int32>
<sys:Int32 x:Key="StepSideAng">58</sys:Int32>
<sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
<sys:Int32 x:Key="Probing">60</sys:Int32>
<sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
<sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
<sys:Int32 x:Key="ExtCornType">63</sys:Int32>
<sys:Int32 x:Key="IntCornType">64</sys:Int32>
<sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
<sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
<sys:Int32 x:Key="LiHole">67</sys:Int32>
<sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
<sys:Int32 x:Key="LpTurns">69</sys:Int32>
<sys:Int32 x:Key="HpTurns">70</sys:Int32>
<sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
</Grid.Resources>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<!--<ColumnDefinition Width="Auto"/>-->
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
@@ -148,6 +225,24 @@
Converter={StaticResource ErrorVisibilityConverter}}"
Margin="0,0,0,3"/>
<!--Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
<!--Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:StringParamV}},
Path=ParamErrorMsgVisibility,
Mode=TwoWay,
UpdateSourceTrigger=PropertyChanged,
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
<!--<TextBlock x:Name="ParamMsg" Style="{DynamicResource MachiningsToolTextBlock}"/>
<EgtWPFLib5:EgtTextBox x:Name="ParamValue" Grid.Column="1" Style="{DynamicResource MachiningsToolTextBox}"
/>
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource ValidationErrorTextBlock}"
x:Name="ErrorMsg"
Visibility="{Binding Path=SelectedItem.SpeedErrorMsg, ElementName=MachiningsTreeView,
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>-->
</Grid>
</UserControl>
+31 -3
View File
@@ -1,4 +1,7 @@
Imports System.ComponentModel
Imports System.Globalization
Imports System.Windows.Controls.Primitives
Imports System.ComponentModel
Public Class StringParamWithButtonV
Implements INotifyPropertyChanged
@@ -40,7 +43,19 @@ Public Class StringParamWithButtonV
End Property
' ------------------------------------------------------------------- Colore TextBlock -------------------------------------------------------------------
'Public Shared ReadOnly ForegroundParamTxBlProperty As DependencyProperty =
' DependencyProperty.Register("ForegroundParamTxBl",
' GetType(Windows.Media.Brush),
' GetType(StringParamWithButtonV),
' New PropertyMetadata(Windows.Media.Brushes.Black))
'Public Property ForegroundParamTxBl() As Windows.Media.Brush
' Get
' Return DirectCast(GetValue(ForegroundParamTxBlProperty), Windows.Media.Brush)
' End Get
' Set(ByVal value As Windows.Media.Brush)
' SetValue(ForegroundParamTxBlProperty, value)
' End Set
'End Property
Public Shared ReadOnly ForegroundParamBtnTxBlProperty As DependencyProperty = DependencyProperty.RegisterAttached(
NameOf(ForegroundParamBtnTxBl),
GetType(Windows.Media.Brush),
@@ -64,9 +79,18 @@ Public Class StringParamWithButtonV
SetValue(ForegroundParamBtnTxBlProperty, value)
End Set
End Property
' ---------------------------------------------------------------------------------------------------------------------------------------------------------
'Private Shared Sub OnParamTxBxChangedCallback(sender As DependencyObject, e As DependencyPropertyChangedEventArgs)
' Dim StringParamV As StringParamV = DirectCast(sender, StringParamV)
' If Not IsNothing(sender) Then
' 'StringParamV.ParamValue.Text = CStr(e.NewValue)
' StringParamV.ParamTxBx = CStr(e.NewValue)
' StringParamV.NotifyPropertyChanged("ParamTxBx")
' End If
'End Sub
Public Property ParamErrorMsg() As String
Get
Return CStr(GetValue(ParamErrorMsgProperty))
@@ -88,6 +112,10 @@ Public Class StringParamWithButtonV
End Set
End Property
'Friend Sub ParamValue_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ParamValue.TextChanged
' ParamTxBx = ParamValue.Text
'End Sub
Public Shared ReadOnly ParamVisibilityProperty As DependencyProperty =
DependencyProperty.Register("ParamVisibility", GetType(Visibility), GetType(StringParamWithButtonV))
+88 -5
View File
@@ -1,7 +1,8 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:EgtWPFLib5"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating">
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:EgtWPFLib5"
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating">
<!--Colori predefiniti-->
<SolidColorBrush x:Key="EgaltechBlue1" Color="#FF4D84C4" />
@@ -160,8 +161,59 @@
<Style BasedOn="{x:Null}" TargetType="{x:Type local:EgtTextBox}">
<!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
<Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="AllowDrop" Value="true"/>
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type local:EgtTextBox}">
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
<ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderBrush" TargetName="Bd" Value="#FF7EB4EA"/>
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter Property="BorderBrush" TargetName="Bd" Value="#FF569DE5"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>-->
</Style>
<!--Style for the EgtMsgBox that is used for basic validation question -->
<!--<Style TargetType="{x:Type local:EgtMsgBox}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type local:EgtMsgBox}">
<Grid Name="PART_Grid" >
<TextBlock Name="PART_Title" FontSize="{DynamicResource EgtMsgBox_TitleFontSize}"
VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Image Name="PART_Icon" HorizontalAlignment="left" VerticalAlignment="Top" Height="70" Width="70"/>
<TextBlock Name="PART_Text" FontSize="{DynamicResource EgtMsgBox_TextFontSize}"
VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="WrapWithOverflow"/>
<ProgressBar Name="PART_ProgressBar" Grid.Row="2" Minimum="0" Maximum="100"/>
<Button Name="PART_Button1" IsCancel="True"/>
<Button Name="PART_Button2" IsCancel="True"/>
<Button Name="PART_Button3" IsCancel="True"/>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>-->
<!--Style per i button della CustomWindow-->
<SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
<SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
@@ -201,7 +253,7 @@
<Setter Property="FontFamily" Value="Webdings"/>
<Setter Property="FontSize" Value="13.333" />
<Setter Property="Foreground" Value="Black" />
<Setter Property="Margin" Value="2"/>
<Setter Property="Margin" Value="0,2,3,0"/>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Foreground" Value="Gray" />
@@ -409,6 +461,9 @@
</Canvas>
</Border>
<ControlTemplate.Triggers>
<!--<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>-->
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
@@ -455,6 +510,9 @@
</Canvas>
</Border>
<ControlTemplate.Triggers>
<!--<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>-->
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource Button.MouseOver.Background}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.MouseOver.Border}"/>
@@ -609,6 +667,26 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type EgtFloating:EgtFloatingTray}">
<Grid Background="{TemplateBinding Background}">
<!--Separatore che si colora quando si avvicina il
mouse durante il trascinamento per ancorare il Panel al Tray-->
<!--<Border Name="PART_Border">
<Border.Style>
<Style TargetType="Border">
<Style.Triggers>
<DataTrigger Binding="{Binding Path=(PART_StackPanel)}"
Value="Horizontal">
<Setter Property="Height" Value="5"/>
<Setter Property="Width" Value="Auto"/>
</DataTrigger>
<DataTrigger Binding="{Binding Path=(DockPanel.Dock), RelativeSource={RelativeSource AncestorType=ItemsControl}}"
Value="Bottom">
<Setter Property="Height" Value="Auto"/>
<Setter Property="Width" Value="5"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Border.Style>
</Border>-->
<ItemsPresenter/>
</Grid>
</ControlTemplate>
@@ -718,6 +796,11 @@
Fill="{StaticResource ScrollBar.Static.Glyph}" Margin="3"
Stretch="Uniform"/>
</RepeatButton>
<!--<ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
CanContentScroll="{TemplateBinding CanContentScroll}"
ContentTemplate="{TemplateBinding ContentTemplate}"
CanHorizontallyScroll="False" Grid.Column="1"
Content="{TemplateBinding Content}"/>-->
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
CanContentScroll="{TemplateBinding CanContentScroll}"
CanHorizontallyScroll="False" CanVerticallyScroll="False"
+43 -3
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="BeamMillParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -17,8 +18,35 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
<EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Corr">0</sys:Int32>
<sys:Int32 x:Key="ExitPar">1</sys:Int32>
<sys:Int32 x:Key="Coolant">2</sys:Int32>
<sys:Int32 x:Key="CornRad">3</sys:Int32>
<sys:Int32 x:Key="Diam">4</sys:Int32>
<sys:Int32 x:Key="TotDiam">5</sys:Int32>
<sys:Int32 x:Key="Feed">6</sys:Int32>
<sys:Int32 x:Key="EndFeed">7</sys:Int32>
<sys:Int32 x:Key="StartFeed">8</sys:Int32>
<sys:Int32 x:Key="TipFeed">9</sys:Int32>
<sys:Int32 x:Key="Len">10</sys:Int32>
<sys:Int32 x:Key="TotLen">11</sys:Int32>
<sys:Int32 x:Key="MaxMat">12</sys:Int32>
<sys:Int32 x:Key="LonOffset">13</sys:Int32>
<sys:Int32 x:Key="RadOffset">14</sys:Int32>
<sys:Int32 x:Key="Speed">15</sys:Int32>
<sys:Int32 x:Key="SideAng">16</sys:Int32>
<sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
<sys:Int32 x:Key="Thick">18</sys:Int32>
<sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
<sys:Int32 x:Key="MinFeed">20</sys:Int32>
<sys:Int32 x:Key="Draw">21</sys:Int32>
<sys:Int32 x:Key="Head">22</sys:Int32>
<sys:Int32 x:Key="NamePar">23</sys:Int32>
<sys:Int32 x:Key="UserNotes">24</sys:Int32>
<sys:Int32 x:Key="TcPos">25</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -58,6 +86,9 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding DrawTxBl}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"
Style="{DynamicResource MachiningsToolTextBlock}"/>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
@@ -65,7 +96,10 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
<Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}">
<TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
VerticalAlignment="Center" Foreground="Gray"
ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,10 +111,16 @@
</Border>
<Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
Command="{Binding Path=AutoDrawCommand}"
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"/>
<Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
Command="{Binding Path=OpenDrawFileCommand}"
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"/>
</Grid>
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
Text="{Binding Path=DrawErrorMsg}"
+44 -5
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="ChiselParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -17,8 +18,35 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
<EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Corr">0</sys:Int32>
<sys:Int32 x:Key="ExitPar">1</sys:Int32>
<sys:Int32 x:Key="Coolant">2</sys:Int32>
<sys:Int32 x:Key="CornRad">3</sys:Int32>
<sys:Int32 x:Key="Diam">4</sys:Int32>
<sys:Int32 x:Key="TotDiam">5</sys:Int32>
<sys:Int32 x:Key="Feed">6</sys:Int32>
<sys:Int32 x:Key="EndFeed">7</sys:Int32>
<sys:Int32 x:Key="StartFeed">8</sys:Int32>
<sys:Int32 x:Key="TipFeed">9</sys:Int32>
<sys:Int32 x:Key="Len">10</sys:Int32>
<sys:Int32 x:Key="TotLen">11</sys:Int32>
<sys:Int32 x:Key="MaxMat">12</sys:Int32>
<sys:Int32 x:Key="LonOffset">13</sys:Int32>
<sys:Int32 x:Key="RadOffset">14</sys:Int32>
<sys:Int32 x:Key="Speed">15</sys:Int32>
<sys:Int32 x:Key="SideAng">16</sys:Int32>
<sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
<sys:Int32 x:Key="Thick">18</sys:Int32>
<sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
<sys:Int32 x:Key="MinFeed">20</sys:Int32>
<sys:Int32 x:Key="Draw">21</sys:Int32>
<sys:Int32 x:Key="Head">22</sys:Int32>
<sys:Int32 x:Key="NamePar">23</sys:Int32>
<sys:Int32 x:Key="UserNotes">24</sys:Int32>
<sys:Int32 x:Key="TcPos">25</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -58,6 +86,9 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding DrawTxBl}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"
Style="{DynamicResource MachiningsToolTextBlock}"/>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
@@ -65,7 +96,10 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
<Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}">
<TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
VerticalAlignment="Center" Foreground="Gray"
ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,16 +111,21 @@
</Border>
<Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
Command="{Binding Path=AutoDrawCommand}"
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"/>
<Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
Command="{Binding Path=OpenDrawFileCommand}"
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"/>
</Grid>
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
Text="{Binding Path=DrawErrorMsg}"
Visibility="{Binding Path=DrawErrorMsg,
Converter={StaticResource ErrorVisibilityConverter}}"
Margin="0,0,5,0"/>
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
</Grid>
</Grid>
+11 -19
View File
@@ -69,9 +69,9 @@ Public Class ImportExportToolWindowVM
Public ReadOnly Property OkMsg As String
Get
If WindowMode = WindowModeEnum.IMPORT Then
Return EgtMsg(31161) ' Importa
Return EgtMsg(31161)
Else
Return EgtMsg(31162) ' Esporta
Return EgtMsg(31162)
End If
End Get
End Property
@@ -97,9 +97,9 @@ Public Class ImportExportToolWindowVM
#Region "METHODS"
Private Sub EnableOkBtn()
Private sub EnableOkBtn()
NotifyPropertyChanged(NameOf(IsEnabledOkBtn))
End Sub
End sub
#End Region ' Methods
@@ -145,8 +145,8 @@ Public Class ImportExportToolWindowVM
EgtTdbImport(ImportFilePath, vsImportToolName, vsFinalName, m_vsImported)
' Report
Dim ImportedToolList As New List(Of String)(vsImported)
'MessageBox.Show(EgtMsg(31166) & " " & vbCrLf & String.Join(vbCrLf, ImportedToolList.ToArray()), "", MessageBoxButton.OK)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31166) & " " & vbCrLf & String.Join(vbCrLf, ImportedToolList.ToArray()), "", MessageBoxButton.OK) ' I seguenti Utensili sono stati importati correttamente:
MessageBox.Show(EgtMsg(31166) & " " & vbCrLf &
String.Join(vbCrLf, ImportedToolList.ToArray()), "", MessageBoxButton.OK)
Case WindowModeEnum.EXPORT
' recupero gli utensili checkati
@@ -166,12 +166,6 @@ Public Class ImportExportToolWindowVM
.Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
.FileName = String.Empty
}
'Dim SaveFileDlg As New EgtManageFileDialogV(Application.Current.MainWindow, New EgtManageFileDialogVM()) With {
' .Title = EgtMsg(31162) & " " & EgtMsg(31163), ' Esporta Utensili
' .Filter = "File data (*.data)|*.data|Tutti i file (*.*)|*.*",
' .FileName = String.Empty
'}
If SaveFileDlg.ShowDialog() <> System.Windows.Forms.DialogResult.OK Then Return
Dim sFilePath As String = String.Empty
sFilePath = SaveFileDlg.FileName
@@ -275,20 +269,18 @@ Public Class ImpExpToolItem
' se esiste gia' chiedo se sovrascriverlo
If value Then
If m_AlreadyExist Then
'Select Case System.Windows.MessageBox.Show(EgtMsg(31164), "", MessageBoxButton.YesNoCancel)
Select Case EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31164), "", MessageBoxButton.YesNoCancel) ' L'utensile esiste già, sovrascriverlo?
Select Case System.Windows.MessageBox.Show(EgtMsg(31164), "", MessageBoxButton.YesNoCancel)
Case MessageBoxResult.Yes
m_ChangeName = False
m_Active = True
Case MessageBoxResult.No
'System.Windows.MessageBox.Show(EgtMsg(31165), "", MessageBoxButton.OK)
EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(31165), "", MessageBoxButton.OK) ' L'utensile verrà importato col nome seguito da "_imp"
System.Windows.MessageBox.Show(EgtMsg(31165), "", MessageBoxButton.OK)
m_ChangeName = True
m_Active = True
Case Else
m_Active = False
End Select
NotifyPropertyChanged(NameOf(Active))
NotifyPropertyChanged("Active")
Else
m_Active = True
End If
@@ -296,7 +288,7 @@ Public Class ImpExpToolItem
m_ChangeName = False
m_Active = False
End If
If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn()
If Not IsNothing(m_delEnableOkBtn) Then m_delEnableOkBtn
End Set
End Property
@@ -316,7 +308,7 @@ Public Class ImpExpToolItem
End Get
Set(value As Boolean)
m_ChangeName = value
NotifyPropertyChanged(NameOf(Name))
NotifyPropertyChanged("Name")
End Set
End Property
+47 -8
View File
@@ -1,6 +1,7 @@
<UserControl x:Class="MortiseParamPageV"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5">
<UserControl.Resources>
@@ -17,8 +18,36 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<EgtWPFLib5:ToolParamVisibilityConverter x:Key="ToolParamVisibilityConverter"/>
<EgtWPFLib5:ToolDrawUUIDConverter x:Key="ToolDrawUUIDConverter"/>
<EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
<sys:Int32 x:Key="Corr">0</sys:Int32>
<sys:Int32 x:Key="ExitPar">1</sys:Int32>
<sys:Int32 x:Key="Coolant">2</sys:Int32>
<sys:Int32 x:Key="CornRad">3</sys:Int32>
<sys:Int32 x:Key="Diam">4</sys:Int32>
<sys:Int32 x:Key="TotDiam">5</sys:Int32>
<sys:Int32 x:Key="Feed">6</sys:Int32>
<sys:Int32 x:Key="EndFeed">7</sys:Int32>
<sys:Int32 x:Key="StartFeed">8</sys:Int32>
<sys:Int32 x:Key="TipFeed">9</sys:Int32>
<sys:Int32 x:Key="Len">10</sys:Int32>
<sys:Int32 x:Key="TotLen">11</sys:Int32>
<sys:Int32 x:Key="MaxMat">12</sys:Int32>
<sys:Int32 x:Key="LonOffset">13</sys:Int32>
<sys:Int32 x:Key="RadOffset">14</sys:Int32>
<sys:Int32 x:Key="Speed">15</sys:Int32>
<sys:Int32 x:Key="SideAng">16</sys:Int32>
<sys:Int32 x:Key="MaxSpeed">17</sys:Int32>
<sys:Int32 x:Key="Thick">18</sys:Int32>
<sys:Int32 x:Key="MaxAbsorption">19</sys:Int32>
<sys:Int32 x:Key="MinFeed">20</sys:Int32>
<sys:Int32 x:Key="Draw">21</sys:Int32>
<sys:Int32 x:Key="Head">22</sys:Int32>
<sys:Int32 x:Key="NamePar">23</sys:Int32>
<sys:Int32 x:Key="UserNotes">24</sys:Int32>
<sys:Int32 x:Key="TcPos">25</sys:Int32>
<sys:Int32 x:Key="Dist">26</sys:Int32>
</Grid.Resources>
<Grid Grid.Column="0">
@@ -58,6 +87,9 @@
</Grid.RowDefinitions>
<TextBlock Text="{Binding DrawTxBl}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"
Style="{DynamicResource MachiningsToolTextBlock}"/>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
@@ -65,7 +97,10 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3">
<Border BorderThickness="0.5,1,0.5,0.5" Margin="0,3,0,0" BorderBrush="#FFABAdB3"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}">
<TextBlock Name="DrawTxBx" Grid.Column="0" Margin="3,0,0,0"
VerticalAlignment="Center" Foreground="Gray"
ToolTip="{Binding Path=Draw, UpdateSourceTrigger=PropertyChanged,
@@ -77,16 +112,21 @@
</Border>
<Button Grid.Column="1" Style="{DynamicResource AutoDrawButtonMargin}" Content="A"
Command="{Binding Path=AutoDrawCommand}"
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"/>
<Button Grid.Column="2" Style="{DynamicResource OpenDrawFileButtonMargin}" Content=". . ."
Command="{Binding Path=OpenDrawFileCommand}"
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"/>
Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
Visibility="{Binding Path=Type,
Converter={StaticResource ToolParamVisibilityConverter},
ConverterParameter={StaticResource Draw}}"/>
</Grid>
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{DynamicResource ValidationErrorTextBlock}"
Text="{Binding Path=DrawErrorMsg}"
Visibility="{Binding Path=DrawErrorMsg,
Converter={StaticResource ErrorVisibilityConverter}}"
Margin="0,0,5,0"/>
Converter={StaticResource ErrorVisibilityConverter}}" Margin="0,0,5,0"/>
</Grid>
</Grid>
@@ -190,8 +230,7 @@
ParamTxBx="{Binding Path=TotLen,
UpdateSourceTrigger=PropertyChanged,
ValidatesOnDataErrors=True}"
ParamErrorMsg="{Binding Path=TotLenErrorMsg}"
ParamErrorMsgVisibility="Collapsed"/>
ParamErrorMsg="{Binding Path=TotLenErrorMsg}" />
<EgtWPFLib5:StringParamV ParamTxBl="{Binding LenTxBl}"
ParamTxBx="{Binding Path=Len,
@@ -314,7 +353,7 @@
ParamCmBxList="{Binding Path=TcPosList,
UpdateSourceTrigger=PropertyChanged,
ValidatesOnDataErrors=True}"
ParamCmBxSelIndex="{Binding Path=SelectedTcPos}"/>
ParamCmBxSelIndex="{Binding Path=SelectedTcPos}" />
</UniformGrid>
</Grid>
</GroupBox>

Some files were not shown because too many files have changed in this diff Show More