diff --git a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb
index 7ee72ba..42fc809 100644
--- a/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb
+++ b/Icarus/AboutBoxWindow/AboutBoxV.xaml.vb
@@ -20,13 +20,21 @@ Public Class AboutBoxV
if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "")
sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
- " (" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & ")" & Environment.NewLine
+ " Inst" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() &
+ " Ulv" & Map.refMainWindowVM.MainWindowM.nUserLevel.ToString() &
+ " Dbg" & Map.refMainWindowVM.MainWindowM.DebugLevel().ToString() & Environment.NewLine
sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
+ Dim sOpSys As String = String.Empty
+ EgtGetOsInfo( sOpSys)
+ sInfo &= sOpSys & Environment.NewLine
Dim sCPU As String = String.Empty
EgtGetCpuInfo( sCPU)
sInfo &= sCPU & Environment.NewLine
+ Dim sMem As String = String.Empty
+ EgtGetMemoryInfo( sMem)
+ sInfo &= sMem & Environment.NewLine
Dim sScene As String = String.Empty
EgtGetSceneInfo(sScene)
sInfo &= sScene
diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj
index 6fb16d6..90c8b6d 100644
--- a/Icarus/Icarus.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -49,6 +49,9 @@
Resources\Icarus.ico
+
+ app.manifest
+
False
@@ -83,6 +86,9 @@
MSBuild:Compile
Designer
+
+ AboutBoxV.xaml
+
ChooseReferenceWndV.xaml
@@ -236,6 +242,10 @@
ViewPanelV.xaml
+
+ MSBuild:Compile
+ Designer
+
Designer
MSBuild:Compile
@@ -428,6 +438,7 @@
Resources.Designer.vb
My.Resources
+
SettingsSingleFileGenerator
Settings.Designer.vb
@@ -549,6 +560,9 @@
+
+
+
IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR64.exe
diff --git a/Icarus/MainWindow/MainWindowM.vb b/Icarus/MainWindow/MainWindowM.vb
index 870a524..adf5a64 100644
--- a/Icarus/MainWindow/MainWindowM.vb
+++ b/Icarus/MainWindow/MainWindowM.vb
@@ -10,6 +10,8 @@ Public Class MainWindowM
' massimo numero di istanze del programma ammesse
Const MAX_INST As Integer = 32
+ Private m_objMutex As Mutex
+
Private m_sDataRoot As String = String.Empty
Friend ReadOnly Property sDataRoot As String
Get
@@ -32,8 +34,11 @@ Public Class MainWindowM
End Property
Private m_nDebug As Integer = 0
-
- Private m_objMutex As Mutex
+ Public ReadOnly Property DebugLevel As Integer
+ Get
+ Return m_nDebug
+ End Get
+ End Property
Private m_bFirstInstance As Boolean = False
Friend ReadOnly Property bFirstInstance As Boolean
diff --git a/Icarus/MainWindow/MainWindowV.xaml b/Icarus/MainWindow/MainWindowV.xaml
index bbb5a95..d3eb8a2 100644
--- a/Icarus/MainWindow/MainWindowV.xaml
+++ b/Icarus/MainWindow/MainWindowV.xaml
@@ -5,8 +5,7 @@
xmlns:PrintApp="clr-namespace:Icarus"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
- MinHeight="600" MinWidth="800"
- AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
+ MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
AllowDrop="True" Drop="MainWindowV_Drop"
ShowInTaskbar="True"
Topmost="False"
diff --git a/Icarus/MainWindow/MainWindowVM.vb b/Icarus/MainWindow/MainWindowVM.vb
index de4b95e..3d63a17 100644
--- a/Icarus/MainWindow/MainWindowVM.vb
+++ b/Icarus/MainWindow/MainWindowVM.vb
@@ -239,27 +239,6 @@ Public Class MainWindowVM
'#Region "COMMANDS"
- '#Region "AboutBoxCommand"
-
- ' ' Returns a command that manage the MainWindow_Unloaded command
- ' Public ReadOnly Property AboutBoxCommand() As ICommand
- ' Get
- ' If m_cmdAboutBox Is Nothing Then
- ' m_cmdAboutBox = New Command(AddressOf AboutBox)
- ' End If
- ' Return m_cmdAboutBox
- ' End Get
- ' End Property
-
- ' ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
- ' Public Sub AboutBox(ByVal param As Object)
- ' Dim AboutBoxWindow As New AboutBoxV
- ' AboutBoxWindow.Owner = Application.Current.MainWindow
- ' AboutBoxWindow.ShowDialog()
- ' End Sub
-
- '#End Region ' AboutBoxCommand
-
'#Region "CloseApplicationCommand"
' ' Returns a command that manage the MainWindow_Unloaded command
diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb
index 2f8c643..1c6fbd8 100644
--- a/Icarus/My Project/AssemblyInfo.vb
+++ b/Icarus/My Project/AssemblyInfo.vb
@@ -11,11 +11,16 @@ Imports System.Windows
' Review the values of the assembly attributes
-
-
+#If DEBUG Then
+
+
+#Else
+
+
+#End If
-
+
diff --git a/Icarus/Resources/Icarus.old.ico b/Icarus/Resources/Icarus.old.ico
deleted file mode 100644
index 49429c5..0000000
Binary files a/Icarus/Resources/Icarus.old.ico and /dev/null differ
diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
index bb95f93..c030ac0 100644
--- a/Icarus/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -292,6 +292,9 @@ Public Class MySceneHostVM
End If
Dim OpenFileDialog As New OpenFileDialog With {.Title = "Insert",
.Filter = "Stereolithography (*.stl)|*.stl" &
+ "|Iges files (*.igs;*.iges)|*.igs;*.iges" &
+ "|Step files (*.stp;*.step)|*.stp;*.step" &
+ "|3D Manufacturing format (*.3mf)|*.3mf" &
"|New geometry EgalTech(*.nge)|*.nge" &
"|All Files (*.*)|*.*",
.FilterIndex = 1,
diff --git a/Icarus/SecondaryWindow/SecondaryWindowV.xaml b/Icarus/SecondaryWindow/SecondaryWindowV.xaml
index 961c8a1..12f614d 100644
--- a/Icarus/SecondaryWindow/SecondaryWindowV.xaml
+++ b/Icarus/SecondaryWindow/SecondaryWindowV.xaml
@@ -9,7 +9,7 @@
ShowInTaskbar="False"
AllowsTransparency="True"
Background="Transparent"
-
+ AboutBoxCommand="{Binding AboutBoxCommand}"
CloseCommand="{Binding CloseApplicationCommand,
Mode=OneWay,
UpdateSourceTrigger=PropertyChanged}"
diff --git a/Icarus/SecondaryWindow/SecondaryWindowVM.vb b/Icarus/SecondaryWindow/SecondaryWindowVM.vb
index 5ead758..164a7d3 100644
--- a/Icarus/SecondaryWindow/SecondaryWindowVM.vb
+++ b/Icarus/SecondaryWindow/SecondaryWindowVM.vb
@@ -66,6 +66,27 @@ Public Class SecondaryWindowVM
#Region "COMMANDS"
+#Region "AboutBoxCommand"
+
+ ' Returns a command that manage the MainWindow_Unloaded command
+ Public ReadOnly Property AboutBoxCommand() As ICommand
+ Get
+ If m_cmdAboutBox Is Nothing Then
+ m_cmdAboutBox = New Command(AddressOf AboutBox)
+ End If
+ Return m_cmdAboutBox
+ End Get
+ End Property
+
+ ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
+ Public Sub AboutBox(ByVal param As Object)
+ Dim AboutBoxWindow As New AboutBoxV
+ AboutBoxWindow.Owner = Application.Current.MainWindow
+ AboutBoxWindow.ShowDialog()
+ End Sub
+
+#End Region ' AboutBoxCommand
+
#Region "CloseApplicationCommand"
' Returns a command that manage the MainWindow_Unloaded command
diff --git a/Icarus/app.manifest b/Icarus/app.manifest
new file mode 100644
index 0000000..d975bb4
--- /dev/null
+++ b/Icarus/app.manifest
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+