diff --git a/CameraMng/FrmMain.vb b/CameraMng/FrmMain.vb index 8351a51..6f9cef4 100644 --- a/CameraMng/FrmMain.vb +++ b/CameraMng/FrmMain.vb @@ -167,13 +167,29 @@ Public Class FrmMain ' carico l'elenco delle camere attivo la connessione con quella selezionata/impostata nel file di configurazione Private Sub LoadCamerasList() ComboBoxCameras.Items.Clear() + ' Popolo la lista 'm_idList' delle camere attualmente connesse Camera.CameraList() For i As Integer = 0 To Camera.m_idList.Count - 1 ComboBoxCameras.Items.Add(Camera.m_idList(i)) Next - ' Connessione alla camera + ' Connessione alla prima camera disponibile camera If Camera.m_idList.Count > 0 Then - ComboBoxCameras.SelectedIndex = 0 + Dim IsValidCam As Boolean = False + For nIndexCam As Integer = 0 To Camera.m_idList.Count - 1 + If Camera.m_idList(nIndexCam) = CameraID Then + ComboBoxCameras.SelectedIndex = nIndexCam + IsValidCam = True + Exit For + End If + Next + If Not IsValidCam Then + ' Non esiste una configurazione + Dim sTextMsg As String = String.Format("L'identificativo della camera della configurazione corrente non è disponibile. " & + "Verificare che sia accessa oppure che esista. ") + MessageBox.Show(sTextMsg, "Avvertenza", MessageBoxButtons.OK, MessageBoxIcon.Warning) + ComboBoxCameras.SelectedIndex = 0 + End If + ' Attivo la If Not ModalitaNascosta Then Camera.Connect(ComboBoxCameras.SelectedItem) Else @@ -189,12 +205,28 @@ Public Class FrmMain For i As Integer = 0 To TempListIndCfg.Count - 1 ComboBoxCameraCfg.Items.Add(TempListIndCfg(i)) Next + ' Seleziona la prima disponibile If TempListIndCfg.Count > 0 Then - ComboBoxCameraCfg.SelectedIndex = 0 + Dim IsCfgValid As Boolean = False + For nIndexCfg As Integer = 0 To TempListIndCfg.Count - 1 + ComboBoxCameraCfg.SelectedIndex = nIndexCfg + LeggiFileConfigurazione() + If CameraID <> String.Empty Then + IsCfgValid = True + Exit For + End If + Next + If Not IsCfgValid Then + ' Non esiste una configurazione + Dim sTextMsg As String = String.Format("Nessuna configurazione presenta una connessione alla camera valida. " & + "Nel file 'CamaeraMng.cgf' il campo 'CameraID' è vuoto o non assente. ") + MessageBox.Show(sTextMsg, "Avvertenza", MessageBoxButtons.OK, MessageBoxIcon.Warning) + ComboBoxCameraCfg.SelectedIndex = 0 + End If Else ' Non esiste una configurazione Dim sTextMsg As String = String.Format("Nella cartella '{0}' non sono state trovate configurazioni valide. " & - "(CameraMng, CameraMng1, CameraMng2..)", sDataRoot) + "(CameraMng, CameraMng1, CameraMng2..)", sDataRoot) MessageBox.Show(sTextMsg, "Avvertenza", MessageBoxButtons.OK, MessageBoxIcon.Warning) Return False End If @@ -212,11 +244,9 @@ Public Class FrmMain ' se non esiste almeno una configurazione valida chiudo il programma If Not LoadCfgList() Then Me.Close() - ' leggo la prima configurazione valida (e ID della camera per creare la commessione) - LeggiFileConfigurazione() AggiornaPulsantiVIsibili() MostraStato() - + ' Questo metodo è eseguibile solo se è andato a buon fine 'LeggiFileConfigurazione' If Not ImageMng.SetFileCalibrazione(FileLensCalib, FileCalibProsp) Then StatoGenerale = statoGenEnum.ErroreCalibrazione TStatus.Text = "Error in Calibration Files" diff --git a/CameraMng/obj/x64/Debug/CameraMng.vbproj.AssemblyReference.cache b/CameraMng/obj/x64/Debug/CameraMng.vbproj.AssemblyReference.cache index 8cdb0be..aed544b 100644 Binary files a/CameraMng/obj/x64/Debug/CameraMng.vbproj.AssemblyReference.cache and b/CameraMng/obj/x64/Debug/CameraMng.vbproj.AssemblyReference.cache differ diff --git a/CameraMng/obj/x64/Debug/CameraMng.vbproj.CoreCompileInputs.cache b/CameraMng/obj/x64/Debug/CameraMng.vbproj.CoreCompileInputs.cache index 976291f..9c799eb 100644 --- a/CameraMng/obj/x64/Debug/CameraMng.vbproj.CoreCompileInputs.cache +++ b/CameraMng/obj/x64/Debug/CameraMng.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -2e81f805195d83a1f7262e8a96404099beb76326e9e80773b0d6eccdfc480373 +69636ff66d10d465f87b29c6b3440534ee373b52aa51b9726c6ce7a90119bc6f diff --git a/CameraMng/obj/x64/Debug/CameraMng.vbproj.FileListAbsolute.txt b/CameraMng/obj/x64/Debug/CameraMng.vbproj.FileListAbsolute.txt index 54fe1ab..9fe09fe 100644 --- a/CameraMng/obj/x64/Debug/CameraMng.vbproj.FileListAbsolute.txt +++ b/CameraMng/obj/x64/Debug/CameraMng.vbproj.FileListAbsolute.txt @@ -74,3 +74,4 @@ C:\EgtDev\CameraMng\CameraMng\obj\x64\Debug\CameraMng.vbproj.Up2Date C:\EgtDev\CameraMng\CameraMng\obj\x64\Debug\CameraMng.exe C:\EgtDev\CameraMng\CameraMng\obj\x64\Debug\CameraMng.xml C:\EgtDev\CameraMng\CameraMng\obj\x64\Debug\CameraMng.pdb +C:\EgtDev\cameramanager\CameraMng\obj\x64\Debug\SetConfigForm.resources diff --git a/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache b/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache index e553857..04a9d39 100644 Binary files a/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache and b/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache differ diff --git a/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache b/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache index 7303d54..1af7d6e 100644 Binary files a/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache and b/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 2d1d705..6847c44 100644 Binary files a/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/CameraMng/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ