Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 68c3acbaaf | |||
| 4046f87050 | |||
| f1ffdc6929 | |||
| 4288052f8b | |||
| e8f0322b42 | |||
| 5eac133d91 |
@@ -1,7 +1,7 @@
|
||||
<Window x:Class="AboutBoxV"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Title="AboutBox" Height="320" Width="300" WindowStyle="None" ResizeMode="NoResize"
|
||||
Title="AboutBox" Height="320" Width="440" WindowStyle="None" ResizeMode="NoResize"
|
||||
ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
|
||||
|
||||
<Border BorderThickness="2" BorderBrush="LightBlue">
|
||||
@@ -31,7 +31,7 @@
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Name="LogoBrd" Grid.Column="1" Background="White">
|
||||
<Image Source="/Resources/AboutBoxImage.png" Stretch="Uniform"/>
|
||||
<Image Source="/Resources/Logo-Egalware.png" Stretch="Uniform"/>
|
||||
</Border>
|
||||
</Grid>
|
||||
<TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
|
||||
|
||||
+1
-17
@@ -100,23 +100,7 @@ Module ConstIni
|
||||
Public Const K_THICKNESS As String = "Thickness"
|
||||
Public Const K_WAREHAOUSE As String = "WareHouse"
|
||||
|
||||
Public Const S_CAMERA As String = "Camera"
|
||||
Public Const K_CAM_COUNT As String = "Count"
|
||||
Public Const K_CAM_EXEPATH As String = "ExePath"
|
||||
Public Const K_CAM_IMAGE As String = "Image"
|
||||
Public Const K_CAM_INFO As String = "Info"
|
||||
Public Const K_CAM_RESULT As String = "Result"
|
||||
Public Const K_CAM_CONTOUR As String = "Contour"
|
||||
Public Const K_CAM_EXEPATH2 As String = "ExePath2"
|
||||
Public Const K_CAM_IMAGE2 As String = "Image2"
|
||||
Public Const K_CAM_INFO2 As String = "Info2"
|
||||
Public Const K_CAM_RESULT2 As String = "Result2"
|
||||
Public Const K_CAM_CONTOUR2 As String = "Contour2"
|
||||
Public Const K_CAM_THRESHOLD As String = "Threshold"
|
||||
Public Const K_CAM_TOLERANCE As String = "Tolerance"
|
||||
Public Const K_CAM_TIMEOUT As String = "Timeout"
|
||||
Public Const K_CAM_TABLEDIMX As String = "TableDimX"
|
||||
Public Const K_CAM_TABLEDIMY As String = "TableDimY"
|
||||
' La macchina fotografica (Camera) è gestita da EgtPHOTOLIB
|
||||
|
||||
Public Const S_MATERIALS As String = "Materials"
|
||||
Public Const K_MATERIAL As String = "Material"
|
||||
|
||||
@@ -209,8 +209,8 @@ Public Class MainWindowM
|
||||
Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
|
||||
EgtSetNetHwKey(bNetHwKey)
|
||||
' Recupero livello e opzioni della chiave
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2609, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(9423, 2609, 1, m_nKeyOptions)
|
||||
Dim bKey As Boolean = EgtGetKeyLevel(9423, 3103, 1, m_nKeyLevel) And
|
||||
EgtGetKeyOptions(9423, 3103, 1, m_nKeyOptions)
|
||||
' Verifico abilitazione prodotto
|
||||
Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
|
||||
' Inizializzazione generale di EgtInterface
|
||||
@@ -288,6 +288,7 @@ Public Class MainWindowM
|
||||
' Info su opzioni chiave
|
||||
EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
|
||||
' Imposto parametri EgtPHOTOLib
|
||||
EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug)
|
||||
EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
|
||||
EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
|
||||
EgtPHOTOLib.MainData.SetKeyOptions(m_nKeyOptions)
|
||||
@@ -308,7 +309,7 @@ Public Class MainWindowM
|
||||
AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
|
||||
m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
|
||||
m_RefreshTimer.Start()
|
||||
' sec onfigurato lancio il controllo di uno specifico direttorio per leggere quando scattare una nuova foto
|
||||
' se configurato lancio il controllo di uno specifico direttorio per leggere quando scattare una nuova foto
|
||||
Dim sClidkDir As String = String.Empty
|
||||
Dim bEnableLineProduction As Boolean = GetMainPrivateProfileString(S_AUTOCLICK, K_CLICKDIR, "", sClidkDir) <> 0
|
||||
If bEnableLineProduction Then
|
||||
|
||||
@@ -121,7 +121,7 @@ Public Class MainWindowVM
|
||||
Not IsNothing(EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab) AndAlso EgtPHOTOLib.PhotoMap.refProjectVM.SelSlab.IsModified() Then
|
||||
' 91125=Salvare le modifiche correnti?
|
||||
' 91126=Avviso
|
||||
If MessageBox.Show(EgtMsg(91125), EgtMsg(91122), MessageBoxButton.OKCancel, MessageBoxImage.Warning) = MessageBoxResult.OK Then
|
||||
If MessageBox.Show(EgtMsg(91125), EgtMsg(91122), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.OK Then
|
||||
EgtPHOTOLib.PhotoMap.refOptionPanelVM.Ok(Nothing)
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -19,7 +19,7 @@ Imports System.Windows
|
||||
#End If
|
||||
<Assembly: AssemblyCompany("Egalware s.r.l.")>
|
||||
<Assembly: AssemblyProduct("OmagPHOTO")>
|
||||
<Assembly: AssemblyCopyright("Copyright © 2017-2024 by Egalware s.r.l.")>
|
||||
<Assembly: AssemblyCopyright("Copyright © 2017-2026 by Egalware s.r.l.")>
|
||||
<Assembly: AssemblyTrademark("")>
|
||||
<Assembly: ComVisible(false)>
|
||||
|
||||
@@ -59,5 +59,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.6.9.1")>
|
||||
<Assembly: AssemblyFileVersion("2.6.9.1")>
|
||||
<Assembly: AssemblyVersion("3.1.3.3")>
|
||||
<Assembly: AssemblyFileVersion("3.1.3.3")>
|
||||
|
||||
+3
-3
@@ -219,9 +219,6 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\InstrumentPanel\Matitina.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\AboutBoxImage.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DetailPage\Save.png" />
|
||||
</ItemGroup>
|
||||
@@ -252,6 +249,9 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\DetailPage\ZoomAll.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\Logo-Egalware.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagPHOTO\OmagPHOTOR32.exe
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
Reference in New Issue
Block a user