diff --git a/CameraMng/FrmMain.vb b/CameraMng/FrmMain.vb index 6f9cef4..57145c2 100644 --- a/CameraMng/FrmMain.vb +++ b/CameraMng/FrmMain.vb @@ -95,7 +95,7 @@ Public Class FrmMain BtnTakeFoto.Visible = True GBDefAree.Visible = False ' Abilito la modifica della configurazione Cmaera/Cfg - ComboBoxCameras.Enabled = True + ComboBoxCameras.Enabled = False ComboBoxCameraCfg.Enabled = True Case en_status.ImageFromCamera GBCalibration.Visible = False @@ -105,7 +105,7 @@ Public Class FrmMain BtnTakeFoto.Visible = True GBDefAree.Visible = False ' Abilito la modifica della configurazione Cmaera/Cfg - ComboBoxCameras.Enabled = True + ComboBoxCameras.Enabled = False ComboBoxCameraCfg.Enabled = True Case en_status.Calibration GBCalibration.Visible = True @@ -165,7 +165,7 @@ Public Class FrmMain End Sub ' carico l'elenco delle camere attivo la connessione con quella selezionata/impostata nel file di configurazione - Private Sub LoadCamerasList() + Public Sub LoadCamerasList() ComboBoxCameras.Items.Clear() ' Popolo la lista 'm_idList' delle camere attualmente connesse Camera.CameraList() @@ -226,7 +226,7 @@ Public Class FrmMain 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 @@ -1755,7 +1755,7 @@ Public Class FrmMain ImageControl1.Refresh() End Sub - Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBoxCameras.SelectedIndexChanged + Private Sub ComboBoxCameras_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBoxCameras.SelectedIndexChanged If Not ModalitaNascosta Then LeggiFileConfigurazione() SetFormStatus() @@ -1766,6 +1766,21 @@ Public Class FrmMain Private Sub ComboBoxCameraCfg_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBoxCameraCfg.SelectedIndexChanged If Not ModalitaNascosta Then LeggiFileConfigurazione() + If Not IsNothing(Camera.m_idList) Then + If Camera.m_idList.Contains(CameraID) Then + ComboBoxCameras.SelectedItem = CameraID + Else + ' Non esiste una configurazione + Dim sTextMsg As String = String.Format("La configurazione " & ComboBoxCameraCfg.SelectedItem & " presenta una connessione alla camera non valida. " & + "Nel file 'CamaeraMng.cgf' il campo 'CameraID") + If String.IsNullOrEmpty(CameraID) Then + sTextMsg &= "' vuoto." + Else + sTextMsg &= ": " & CameraID & "' non è valido." + End If + MessageBox.Show(sTextMsg, "Avvertenza", MessageBoxButtons.OK, MessageBoxIcon.Error) + End If + End If ImageMng.m_fileCaliLensRead = False ImageMng.m_fileCaliProspRead = False ImageMng.m_bMatProspOk = False diff --git a/CameraMng/SetConfigForm.vb b/CameraMng/SetConfigForm.vb index 8551964..acd5cc9 100644 --- a/CameraMng/SetConfigForm.vb +++ b/CameraMng/SetConfigForm.vb @@ -18,6 +18,7 @@ Public Class SetConfigForm Private Sub PopolateDataGrid() DataGridView1.Rows.Clear() CameraListCfg.Clear() + ComboCamera.Items.Clear() Dim DirToReadCfg As String = FrmMain.sDataRoot ' Popolo combobox con idcamera For Each CameraItem As String In FrmMain.ComboBoxCameras.Items @@ -32,15 +33,19 @@ Public Class SetConfigForm riga.Cells(0).Value = CfgItem Dim id As String = ReadIdCameraFromCfg(NomeFileCfg) If Not String.IsNullOrEmpty(id) Then + ' Icone CFG If CameraListCfg.IndexOf(id) < 0 Then CameraListCfg.Add(id) riga.Cells(1).Value = GetCurrIco(2) Else riga.Cells(1).Value = GetCurrIco(0) End If + ' Icone CAMERA If ComboCamera.Items.IndexOf(id) > -1 Then riga.Cells(3).Value = GetCurrIco(2) riga.Cells(2).Value = id + ' aggiungo all'elenco degli id camera + ComboCamera.Items.Add(id) Else riga.Cells(3).Value = GetCurrIco(0) End If diff --git a/CameraMng/obj/x64/Debug/CameraMng.vbproj.AssemblyReference.cache b/CameraMng/obj/x64/Debug/CameraMng.vbproj.AssemblyReference.cache index aed544b..38abe7b 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 9c799eb..976291f 100644 --- a/CameraMng/obj/x64/Debug/CameraMng.vbproj.CoreCompileInputs.cache +++ b/CameraMng/obj/x64/Debug/CameraMng.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -69636ff66d10d465f87b29c6b3440534ee373b52aa51b9726c6ce7a90119bc6f +2e81f805195d83a1f7262e8a96404099beb76326e9e80773b0d6eccdfc480373 diff --git a/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache b/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache index 04a9d39..c6d41f2 100644 Binary files a/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache and b/CameraMng/obj/x64/Debug/CameraMng.vbproj.GenerateResource.cache differ