Egalware/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Icarus 2.4i2 :

Browse Source 
- piccole modifiche per togliere warning di compilazione
- aggiunta icona standard Egaltech.
This commit is contained in:
DarioS
2022-09-14 06:21:25 +02:00
parent ffebc08a20
commit e65174209d
15 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Icarus/Icarus.vbproj
+6 -3
View File
@@ -46,6 +46,9 @@
<PlatformTarget>x64</PlatformTarget>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Icarus.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="EgtUILib, Version=2.4.7.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -55,8 +58,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
</Reference>
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<HintPath>packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
<Reference Include="Ionic.Zip">
<HintPath>..\..\..\EgtProg\Icarus\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
@@ -437,7 +440,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\EgtBEAMWALL.ico" />
<Resource Include="Resources\Icarus.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\ProjectManager\ExportProject.png" />
Icarus/ImportPanel/ImportUtility.vb
+2
View File
@@ -74,6 +74,8 @@ Public Class GeomEntity
Return "┴"
Case ChooseReferenceWndVM.References.MC
Return "┼"
Case Else
Return "X"
End Select
End Get
End Property
Icarus/MachSaveInDbWnd/MachSaveInDbWindowV.xaml
+1 -1
View File
@@ -6,7 +6,7 @@
Title="Machining Param Name"
Height="150" Width="300"
WindowStartupLocation="CenterOwner"
Icon="/Resources/EgtBEAMWALL.ico"
Icon="/Resources/Icarus.ico"
WindowStyle="None" ResizeMode="NoResize"
ShowInTaskbar="False"
IsMinimizable="False">
Icarus/MainWindow/MainWindowV.xaml
+1 -1
View File
@@ -4,7 +4,7 @@
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:PrintApp="clr-namespace:Icarus"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
Title="{Binding sTitle}" Icon="/Resources/EgtBEAMWALL.ico"
Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
MinHeight="600" MinWidth="800"
AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize"
AllowDrop="True" Drop="MainWindowV_Drop"
Icarus/MainWindow/MainWindowVM.vb
+2 -1
View File
@@ -42,6 +42,7 @@ Public Class MainWindowVM
Public Property nSelTabPage As Integer
Get
' Return If(IsNothing(Map.refMainMenuVM.SelPage) OrElse Map.refMainMenuVM.SelPage = -1 OrElse Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.MACHINING, 0, 1)
Return -1
End Get
Set(value As Integer)
End Set
@@ -110,7 +111,7 @@ Public Class MainWindowVM
Friend Sub ContentRendered()
Map.refTopPanelVM.SelPage = Pages.NULL
'DbControllers.Init()
''' chiamata a caso su Db per inizializzarlo
'' chiamata a caso su Db per inizializzarlo
'DbControllers.m_ProjController.FindByProjDbId(0)
'' Verifico che l'inizializzazione di tutte le parti del programma sia andata a buon fine
'If Map.EndInit() Then
Icarus/My Project/AssemblyInfo.vb
+3 -3
View File
@@ -13,7 +13,7 @@ Imports System.Windows
<Assembly: AssemblyTitle("Icarus")>
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyCompany("Egalware s.r.l.")>
<Assembly: AssemblyProduct("Icarus")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("")>
@@ -55,5 +55,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("2.4.9.2")>
<Assembly: AssemblyFileVersion("2.4.9.2")>
Icarus/ReferencePanel/ReferencePanelVM.vb
+2
View File
@@ -129,6 +129,8 @@ Public Class ReferenceBtn
Return "┴"
Case References.MC
Return "┼"
Case Else
Return "X"
End Select
End Get
End Property
Icarus/Resources/EgtBEAMWALL.ico → Icarus/Resources/Icarus.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Icarus/RibPanel/RibPanelVM.vb
+1
View File
@@ -478,6 +478,7 @@ Public Class RibPanelVM
EgtSelectObj(m_SelRib.nExtrusionId)
End Select
EgtDraw()
Return True
End Function
Friend Sub UpdateUi()
Icarus/SceneHost/MySceneHostVM.vb
+4 -4
View File
@@ -202,7 +202,7 @@ Public Class MySceneHostVM
MainScene.SetGridCursorPos(True)
' modo di visualizzazione
Dim nShowMode As Integer = GetMainPrivateProfileInt(S_SCENE, K_SHOWMODE, SM.SHADING)
'''Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
'Map.refShowPanelVM.SetShowMode(DirectCast(nShowMode, SM))
' visualizzazione avanzata dei triangoli costituenti le superfici
Dim bShowTriaAdv As Boolean = (GetMainPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1) <> 0)
EgtSetShowTriaAdv(bShowTriaAdv)
@@ -216,9 +216,9 @@ Public Class MySceneHostVM
MainScene.SetSnapPointType(SP.PT_SKETCH)
' visualizzazione assemblato
Dim nShowBuilding As Boolean = GetMainPrivateProfileInt(S_SCENE, K_SHOWBUILDING, 0) <> 0
'''Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding)
'Map.refShowBeamPanelVM.SetShowBuilding(nShowBuilding)
' nascondo input box
'''Map.refFreeContourInputVM.ResetInputBox()
'Map.refFreeContourInputVM.ResetInputBox()
End Sub
Friend Sub EmitTitle()
@@ -393,7 +393,7 @@ Public Class MySceneHostVM
MainScene.SetStatusNull()
End Sub
Friend Sub ExecScript(sFilePath As String)
Friend Shadows Sub ExecScript(sFilePath As String)
If String.IsNullOrEmpty(sFilePath) Then
Dim sDir As String = String.Empty
'GetMainPrivateProfileString(S_GENERAL, K_LASTLUADIR, "", sDir)
Icarus/SecondaryWindow/SecondaryWindowV.xaml
+1 -1
View File
@@ -4,7 +4,7 @@
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
xmlns:PrintApp="clr-namespace:Icarus"
Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
Title="{Binding sTitle}" Icon="/Resources/EgtBEAMWALL.ico"
Title="{Binding sTitle}" Icon="/Resources/Icarus.ico"
WindowStyle="None" ResizeMode="NoResize"
ShowInTaskbar="False"
AllowsTransparency="True"
Icarus/SimulationPanel/SimulationPanelVM.vb
+1 -1
View File
@@ -219,7 +219,7 @@ Public Class SimulationPanelVM
' Return False
' End If
'End If
'Return True
Return True
End Function
Friend Sub ExitSimulation()
Icarus/SliceManager/SliceManagerVM.vb
+1
View File
@@ -118,6 +118,7 @@ Public Class SliceManagerVM
'Else
' Return 0
'End If
Return 0
End Function
Friend Function CalcSlice(bSlice As Boolean, bCalcTFS As Boolean, bGenerate As Boolean) As Boolean
Icarus/StartMachPanel/StartMachPanelVM.vb
+1
View File
@@ -348,6 +348,7 @@ Public Class StartMachPanelVM
' seleziono percorso corrente
EgtDeselectAll()
EgtSelectObj(m_SelStart.nId)
Return True
End Function
Friend Sub UpdateUi()
Icarus/Utility/CurrentMachine.vb
-1
View File
@@ -1,6 +1,5 @@
Imports System.Collections.ObjectModel
Imports System.IO
Imports EgtBEAMWALL.Core
Imports EgtUILib
Imports EgtWPFLib5