Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f82a6495bd | |||
| c6262613c8 | |||
| 31edd150bd | |||
| 9fdd7b4b77 | |||
| b0bae3af98 | |||
| 235ec10a2d | |||
| 66061ad262 | |||
| 3e99eb1a8f | |||
| 753ff7b4f1 | |||
| 1edfe486cb | |||
| 7190993f11 | |||
| 249289144f |
@@ -29,9 +29,17 @@ Public Class CurrMachWindowVM
|
||||
m_SelCurrSawing = value
|
||||
End If
|
||||
CurrentMachine.sCurrSawing = m_SelCurrSawing
|
||||
' salvo la lvorazione corrente
|
||||
WritePrivateProfileString(S_MACH_MACH, K_CURRSAWING_OFFICE, m_SelCurrSawing, sMachIniFile)
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public Sub SetCurrSawing(sCurrOfficeSawing As String)
|
||||
m_SelCurrSawing = sCurrOfficeSawing
|
||||
CurrentMachine.sCurrSawing = m_SelCurrSawing
|
||||
NotifyPropertyChanged("SelCurrSawing")
|
||||
End Sub
|
||||
|
||||
Public ReadOnly Property CurrSawing_Visibility As Visibility
|
||||
Get
|
||||
If EgtGetHeadId("H1") = GDB_ID.NULL Then
|
||||
@@ -149,10 +157,18 @@ Public Class CurrMachWindowVM
|
||||
If value <> m_SelCurrDrilling Then
|
||||
m_SelCurrDrilling = value
|
||||
CurrentMachine.sCurrDrilling = m_SelCurrDrilling
|
||||
' salvo la lvorazione corrente
|
||||
WritePrivateProfileString(S_MACH_MACH, K_CURRDRILLING_OFFICE, m_SelCurrDrilling, sMachIniFile)
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public Sub SetCurrDrilling(sCurrOfficeDrilling As String)
|
||||
m_SelCurrDrilling = sCurrOfficeDrilling
|
||||
CurrentMachine.sCurrDrilling = m_SelCurrDrilling
|
||||
NotifyPropertyChanged("SelCurrDrilling")
|
||||
End Sub
|
||||
|
||||
Private m_CurrDrilling_Visibility As Visibility
|
||||
Public Property CurrDrilling_Visibility As Visibility
|
||||
Get
|
||||
@@ -187,10 +203,18 @@ Public Class CurrMachWindowVM
|
||||
If value <> m_SelCurrMilling Then
|
||||
m_SelCurrMilling = value
|
||||
CurrentMachine.sCurrMilling = m_SelCurrMilling
|
||||
' salvo la lvorazione corrente
|
||||
WritePrivateProfileString(S_MACH_MACH, K_CURRMILLING_OFFICE, m_SelCurrMilling, sMachIniFile)
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public Sub SetCurrMilling(sCurrOfficeMilling As String)
|
||||
m_SelCurrMilling = sCurrOfficeMilling
|
||||
CurrentMachine.sCurrMilling = m_SelCurrMilling
|
||||
NotifyPropertyChanged("SelCurrMilling")
|
||||
End Sub
|
||||
|
||||
Private m_CurrMilling_Visibility As Visibility
|
||||
Public Property CurrMilling_Visibility As Visibility
|
||||
Get
|
||||
@@ -225,10 +249,18 @@ Public Class CurrMachWindowVM
|
||||
If value <> m_SelCurrPocketing Then
|
||||
m_SelCurrPocketing = value
|
||||
CurrentMachine.sCurrPocketing = m_SelCurrPocketing
|
||||
' salvo la lvorazione corrente
|
||||
WritePrivateProfileString(S_MACH_MACH, K_CURRPOCKETING_OFFICE, m_SelCurrPocketing, sMachIniFile)
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public Sub SetCurrPocketing(sCurrOfficePocketing As String)
|
||||
m_SelCurrPocketing = sCurrOfficePocketing
|
||||
CurrentMachine.sCurrPocketing = m_SelCurrPocketing
|
||||
NotifyPropertyChanged("SelCurrPocketing")
|
||||
End Sub
|
||||
|
||||
Private m_CurrPocketing_Visibility As Visibility
|
||||
Public Property CurrPocketing_Visibility As Visibility
|
||||
Get
|
||||
@@ -263,10 +295,18 @@ Public Class CurrMachWindowVM
|
||||
If value <> m_SelCurrWaterjetting Then
|
||||
m_SelCurrWaterjetting = value
|
||||
CurrentMachine.sCurrWaterJetting = m_SelCurrWaterjetting
|
||||
' salvo la lvorazione corrente
|
||||
WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING_OFFICE, m_SelCurrWaterjetting, sMachIniFile)
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public Sub SetCurrWaterjetting(sCurrOfficeWaterjetting As String)
|
||||
m_SelCurrWaterjetting = sCurrOfficeWaterjetting
|
||||
CurrentMachine.sCurrWaterJetting = m_SelCurrWaterjetting
|
||||
NotifyPropertyChanged("SelCurrWaterjetting")
|
||||
End Sub
|
||||
|
||||
Private m_CurrWaterjettingQualityList As New List(Of String)
|
||||
Public Property CurrWaterjettingQualityList As List(Of String)
|
||||
Get
|
||||
@@ -286,10 +326,18 @@ Public Class CurrMachWindowVM
|
||||
If value <> m_SelCurrWaterjettingQuality Then
|
||||
m_SelCurrWaterjettingQuality = value
|
||||
CurrentMachine.sCurrWaterJettingQuality = m_SelCurrWaterjettingQuality
|
||||
' salvo la lvorazione corrente
|
||||
WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY_OFFICE, m_SelCurrWaterjettingQuality, sMachIniFile)
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public Sub SetCurrWaterjettingQuality(sCurrOfficeWaterjettingQuality As String)
|
||||
m_SelCurrWaterjettingQuality = sCurrOfficeWaterjettingQuality
|
||||
CurrentMachine.sCurrWaterJettingQuality = m_SelCurrWaterjettingQuality
|
||||
NotifyPropertyChanged("SelCurrWaterjetting")
|
||||
End Sub
|
||||
|
||||
Private m_CurrWaterjetting_Visibility As Visibility = Visibility.Collapsed
|
||||
Public Property CurrWaterjetting_Visibility As Visibility
|
||||
Get
|
||||
@@ -472,11 +520,13 @@ Public Class CurrMachWindowVM
|
||||
|
||||
If m_CurrSawingList.Count > 0 Then
|
||||
If CurrentMachine.sCurrSawing <> String.Empty Then
|
||||
SelCurrSawing = CurrentMachine.sCurrSawing
|
||||
SetCurrSawing(CurrentMachine.sCurrSawing)
|
||||
Else
|
||||
Dim sCurrSawing As String = ""
|
||||
GetPrivateProfileString(S_MACH_MACH, K_CURRSAWING, Nothing, sCurrSawing, sMachIniFile)
|
||||
SelCurrSawing = sCurrSawing
|
||||
' GetPrivateProfileString(S_MACH_MACH, K_CURRSAWING, Nothing, sCurrSawing, sMachIniFile)
|
||||
GetPrivateProfileString(S_MACH_MACH, K_CURRSAWING_OFFICE, Nothing, sCurrSawing, sMachIniFile)
|
||||
'SelCurrSawing = sCurrSawing
|
||||
SetCurrSawing(sCurrSawing)
|
||||
End If
|
||||
Else
|
||||
CurrentMachine.sCurrSawing = String.Empty
|
||||
@@ -486,7 +536,11 @@ Public Class CurrMachWindowVM
|
||||
If CurrentMachine.bDrilling And m_CurrDrillingList.Count > 1 Then
|
||||
CurrDrilling_Visibility = Visibility.Visible
|
||||
If CurrentMachine.sCurrDrilling <> String.Empty Then
|
||||
SelCurrDrilling = CurrentMachine.sCurrDrilling
|
||||
SetCurrDrilling(CurrentMachine.sCurrDrilling)
|
||||
Else
|
||||
Dim sCurrMachining As String = ""
|
||||
GetPrivateProfileString(S_MACH_MACH, K_CURRDRILLING_OFFICE, Nothing, sCurrMachining, sMachIniFile)
|
||||
SetCurrDrilling(sCurrMachining)
|
||||
End If
|
||||
Else
|
||||
CurrDrilling_Visibility = Visibility.Collapsed
|
||||
@@ -495,7 +549,11 @@ Public Class CurrMachWindowVM
|
||||
If CurrentMachine.bMilling And m_CurrMillingList.Count > 1 Then
|
||||
CurrMilling_Visibility = Visibility.Visible
|
||||
If CurrentMachine.sCurrMilling <> String.Empty Then
|
||||
SelCurrMilling = CurrentMachine.sCurrMilling
|
||||
SetCurrMilling(CurrentMachine.sCurrMilling)
|
||||
Else
|
||||
Dim sCurrMachining As String = ""
|
||||
GetPrivateProfileString(S_MACH_MACH, K_CURRMILLING_OFFICE, Nothing, sCurrMachining, sMachIniFile)
|
||||
SetCurrMilling(sCurrMachining)
|
||||
End If
|
||||
Else
|
||||
CurrMilling_Visibility = Visibility.Collapsed
|
||||
@@ -504,7 +562,11 @@ Public Class CurrMachWindowVM
|
||||
If CurrentMachine.bPocketing And CurrPocketingList.Count > 1 Then
|
||||
CurrPocketing_Visibility = Visibility.Visible
|
||||
If CurrentMachine.sCurrPocketing <> String.Empty Then
|
||||
SelCurrPocketing = CurrentMachine.sCurrPocketing
|
||||
SetCurrPocketing(CurrentMachine.sCurrPocketing)
|
||||
Else
|
||||
Dim sCurrMachining As String = ""
|
||||
GetPrivateProfileString(S_MACH_MACH, K_CURRPOCKETING_OFFICE, Nothing, sCurrMachining, sMachIniFile)
|
||||
SetCurrPocketing(sCurrMachining)
|
||||
End If
|
||||
Else
|
||||
CurrPocketing_Visibility = Visibility.Collapsed
|
||||
@@ -515,10 +577,18 @@ Public Class CurrMachWindowVM
|
||||
' se DB WaterJet abilitato avrò anche la CmBx della Quality solo la CmBx del Waterjetting corrente
|
||||
If CurrentMachine.bFromDBWaterJet Then
|
||||
If CurrentMachine.sCurrWaterJetting <> String.Empty Then
|
||||
SelCurrWaterjetting = CurrentMachine.sCurrWaterJetting
|
||||
SetCurrWaterjetting(CurrentMachine.sCurrWaterJetting)
|
||||
Else
|
||||
Dim sCurrMachining As String = ""
|
||||
GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING_OFFICE, Nothing, sCurrMachining, sMachIniFile)
|
||||
SetCurrWaterjetting(sCurrMachining)
|
||||
End If
|
||||
If CurrentMachine.sCurrWaterJettingQuality <> String.Empty Then
|
||||
SelCurrWaterjettingQuality = CurrentMachine.sCurrWaterJettingQuality
|
||||
SetCurrWaterjettingQuality(CurrentMachine.sCurrWaterJettingQuality)
|
||||
Else
|
||||
Dim sCurrMachining As String = ""
|
||||
GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY_OFFICE, Nothing, sCurrMachining, sMachIniFile)
|
||||
SetCurrWaterjettingQuality(sCurrMachining)
|
||||
End If
|
||||
CurrWaterjettingQuality_Visibility = Visibility.Visible
|
||||
Else
|
||||
|
||||
@@ -247,9 +247,13 @@
|
||||
Public Const K_CURRDRIPDRILL As String = "CurrDripDrill"
|
||||
Public Const K_CURRWATERJET As String = "CurrWaterJet"
|
||||
Public Const K_CURRSAWING As String = "CurrSawing"
|
||||
Public Const K_CURRSAWING_OFFICE As String = "CurrOfficeSawing"
|
||||
Public Const K_CURRDRILLING As String = "CurrDrilling"
|
||||
Public Const K_CURRDRILLING_OFFICE As String = "CurrOfficeDrilling"
|
||||
Public Const K_CURRMILLING As String = "CurrMilling"
|
||||
Public Const K_CURRMILLING_OFFICE As String = "CurrOfficeMilling"
|
||||
Public Const K_CURRPOCKETING As String = "CurrPocketing"
|
||||
Public Const K_CURRPOCKETING_OFFICE As String = "CurrOfficePocketing"
|
||||
Public Const K_CURRSAWROUGHING As String = "CurrSawRoughing"
|
||||
Public Const K_CURRSAWFINISHING As String = "CurrSawFinishing"
|
||||
Public Const K_CURRSAWSIDEFINISHING As String = "CurrSawSideFinishing"
|
||||
@@ -257,7 +261,9 @@
|
||||
Public Const K_CURRDRIPSAWING As String = "CurrDripSawing"
|
||||
Public Const K_CURRDRIPDRILLING As String = "CurrDripDrilling"
|
||||
Public Const K_CURRWATERJETTING As String = "CurrWaterJetting"
|
||||
Public Const K_CURRWATERJETTING_OFFICE As String = "CurrOfficeWaterJetting"
|
||||
Public Const K_CURRWATERJETTINGQUALITY As String = "CurrWaterJettingQuality"
|
||||
Public Const K_CURRWATERJETTINGQUALITY_OFFICE As String = "CurrWaterJettingQuality"
|
||||
|
||||
Public Const S_MATERIALS As String = "Materials"
|
||||
Public Const K_CURRMATERIAL As String = "CurrMaterial"
|
||||
|
||||
@@ -539,14 +539,25 @@ Module VacuumCups
|
||||
|
||||
' assegante le posizioni del centro delle ventose e l'angolo di posizionamento orizzontale verifica che la posizione sia raggiungibile
|
||||
Public Function VerifyOutOfStrokes(ptRef As Point3d, dRotAngDeg As Double) As Integer
|
||||
Dim dX, dY, dZ As Double
|
||||
Dim nStat As Integer
|
||||
' Posizione Home dell'asse rotante
|
||||
Dim dCHome As Double
|
||||
EgtGetAxisHomePos("C", dCHome)
|
||||
' imposto la l'uscita della ventosa come fosse l'uscita di un utensile
|
||||
' Corse dell'asse
|
||||
Dim dCMin As Double
|
||||
EgtGetAxisMin("C", dCMin)
|
||||
Dim dCMax As Double
|
||||
EgtGetAxisMax("C", dCMax)
|
||||
' Porto l'angolo nel range
|
||||
Dim dRotAngMachDeg As Double = dRotAngDeg + dCHome
|
||||
AdjustAngleInRange(dRotAngMachDeg, dCMin, dCMax)
|
||||
' Imposto la ventosa come fosse un utensile
|
||||
EgtSetCalcTool("", "H4", 1)
|
||||
EgtGetCalcPositions(ptRef, dRotAngDeg + dCHome, 0, nStat, dX, dY, dZ)
|
||||
EgtVerifyOutstroke(dX, dY, dZ, dRotAngDeg + dCHome, 0, nStat)
|
||||
' Calcolo gli assi macchina
|
||||
Dim dX, dY, dZ As Double
|
||||
Dim nStat As Integer
|
||||
EgtGetCalcPositions(ptRef, dRotAngMachDeg, 0, nStat, dX, dY, dZ)
|
||||
' Verifico le corse
|
||||
EgtVerifyOutstroke(dX, dY, dZ, dRotAngMachDeg, 0, nStat)
|
||||
Return nStat
|
||||
End Function
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
Margin="0,5,0,0"
|
||||
Content="Verify"/>
|
||||
<ToggleButton Name="MagneticBtn" Height="40" Width="80"
|
||||
Visibility="Collapsed"
|
||||
Margin="0,5,0,0"
|
||||
Content="Magnetic"/>
|
||||
<Button Name="ExportBtn" Height="40" Width="80"
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<EgtFloating:EgtFloatingPanel x:Class="PrintPanelV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
|
||||
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
|
||||
IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
|
||||
|
||||
<Button ToolTip="{Binding PrintToolTip}"
|
||||
Style="{StaticResource ToolBar_Button}"
|
||||
Command="{Binding PrintCommand}">
|
||||
<Image Source="/Resources/InstrumentPanel/Print.png" Stretch="Uniform"/>
|
||||
</Button>
|
||||
|
||||
</EgtFloating:EgtFloatingPanel>
|
||||
@@ -0,0 +1,3 @@
|
||||
Public Class PrintPanelV
|
||||
|
||||
End Class
|
||||
@@ -0,0 +1,91 @@
|
||||
Imports EgtUILib
|
||||
Imports EgtWPFLib5
|
||||
Public Class PrintPanelVM
|
||||
|
||||
' Definizione comandi
|
||||
Private m_cmdPrint As ICommand
|
||||
|
||||
Public ReadOnly Property PrintToolTip As String
|
||||
Get
|
||||
' "Print shading" & vbCrLf & "Print hidden line (Shift)"
|
||||
Return "Print"
|
||||
End Get
|
||||
End Property
|
||||
|
||||
#Region "PrintCommand"
|
||||
|
||||
Public ReadOnly Property PrintCommand As ICommand
|
||||
Get
|
||||
If m_cmdPrint Is Nothing Then
|
||||
m_cmdPrint = New Command(AddressOf Print)
|
||||
End If
|
||||
Return m_cmdPrint
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub Print(ByVal param As Object)
|
||||
Dim SM_Select As SM = SM.SHADING
|
||||
|
||||
' Imposto la stampa HiddenLine (non è gestita la stampa WireFrame)
|
||||
'If (Keyboard.Modifiers And ModifierKeys.Shift) > 0 Then
|
||||
' SM_Select = SM.HIDDENLINE
|
||||
' EgtSetLineAttribs(3)
|
||||
'End If
|
||||
|
||||
' Gestione stampa in funzione del della visualizzazione corrente
|
||||
If OmagOFFICEMap.refShowPanelVM.WireframeIsChecked Then
|
||||
SM_Select = SM.WIREFRAME
|
||||
EgtSetLineAttribs(3)
|
||||
ElseIf OmagOFFICEMap.refShowPanelVM.HiddenLineIsChecked Then
|
||||
SM_Select = SM.HIDDENLINE
|
||||
EgtSetLineAttribs(3)
|
||||
End If
|
||||
|
||||
Dim printDlg As New PrintDialog
|
||||
Dim sPath = OmagOFFICEMap.refMainWindowVM.MainWindowM.sTempDir & "\Image.png"
|
||||
If printDlg.ShowDialog() Then
|
||||
' Recupero le dimensioni dell'area di stampa
|
||||
Dim dW As Double = printDlg.PrintableAreaWidth
|
||||
Dim dH As Double = printDlg.PrintableAreaHeight
|
||||
Try
|
||||
' Prendo l'immagine corrente per la stampa
|
||||
Dim colWhite As New Color3d(255, 255, 255)
|
||||
' Recupero le dimensioni correnti della pagina di disegno
|
||||
Dim nImgW As Integer = GetWidthDimProjectV()
|
||||
Dim nImgH As Integer = GetHeightDimProjectV()
|
||||
If Not EgtGetImage(SM_Select, colWhite, colWhite, nImgW, nImgH, sPath) Then
|
||||
' Error in creating the print image
|
||||
EgtOutLog(EgtMsg(50181))
|
||||
EgtSetLineAttribs(1)
|
||||
Return
|
||||
End If
|
||||
EgtSetLineAttribs(1)
|
||||
'Metodo complesso di stampa che permette di rilasciare il file :
|
||||
'carico la bitmap e la metto in uno stream in memoria
|
||||
Dim stream As System.IO.Stream = New System.IO.MemoryStream()
|
||||
Dim bitmap As System.Drawing.Bitmap = New System.Drawing.Bitmap(sPath)
|
||||
bitmap.Save(stream, System.Drawing.Imaging.ImageFormat.Png)
|
||||
bitmap.Dispose()
|
||||
' la sposto in una BitmapImage
|
||||
Dim bitImage As New System.Windows.Media.Imaging.BitmapImage()
|
||||
bitImage.BeginInit()
|
||||
bitImage.StreamSource = stream
|
||||
bitImage.EndInit()
|
||||
' la sposto in un Visual Control
|
||||
Dim tmpImg As New Image
|
||||
tmpImg.BeginInit()
|
||||
tmpImg.Source = bitImage
|
||||
tmpImg.Stretch = Stretch.Uniform
|
||||
tmpImg.EndInit()
|
||||
' eseguo la stampa
|
||||
printDlg.PrintVisual(tmpImg, "Parts Layout")
|
||||
Catch
|
||||
' Rrror in executing print
|
||||
EgtOutLog(EgtMsg(50182))
|
||||
End Try
|
||||
End If
|
||||
End Sub
|
||||
|
||||
#End Region ' PrintCommand
|
||||
|
||||
End Class
|
||||
@@ -189,6 +189,10 @@ Public Class MyMachGroupPanelVM
|
||||
End If
|
||||
' Verifico che gli utensili delle lavorazioni correnti siano attrezzati (necessario perchè potrei aver cambiato gli utensili delle lavorazioni)
|
||||
' e che le lavorazioni correnti siano compatibili con materiale e spessore
|
||||
|
||||
' Inizializzo l'elenco delle lavorazioni correnti
|
||||
Dim CurrMachining As New CurrMachWindowVM
|
||||
|
||||
' Lama
|
||||
Dim bOkCurrSawing As Boolean = True
|
||||
Dim bOkCurrWaterjetting As Boolean = True
|
||||
@@ -229,12 +233,13 @@ Public Class MyMachGroupPanelVM
|
||||
Else
|
||||
bOkCurrWaterjetting = False
|
||||
End If
|
||||
|
||||
' Imposto il colore del pulsante SetUp
|
||||
If Not bOkSetUp Then
|
||||
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = Brushes.Red
|
||||
Else
|
||||
OmagOFFICEMap.refMachinePanelVM.SetUp_Background = DirectCast(New BrushConverter().ConvertFrom("#FFDDDDDD"), SolidColorBrush)
|
||||
End If
|
||||
' Imposto il colore di sfondo del pulsante SettingMachinig
|
||||
If Not bOkMatThick Or Not bOkCurrSawing Then
|
||||
If Not bOkMatThick Or Not bOkCurrWaterjetting Then
|
||||
OmagOFFICEMap.refOptionPanelVM.RawPart_Background = Brushes.Red
|
||||
|
||||
@@ -213,7 +213,11 @@
|
||||
<Compile Include="EgtStoneLib\VeinMatchingWindow.xaml.vb">
|
||||
<DependentUpon>VeinMatchingWindow.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="InstrumentPanel\PrintPanelV.xaml.vb">
|
||||
<DependentUpon>PrintPanelV.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="InstrumentPanel\MyInstrumentPanelVM.vb" />
|
||||
<Compile Include="InstrumentPanel\PrintPanelVM.vb" />
|
||||
<Compile Include="MachinePanel\MyMachinePanelVM.vb" />
|
||||
<Compile Include="MyMachGroupPanel\MyMachGroupPanelVM.vb" />
|
||||
<Compile Include="MachinePanel\MachinePanelV.xaml.vb">
|
||||
@@ -389,6 +393,10 @@
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="InstrumentPanel\PrintPanelV.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="MachinePanel\MachinePanelV.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
@@ -691,6 +699,9 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\TopCommandBar\DxfOut.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\InstrumentPanel\Print.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagOFFICE\OmagOFFICER32.exe
|
||||
|
||||
@@ -2428,6 +2428,7 @@ Public Class NestingTabVM
|
||||
VeinMatching.OnDeselectPart(m_nIdToDesel)
|
||||
End If
|
||||
' Reset
|
||||
GetFamilyGroupInPark()
|
||||
m_bDrag = False
|
||||
m_nIdToSel = GDB_ID.NULL
|
||||
m_nIdToDesel = GDB_ID.NULL
|
||||
|
||||
@@ -137,10 +137,10 @@ Public Class SimulTabVM
|
||||
MyEstim.Estimation_IsEnabled = False
|
||||
End If
|
||||
' Impostazioni box stime
|
||||
NotifyPropertyChanged("Time")
|
||||
NotifyPropertyChanged("CutLen")
|
||||
NotifyPropertyChanged("NetArea")
|
||||
NotifyPropertyChanged("Usage")
|
||||
MyEstim.NotifyPropertyChanged("Time")
|
||||
MyEstim.NotifyPropertyChanged("CutLen")
|
||||
MyEstim.NotifyPropertyChanged("NetArea")
|
||||
MyEstim.NotifyPropertyChanged("Usage")
|
||||
' Nascondo eventuali pezzi in parcheggio
|
||||
HideParkedParts()
|
||||
' Nascondo eventuale contorno da foto
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<OmagOFFICE:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
|
||||
<OmagOFFICE:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
|
||||
<OmagOFFICE:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
|
||||
<OmagOFFICE:PrintPanelV DataContext="{StaticResource PrintPanelVM}"/>
|
||||
<OmagOFFICE:VeinMatchPanelV DataContext="{StaticResource VeinMatchPanelVM}"/>
|
||||
<OmagOFFICE:MachinePanelV DataContext="{StaticResource MachinePanelVM}"/>
|
||||
</EgtFloating:EgtFloatingTray>
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
Public Class ProjectV
|
||||
|
||||
Private Sub LoadPage() Handles Me.Loaded
|
||||
OmagOFFICEMap.SetRefProjectV(Me)
|
||||
End Sub
|
||||
|
||||
End Class
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 637 B |
@@ -18,6 +18,7 @@
|
||||
<EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
|
||||
<EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
|
||||
<EgtWPFLib5:InstrumentPanelVM x:Key="InstrumentPanelVM"/>
|
||||
<OmagOFFICE:PrintPanelVM x:Key="PrintPanelVM"/>
|
||||
<OmagOFFICE:MyMachinePanelVM x:Key="MachinePanelVM"/>
|
||||
<OmagOFFICE:VeinMatchPanelVM x:Key="VeinMatchPanelVM"/>
|
||||
<OmagOFFICE:OptionPanelVM x:Key="OptionPanelVM"/>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
Imports EgtWPFLib5
|
||||
Imports EgtPHOTOLib
|
||||
Imports EgtUILib
|
||||
|
||||
Module OmagOFFICEMap
|
||||
|
||||
@@ -229,6 +230,43 @@ Module OmagOFFICEMap
|
||||
Return Not IsNothing(m_refSimulTabVM)
|
||||
End Function
|
||||
|
||||
|
||||
Private m_refProjectV As ProjectV
|
||||
Friend Sub SetRefProjectV(ProjectV As ProjectV)
|
||||
m_refProjectV = ProjectV
|
||||
End Sub
|
||||
|
||||
Private m_WidthProjectV As Integer = 2000
|
||||
Friend Sub SetWidthDimProjectV(Width As Integer)
|
||||
m_WidthProjectV = Width
|
||||
End Sub
|
||||
Friend Function GetWidthDimProjectV() As Integer
|
||||
If Not IsNothing(m_refProjectV) Then
|
||||
Try
|
||||
m_WidthProjectV = CInt(m_refProjectV.ActualWidth)
|
||||
Catch ex As Exception
|
||||
EgtOutLog(ex.Message)
|
||||
End Try
|
||||
End If
|
||||
Return m_WidthProjectV
|
||||
End Function
|
||||
|
||||
Private m_HeightProjectV As Integer = 1000
|
||||
Friend Sub SetHeightDimProjectV(Eight As Integer)
|
||||
m_HeightProjectV = Eight
|
||||
End Sub
|
||||
|
||||
Friend Function GetHeightDimProjectV() As Integer
|
||||
If Not IsNothing(m_refProjectV) Then
|
||||
Try
|
||||
m_HeightProjectV = CInt(m_refProjectV.ActualHeight)
|
||||
Catch ex As Exception
|
||||
EgtOutLog(ex.Message)
|
||||
End Try
|
||||
End If
|
||||
Return m_HeightProjectV
|
||||
End Function
|
||||
|
||||
#End Region ' Set
|
||||
|
||||
#Region "Init"
|
||||
|
||||
Reference in New Issue
Block a user