Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d61104aaab | |||
| 67944bfdcb | |||
| e446f21069 | |||
| 2e2f2dd66d | |||
| 31b379bb3d | |||
| f1a8c8912d | |||
| 36747a9faa | |||
| 2ae8427be4 | |||
| 420af319a1 | |||
| 69c58ddbd9 | |||
| 6bc913530a | |||
| 46548eeeb0 | |||
| f605ba5b84 |
@@ -1,4 +1,66 @@
|
|||||||
<Border x:Class="BTLPartManagerV"
|
<dxb:PopupMenu x:Class="BTLPartManagerV"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
||||||
|
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
|
||||||
|
xmlns:dxi="http://schemas.devexpress.com/winfx/2008/xaml/core/internal"
|
||||||
|
xmlns:dxt="http://schemas.devexpress.com/winfx/2008/xaml/core/themekeys"
|
||||||
|
DataContext="{StaticResource BTLPartManagerVM}"
|
||||||
|
Background="{StaticResource Border.BTLPartManager.Background}"
|
||||||
|
BorderBrush="{StaticResource Border.BTLPartManager.Border}"
|
||||||
|
BorderThickness="2"
|
||||||
|
CornerRadius="5"
|
||||||
|
Margin="0"
|
||||||
|
Padding="0">
|
||||||
|
|
||||||
|
<dxb:BarItemMenuHeader ShowContentHeader="False"
|
||||||
|
ItemsOrientation="Horizontal"
|
||||||
|
Margin="0"
|
||||||
|
Padding="0">
|
||||||
|
<dxb:BarButtonItem Command="{Binding CopyPart_Command}"
|
||||||
|
ToolTip="{Binding CopyPart_ToolTip}"
|
||||||
|
IsEnabled="{Binding CopyPart_IsEnabled}"
|
||||||
|
Glyph="/Resources/LeftPanel/CopyPart.png"
|
||||||
|
Style="{StaticResource DropDownButton_BarButtonItem}">
|
||||||
|
<!--<Image Source="{StaticResource CopyPart_Image}"
|
||||||
|
Style="{StaticResource BTLDataWnd_Image}"/>-->
|
||||||
|
</dxb:BarButtonItem>
|
||||||
|
<dxb:BarButtonItem Command="{Binding RemovePart_Command}"
|
||||||
|
ToolTip="{Binding RemovePart_ToolTip}"
|
||||||
|
IsEnabled="{Binding RemovePart_IsEnabled}"
|
||||||
|
Glyph="/Resources/LeftPanel/RemovePart.png"
|
||||||
|
Style="{StaticResource DropDownButton_BarButtonItem}">
|
||||||
|
<!--<Image Source="{StaticResource Remove_Image}"
|
||||||
|
Style="{StaticResource BTLDataWnd_Image}"/>-->
|
||||||
|
</dxb:BarButtonItem>
|
||||||
|
<dxb:BarButtonItem ToolTip="{Binding Simulate_ToolTip}"
|
||||||
|
Command="{Binding Simulate_Command}"
|
||||||
|
IsEnabled="{Binding Simulate_IsEnabled}"
|
||||||
|
Glyph="/Resources/CALCPanel/Simulate.png"
|
||||||
|
Style="{StaticResource DropDownButton_BarButtonItem}">
|
||||||
|
<!--<Image Source="{StaticResource Simulate_Image}"
|
||||||
|
Style="{StaticResource BTLDataWnd_Image}"/>-->
|
||||||
|
</dxb:BarButtonItem>
|
||||||
|
<dxb:BarButtonItem ToolTip="{Binding Edit_ToolTip}"
|
||||||
|
Command="{Binding Edit_Command}"
|
||||||
|
IsEnabled="{Binding Edit_IsEnabled}"
|
||||||
|
Glyph="/Resources/CALCPanel/Edit.png"
|
||||||
|
Style="{StaticResource DropDownButton_BarButtonItem}">
|
||||||
|
<!--<Image Source="{StaticResource Edit_Image}"
|
||||||
|
Style="{StaticResource BTLDataWnd_Image}"/>-->
|
||||||
|
</dxb:BarButtonItem>
|
||||||
|
<dxb:BarButtonItem Command="{Binding ResetCalc_Command}"
|
||||||
|
ToolTip="{Binding ResetCalc_ToolTip}"
|
||||||
|
IsEnabled="{Binding CALCPanel_IsEnabled}"
|
||||||
|
Glyph="/Resources/CALCPanel/ResetCalc.png"
|
||||||
|
Style="{StaticResource DropDownButton_BarButtonItem}">
|
||||||
|
<!--<Image Source="{StaticResource ResetCalc_Image}"
|
||||||
|
Style="{StaticResource BTLDataWnd_Image}"/>-->
|
||||||
|
</dxb:BarButtonItem>
|
||||||
|
</dxb:BarItemMenuHeader>
|
||||||
|
|
||||||
|
</dxb:PopupMenu>
|
||||||
|
<!--<Border x:Class="BTLPartManagerV"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
DataContext="{StaticResource BTLPartManagerVM}"
|
DataContext="{StaticResource BTLPartManagerVM}"
|
||||||
@@ -6,7 +68,6 @@
|
|||||||
|
|
||||||
<StackPanel Style="{StaticResource PartManager_StackPanel}">
|
<StackPanel Style="{StaticResource PartManager_StackPanel}">
|
||||||
<Button Command="{Binding CopyPart_Command}"
|
<Button Command="{Binding CopyPart_Command}"
|
||||||
Click="ClosePopUp_Click"
|
|
||||||
ToolTip="{Binding CopyPart_ToolTip}"
|
ToolTip="{Binding CopyPart_ToolTip}"
|
||||||
IsEnabled="{Binding CopyPart_IsEnabled}"
|
IsEnabled="{Binding CopyPart_IsEnabled}"
|
||||||
Style="{StaticResource LP_Button}">
|
Style="{StaticResource LP_Button}">
|
||||||
@@ -14,7 +75,6 @@
|
|||||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding RemovePart_Command}"
|
<Button Command="{Binding RemovePart_Command}"
|
||||||
Click="ClosePopUp_Click"
|
|
||||||
ToolTip="{Binding RemovePart_ToolTip}"
|
ToolTip="{Binding RemovePart_ToolTip}"
|
||||||
IsEnabled="{Binding RemovePart_IsEnabled}"
|
IsEnabled="{Binding RemovePart_IsEnabled}"
|
||||||
Style="{StaticResource LP_Button}">
|
Style="{StaticResource LP_Button}">
|
||||||
@@ -22,7 +82,6 @@
|
|||||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button ToolTip="{Binding Simulate_ToolTip}"
|
<Button ToolTip="{Binding Simulate_ToolTip}"
|
||||||
Click="ClosePopUp_Click"
|
|
||||||
Command="{Binding Simulate_Command}"
|
Command="{Binding Simulate_Command}"
|
||||||
IsEnabled="{Binding Simulate_IsEnabled}"
|
IsEnabled="{Binding Simulate_IsEnabled}"
|
||||||
Style="{StaticResource LP_Button}">
|
Style="{StaticResource LP_Button}">
|
||||||
@@ -30,7 +89,6 @@
|
|||||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button ToolTip="{Binding Edit_ToolTip}"
|
<Button ToolTip="{Binding Edit_ToolTip}"
|
||||||
Click="ClosePopUp_Click"
|
|
||||||
Command="{Binding Edit_Command}"
|
Command="{Binding Edit_Command}"
|
||||||
IsEnabled="{Binding Edit_IsEnabled}"
|
IsEnabled="{Binding Edit_IsEnabled}"
|
||||||
Style="{StaticResource LP_Button}">
|
Style="{StaticResource LP_Button}">
|
||||||
@@ -38,7 +96,6 @@
|
|||||||
Style="{StaticResource BTLDataWnd_Image}"/>
|
Style="{StaticResource BTLDataWnd_Image}"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="{Binding ResetCalc_Command}"
|
<Button Command="{Binding ResetCalc_Command}"
|
||||||
Click="ClosePopUp_Click"
|
|
||||||
ToolTip="{Binding ResetCalc_ToolTip}"
|
ToolTip="{Binding ResetCalc_ToolTip}"
|
||||||
IsEnabled="{Binding CALCPanel_IsEnabled}"
|
IsEnabled="{Binding CALCPanel_IsEnabled}"
|
||||||
Style="{StaticResource LP_Button}">
|
Style="{StaticResource LP_Button}">
|
||||||
@@ -47,4 +104,4 @@
|
|||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Border>
|
</Border>-->
|
||||||
|
|||||||
@@ -1369,13 +1369,13 @@ Public Class BTLPartVM
|
|||||||
|
|
||||||
Public ReadOnly Property CALC_ROT_Visibility As Visibility
|
Public ReadOnly Property CALC_ROT_Visibility As Visibility
|
||||||
Get
|
Get
|
||||||
Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
|
Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
Public ReadOnly Property CALC_FALL_Visibility As Visibility
|
Public ReadOnly Property CALC_FALL_Visibility As Visibility
|
||||||
Get
|
Get
|
||||||
Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
|
Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
|||||||
@@ -996,6 +996,9 @@
|
|||||||
<PackageReference Include="BouncyCastle">
|
<PackageReference Include="BouncyCastle">
|
||||||
<Version>1.8.5</Version>
|
<Version>1.8.5</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
<PackageReference Include="DevExpress.Wpf">
|
||||||
|
<Version>25.2.5</Version>
|
||||||
|
</PackageReference>
|
||||||
<PackageReference Include="EgwMultiEngineManager.Core">
|
<PackageReference Include="EgwMultiEngineManager.Core">
|
||||||
<Version>3.1.1.2</Version>
|
<Version>3.1.1.2</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,11 @@
|
|||||||
Imports System.Reflection
|
Imports System.IO
|
||||||
|
Imports System.Reflection
|
||||||
|
Imports DevExpress.Data
|
||||||
|
Imports DevExpress.Skins
|
||||||
|
Imports DevExpress.Xpf.Bars
|
||||||
|
Imports DevExpress.Xpf.Core.Serialization
|
||||||
|
Imports DevExpress.Xpf.Grid
|
||||||
|
Imports EgtBEAMWALL.Core
|
||||||
|
|
||||||
Public Class BTLPartListV
|
Public Class BTLPartListV
|
||||||
|
|
||||||
@@ -8,14 +15,127 @@ Public Class BTLPartListV
|
|||||||
Private m_isDraggingSelectionField As FieldInfo
|
Private m_isDraggingSelectionField As FieldInfo
|
||||||
Private m_endDraggingMethod As MethodInfo
|
Private m_endDraggingMethod As MethodInfo
|
||||||
|
|
||||||
|
Private m_sDataGridLayoutPath As String = ""
|
||||||
|
|
||||||
Sub New()
|
Sub New()
|
||||||
' This call is required by the designer.
|
' This call is required by the designer.
|
||||||
InitializeComponent()
|
InitializeComponent()
|
||||||
' Add any initialization after the InitializeComponent() call.
|
' Add any initialization after the InitializeComponent() call.
|
||||||
m_BTLPartListVM = DataContext
|
|
||||||
' Evita il drag sulla selezione multipla
|
' Evita il drag sulla selezione multipla
|
||||||
m_isDraggingSelectionField = m_DataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
|
'm_isDraggingSelectionField = m_DataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
|
||||||
m_endDraggingMethod = m_DataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
|
'm_endDraggingMethod = m_DataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
|
||||||
|
|
||||||
|
m_sDataGridLayoutPath = Path.GetDirectoryName(DataGridColumnsIniFile.m_sDataGridColumnsIniFile) & "\NewDataGridLayoutFile.json"
|
||||||
|
|
||||||
|
For Each Column In BTLPart_GridControl.Columns
|
||||||
|
Column.[AddHandler](DXSerializer.AllowPropertyEvent,
|
||||||
|
New AllowPropertyEventHandler(AddressOf OnAllowProperty))
|
||||||
|
Next
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
' imposto parametri aggiuntivi da scrivere in Json colonne tabella
|
||||||
|
Private Sub OnAllowProperty(ByVal sender As Object, ByVal e As AllowPropertyEventArgs)
|
||||||
|
If e.DependencyProperty Is GridColumn.AllowResizingProperty Then
|
||||||
|
e.Allow = True
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
' salvataggio del layout colonne
|
||||||
|
Public Sub SaveBTLPartGridControlLayout()
|
||||||
|
BTLPart_GridControl.SaveLayoutToJson(m_sDataGridLayoutPath)
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Public Sub IsVisibleGroupSummary(bValue As Boolean)
|
||||||
|
If bValue AndAlso BTLPart_GridControl.GroupSummary.Count = 0 Then
|
||||||
|
BTLPart_GridControl.GroupSummary.Clear()
|
||||||
|
Dim PDNGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nPDN",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Count,
|
||||||
|
.ShowInGroupColumnFooter = "nPDN"}
|
||||||
|
BTLPart_GridControl.GroupSummary.Add(PDNGroupSummaryItem)
|
||||||
|
Dim CNTGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sCNT",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "sCNT"}
|
||||||
|
BTLPart_GridControl.GroupSummary.Add(CNTGroupSummaryItem)
|
||||||
|
Dim ADDEDGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sADDED",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "sADDED"}
|
||||||
|
BTLPart_GridControl.GroupSummary.Add(ADDEDGroupSummaryItem)
|
||||||
|
Dim INPRODGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nINPROD",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "nINPROD"}
|
||||||
|
BTLPart_GridControl.GroupSummary.Add(INPRODGroupSummaryItem)
|
||||||
|
Dim DONEGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nDONE",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "nDONE"}
|
||||||
|
BTLPart_GridControl.GroupSummary.Add(DONEGroupSummaryItem)
|
||||||
|
End If
|
||||||
|
BTLPart_TableView.ShowGroupFooters = bValue
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Public Sub Me_Loaded() Handles Me.Loaded
|
||||||
|
' imposto DataContext
|
||||||
|
m_BTLPartListVM = DataContext
|
||||||
|
' imposto riferimento ad action per salvataggio layout tabella
|
||||||
|
m_BTLPartListVM.refSaveBTLPartGridControlLayout = AddressOf SaveBTLPartGridControlLayout
|
||||||
|
' rispristino layout tabella
|
||||||
|
If Not IsNothing(m_sDataGridLayoutPath) AndAlso File.Exists(m_sDataGridLayoutPath) Then
|
||||||
|
BTLPart_GridControl.RestoreLayoutFromJson(m_sDataGridLayoutPath)
|
||||||
|
End If
|
||||||
|
' da gestire chiamandolo quando viene aperto un progetto o aggiunto/rimosso un btl, per evitare che ci sia il GroupSummary se c'e' un solo gruppo
|
||||||
|
IsVisibleGroupSummary(False)
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
' customizzazione ContextMenu del GridControl
|
||||||
|
Private Sub OnShowGridMenu(sender As Object, e As DevExpress.Xpf.Grid.GridMenuEventArgs)
|
||||||
|
If e.MenuType = GridMenuType.Column Then
|
||||||
|
' rimozione bottoni
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupBox})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupColumn})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.ColumnChooser})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFit})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFitColumns})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.FilterEditor})
|
||||||
|
|
||||||
|
Dim info As GridColumnMenuInfo = CType(e.MenuInfo, GridColumnMenuInfo)
|
||||||
|
Dim item As ColumnBase = CType(info.Column, ColumnBase)
|
||||||
|
' aggiunta separatore
|
||||||
|
Dim separator As BarItemLinkSeparator = New BarItemLinkSeparator()
|
||||||
|
e.Customizations.Add(separator)
|
||||||
|
' aggiunta bottone AllowResize e Auto Fit
|
||||||
|
Dim AllowResize As BarCheckItem = New BarCheckItem() With {.Content = "Allow Resize", .IsChecked = (BTLPart_TableView.AllowResizing AndAlso (item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default))}
|
||||||
|
AddHandler AllowResize.CheckedChanged, AddressOf AllowResize_CheckedChanged
|
||||||
|
e.Customizations.Add(AllowResize)
|
||||||
|
If item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default Then
|
||||||
|
Dim FixAuto As BarButtonItem = New BarCheckItem() With {.Content = "Auto Fit"}
|
||||||
|
AddHandler FixAuto.ItemClick, AddressOf FixAuto_ItemClick
|
||||||
|
e.Customizations.Add(FixAuto)
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
' gestore evento Allow Resize
|
||||||
|
Private Sub AllowResize_CheckedChanged(sender As Object, e As ItemClickEventArgs)
|
||||||
|
Dim info As GridColumnMenuInfo = TryCast(BTLPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
|
||||||
|
Dim item As ColumnBase = CType(info.Column, ColumnBase)
|
||||||
|
If item.AllowResizing = DevExpress.Utils.DefaultBoolean.False Then
|
||||||
|
item.AllowResizing = DevExpress.Utils.DefaultBoolean.True
|
||||||
|
Else
|
||||||
|
item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
' gestore evento Auto Fit
|
||||||
|
Private Sub FixAuto_ItemClick(sender As Object, e As ItemClickEventArgs)
|
||||||
|
Dim info As GridColumnMenuInfo = TryCast(BTLPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
|
||||||
|
Dim item As ColumnBase = CType(info.Column, ColumnBase)
|
||||||
|
item.Width = New GridColumnWidth(1, GridColumnUnitType.Auto)
|
||||||
|
BTLPart_TableView.UpdateLayout()
|
||||||
|
item.Width = item.ActualWidth
|
||||||
|
item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs)
|
Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs)
|
||||||
@@ -115,4 +235,5 @@ Public Class SettingsBtnVerticalOffsetMultiConverter
|
|||||||
Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As Globalization.CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
|
Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As Globalization.CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
|
||||||
Throw New NotImplementedException()
|
Throw New NotImplementedException()
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
@@ -9,6 +9,8 @@ Public Class BTLPartListVM
|
|||||||
|
|
||||||
#Region "FIELDS & PROPERTIES"
|
#Region "FIELDS & PROPERTIES"
|
||||||
|
|
||||||
|
Friend refSaveBTLPartGridControlLayout As Action
|
||||||
|
|
||||||
Private m_colPart_Do As EgwWPFBaseLib.ColumnLayout
|
Private m_colPart_Do As EgwWPFBaseLib.ColumnLayout
|
||||||
Public ReadOnly Property colPart_Do As EgwWPFBaseLib.ColumnLayout
|
Public ReadOnly Property colPart_Do As EgwWPFBaseLib.ColumnLayout
|
||||||
Get
|
Get
|
||||||
@@ -207,6 +209,12 @@ Public Class BTLPartListVM
|
|||||||
|
|
||||||
#End Region ' Constructor
|
#End Region ' Constructor
|
||||||
|
|
||||||
|
Friend Sub Close()
|
||||||
|
If Not IsNothing(refSaveBTLPartGridControlLayout) Then
|
||||||
|
refSaveBTLPartGridControlLayout()
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
Class DataGridCellBorderThicknessConverter
|
Class DataGridCellBorderThicknessConverter
|
||||||
@@ -240,7 +248,7 @@ Class ProjIdToBtlFileName
|
|||||||
Implements IValueConverter
|
Implements IValueConverter
|
||||||
|
|
||||||
Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
|
Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
|
||||||
If TypeOf value IsNot Integer Then Return ""
|
If TypeOf value IsNot String Then Return ""
|
||||||
Dim nProjId As Integer = CInt(value)
|
Dim nProjId As Integer = CInt(value)
|
||||||
Dim ProjModel As EgtBEAMWALL.DataLayer.DatabaseModels.ProjModel = DbControllers.m_ProjController.FindByProjId(nProjId)
|
Dim ProjModel As EgtBEAMWALL.DataLayer.DatabaseModels.ProjModel = DbControllers.m_ProjController.FindByProjId(nProjId)
|
||||||
If IsNothing(ProjModel) Then Return ""
|
If IsNothing(ProjModel) Then Return ""
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,88 @@
|
|||||||
Imports EgtBEAMWALL.Core
|
Imports System.IO
|
||||||
|
Imports DevExpress.Data
|
||||||
|
Imports DevExpress.Xpf.Bars
|
||||||
|
Imports DevExpress.Xpf.Core.Serialization
|
||||||
|
Imports DevExpress.Xpf.Grid
|
||||||
|
Imports EgtBEAMWALL.Core
|
||||||
Imports EgtUILib.EgtInterface
|
Imports EgtUILib.EgtInterface
|
||||||
|
|
||||||
Public Class RawPartListV
|
Public Class RawPartListV
|
||||||
|
|
||||||
|
Private m_RawPartListVM As RawPartListVM
|
||||||
|
|
||||||
|
Private m_sDataGridLayoutPath As String = ""
|
||||||
|
|
||||||
|
Sub New()
|
||||||
|
|
||||||
|
' This call is required by the designer.
|
||||||
|
InitializeComponent()
|
||||||
|
|
||||||
|
' Add any initialization after the InitializeComponent() call.
|
||||||
|
m_sDataGridLayoutPath = Path.GetDirectoryName(DataGridColumnsIniFile.m_sDataGridColumnsIniFile) & "\NewDataGridLayoutFile2.json"
|
||||||
|
|
||||||
|
For Each Column In RawPart_GridControl.Columns
|
||||||
|
Column.[AddHandler](DXSerializer.AllowPropertyEvent,
|
||||||
|
New AllowPropertyEventHandler(AddressOf OnAllowProperty))
|
||||||
|
Next
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
' imposto parametri aggiuntivi da scrivere in Json colonne tabella
|
||||||
|
Private Sub OnAllowProperty(ByVal sender As Object, ByVal e As AllowPropertyEventArgs)
|
||||||
|
If e.DependencyProperty Is GridColumn.AllowResizingProperty Then
|
||||||
|
e.Allow = True
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
' salvataggio del layout colonne
|
||||||
|
Public Sub SaveBTLPartGridControlLayout()
|
||||||
|
RawPart_GridControl.SaveLayoutToJson(m_sDataGridLayoutPath)
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Public Sub Me_Loaded() Handles Me.Loaded
|
||||||
|
' imposto DataContext
|
||||||
|
m_RawPartListVM = DataContext
|
||||||
|
' imposto riferimento ad action per salvataggio layout tabella
|
||||||
|
m_RawPartListVM.refSaveBTLPartGridControlLayout = AddressOf SaveBTLPartGridControlLayout
|
||||||
|
' rispristino layout tabella
|
||||||
|
If Not IsNothing(m_sDataGridLayoutPath) AndAlso File.Exists(m_sDataGridLayoutPath) Then
|
||||||
|
RawPart_GridControl.RestoreLayoutFromJson(m_sDataGridLayoutPath)
|
||||||
|
End If
|
||||||
|
' da gestire chiamandolo quando viene aperto un progetto o aggiunto/rimosso un btl, per evitare che ci sia il GroupSummary se c'e' un solo gruppo
|
||||||
|
IsVisibleGroupSummary(False)
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Public Sub IsVisibleGroupSummary(bValue As Boolean)
|
||||||
|
If bValue AndAlso RawPart_GridControl.GroupSummary.Count = 0 Then
|
||||||
|
RawPart_GridControl.GroupSummary.Clear()
|
||||||
|
Dim PDNGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nPDN",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Count,
|
||||||
|
.ShowInGroupColumnFooter = "nPDN"}
|
||||||
|
RawPart_GridControl.GroupSummary.Add(PDNGroupSummaryItem)
|
||||||
|
Dim CNTGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sCNT",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "sCNT"}
|
||||||
|
RawPart_GridControl.GroupSummary.Add(CNTGroupSummaryItem)
|
||||||
|
Dim ADDEDGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sADDED",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "sADDED"}
|
||||||
|
RawPart_GridControl.GroupSummary.Add(ADDEDGroupSummaryItem)
|
||||||
|
Dim INPRODGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nINPROD",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "nINPROD"}
|
||||||
|
RawPart_GridControl.GroupSummary.Add(INPRODGroupSummaryItem)
|
||||||
|
Dim DONEGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nDONE",
|
||||||
|
.DisplayFormat = "{0}",
|
||||||
|
.SummaryType = SummaryItemType.Sum,
|
||||||
|
.ShowInGroupColumnFooter = "nDONE"}
|
||||||
|
RawPart_GridControl.GroupSummary.Add(DONEGroupSummaryItem)
|
||||||
|
End If
|
||||||
|
RawPart_TableView.ShowGroupFooters = bValue
|
||||||
|
End Sub
|
||||||
|
|
||||||
' funzione che permette di selezionare un RawPart anche quando gia' selezionato
|
' funzione che permette di selezionare un RawPart anche quando gia' selezionato
|
||||||
Private Sub RawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
|
Private Sub RawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
|
||||||
If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Map.refProjectVM.BTLStructureVM.SelBTLPart.SetOpenFeatureList(False)
|
If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Map.refProjectVM.BTLStructureVM.SelBTLPart.SetOpenFeatureList(False)
|
||||||
@@ -81,4 +161,52 @@ Public Class RawPartListV
|
|||||||
.Source = sender})
|
.Source = sender})
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
' customizzazione ContextMenu del GridControl
|
||||||
|
Private Sub OnShowGridMenu(sender As Object, e As DevExpress.Xpf.Grid.GridMenuEventArgs)
|
||||||
|
If e.MenuType = GridMenuType.Column Then
|
||||||
|
' rimozione bottoni
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupBox})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupColumn})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.ColumnChooser})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFit})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFitColumns})
|
||||||
|
e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.FilterEditor})
|
||||||
|
|
||||||
|
Dim info As GridColumnMenuInfo = CType(e.MenuInfo, GridColumnMenuInfo)
|
||||||
|
Dim item As ColumnBase = CType(info.Column, ColumnBase)
|
||||||
|
' aggiunta separatore
|
||||||
|
Dim separator As BarItemLinkSeparator = New BarItemLinkSeparator()
|
||||||
|
e.Customizations.Add(separator)
|
||||||
|
' aggiunta bottone AllowResize e Auto Fit
|
||||||
|
Dim AllowResize As BarCheckItem = New BarCheckItem() With {.Content = "Allow Resize", .IsChecked = (RawPart_TableView.AllowResizing AndAlso (item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default))}
|
||||||
|
AddHandler AllowResize.CheckedChanged, AddressOf AllowResize_CheckedChanged
|
||||||
|
e.Customizations.Add(AllowResize)
|
||||||
|
If item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default Then
|
||||||
|
Dim FixAuto As BarButtonItem = New BarCheckItem() With {.Content = "Auto Fit"}
|
||||||
|
AddHandler FixAuto.ItemClick, AddressOf FixAuto_ItemClick
|
||||||
|
e.Customizations.Add(FixAuto)
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
' gestore evento Allow Resize
|
||||||
|
Private Sub AllowResize_CheckedChanged(sender As Object, e As ItemClickEventArgs)
|
||||||
|
Dim info As GridColumnMenuInfo = TryCast(RawPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
|
||||||
|
Dim item As ColumnBase = CType(info.Column, ColumnBase)
|
||||||
|
If item.AllowResizing = DevExpress.Utils.DefaultBoolean.False Then
|
||||||
|
item.AllowResizing = DevExpress.Utils.DefaultBoolean.True
|
||||||
|
Else
|
||||||
|
item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
' gestore evento Auto Fit
|
||||||
|
Private Sub FixAuto_ItemClick(sender As Object, e As ItemClickEventArgs)
|
||||||
|
Dim info As GridColumnMenuInfo = TryCast(RawPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
|
||||||
|
Dim item As ColumnBase = CType(info.Column, ColumnBase)
|
||||||
|
item.Width = New GridColumnWidth(1, GridColumnUnitType.Auto)
|
||||||
|
RawPart_TableView.UpdateLayout()
|
||||||
|
item.Width = item.ActualWidth
|
||||||
|
item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
|
||||||
|
End Sub
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ Public Class RawPartListVM
|
|||||||
|
|
||||||
#Region "FIELDS & PROPERTIES"
|
#Region "FIELDS & PROPERTIES"
|
||||||
|
|
||||||
|
Friend refSaveBTLPartGridControlLayout As Action
|
||||||
|
|
||||||
Private m_colRawPart_StartCut As EgwWPFBaseLib.ColumnLayout
|
Private m_colRawPart_StartCut As EgwWPFBaseLib.ColumnLayout
|
||||||
Public ReadOnly Property colRawPart_StartCut As EgwWPFBaseLib.ColumnLayout
|
Public ReadOnly Property colRawPart_StartCut As EgwWPFBaseLib.ColumnLayout
|
||||||
Get
|
Get
|
||||||
@@ -248,6 +250,12 @@ Public Class RawPartListVM
|
|||||||
m_colPartInRawPart_PosY = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_POSY)
|
m_colPartInRawPart_PosY = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_POSY)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Friend Sub Close()
|
||||||
|
If Not IsNothing(refSaveBTLPartGridControlLayout) Then
|
||||||
|
refSaveBTLPartGridControlLayout()
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
#End Region ' Methods
|
#End Region ' Methods
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -427,6 +427,9 @@ Public Class MainWindowVM
|
|||||||
{S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
|
{S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
|
||||||
{S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
|
{S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
|
||||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
|
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
|
||||||
|
Map.refPartListVM.Close()
|
||||||
|
Map.refRawPartListVM.Close()
|
||||||
|
|
||||||
End If
|
End If
|
||||||
' Termino il Model
|
' Termino il Model
|
||||||
m_MainWindowM.Close()
|
m_MainWindowM.Close()
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
|
||||||
xmlns:EgtBEAMWALLCore="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
|
xmlns:EgtBEAMWALLCore="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
|
||||||
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
|
||||||
|
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
|
||||||
xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
|
xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
|
||||||
|
|
||||||
<!--#region Panel ViewModel-->
|
<!--#region Panel ViewModel-->
|
||||||
@@ -835,6 +836,14 @@
|
|||||||
<Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
|
<Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
|
<Style x:Key="DropDownButton_BarButtonItem" TargetType="{x:Type dxb:BarButtonItem}">
|
||||||
|
<Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
|
||||||
|
<Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0.5"/>
|
||||||
|
<Setter Property="CornerRadius" Value="3"/>
|
||||||
|
<Setter Property="GlyphSize" Value="Medium"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="MacroFeaturen_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
|
<Style x:Key="MacroFeaturen_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
|
||||||
<Setter Property="HorizontalAlignment" Value="Right"/>
|
<Setter Property="HorizontalAlignment" Value="Right"/>
|
||||||
<Setter Property="Margin" Value="2.5,2.5,10,2.5"/>
|
<Setter Property="Margin" Value="2.5,2.5,10,2.5"/>
|
||||||
@@ -2560,7 +2569,7 @@
|
|||||||
<Setter Property="Background" Value="{DynamicResource Border.BTLPartManager.Background}"/>
|
<Setter Property="Background" Value="{DynamicResource Border.BTLPartManager.Background}"/>
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource Border.BTLPartManager.Border}"/>
|
<Setter Property="BorderBrush" Value="{DynamicResource Border.BTLPartManager.Border}"/>
|
||||||
<Setter Property="CornerRadius" Value="5"/>
|
<Setter Property="CornerRadius" Value="5"/>
|
||||||
<Setter Property="BorderThickness" Value="2"/>
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="SetUp_Border" TargetType="{x:Type Border}">
|
<Style x:Key="SetUp_Border" TargetType="{x:Type Border}">
|
||||||
|
|||||||
Reference in New Issue
Block a user