Merge commit 'cc04872cc1a5df9f94710b8c8d5fcf75eac4bb2f' into develop

This commit is contained in:
Emmanuele Sassi
2022-03-16 14:42:10 +01:00
7 changed files with 12 additions and 2 deletions
@@ -553,6 +553,9 @@
<ItemGroup>
<Resource Include="Resources\ProjectManager\Open.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\ProjectManager\Save.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -16,7 +16,6 @@
CanUserAddRows="False"
AutoGenerateColumns="False"
CanUserSortColumns="False"
CanUserResizeColumns="False"
CanUserResizeRows="False"
CanUserReorderColumns="False"
SelectionMode="Single"
@@ -163,6 +163,9 @@ Public Class PartInRawPartListVM
For Each col In PartInRawPartColumns
col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
Next
If Not IsNothing(colPartInRawPart_Redo) Then
colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
End If
If Not IsNothing(m_colPartInRawPart_Rot) Then
m_colPartInRawPart_Rot.ColumnVisibility = Visibility.Collapsed
End If
@@ -194,6 +197,9 @@ Public Class PartInRawPartListVM
For Each col In PartInRawPartColumns
col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
Next
If Not IsNothing(colPartInRawPart_Redo) Then
colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
End If
If Not IsNothing(m_colPartInRawPart_Offset) Then
m_colPartInRawPart_Offset.ColumnVisibility = Visibility.Collapsed
End If
@@ -25,7 +25,7 @@ Public Class OutputsPageVM
Sub New()
'' imposto riferimento in Map
'Map.SetRefOutputsPageVM(Me)
m_OutputVariableListVM = New VariablesListVM(S_outPUTVARIABLES)
m_OutputVariableListVM = New VariablesListVM(S_OUTPUTVARIABLES)
End Sub
#End Region ' Constructor
Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

@@ -779,6 +779,7 @@ Public Class CALCPanelVM
End Select
TempBarList.Add(Bar)
Next
If TempBarList.Count = 0 Then Return
BarList = TempBarList.ToArray()
' disabilito interfaccia
Map.refProjectVM.SetCalcRunning(True)
@@ -273,6 +273,7 @@ Public Class OptimizePanelVM
End If
NotifyPropertyChanged(NameOf(OriginTypeList))
NotifyPropertyChanged(NameOf(OriginType_Visibility))
NotifyPropertyChanged(NameOf(SelOriginType))
End Sub
#End Region ' METHODS