From d9a192ec9c1d38221142ee235461fae91d268772 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 11 May 2017 12:33:10 +0200 Subject: [PATCH] pulizia altre librerie da metodi inutilizzati... --- .../CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb | 3 - .../CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb | 88 +++++++++---------- MTC_Adapter/CMSCncLib/CNC/CNC/CNC.CNC.vb | 24 ----- 3 files changed, 44 insertions(+), 71 deletions(-) diff --git a/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb b/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb index bf338db..57d2523 100644 --- a/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb +++ b/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb @@ -120,9 +120,6 @@ Namespace CNC _nPortIp = nPortIp _CncScreen_connectionType = CncScreenHssb - 'Definisco l'area della Cnc Window - 'SetCncWindowSize() - 'Inizializzo le variabili Me._Descrizione = "NC FANUC" & vbNewLine Select Case _connectionType diff --git a/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb b/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb index a573e74..0eae7c9 100644 --- a/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb +++ b/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb @@ -135,57 +135,57 @@ Namespace CNC Dim ucValue(0) As Byte If Not bStaticDataReaded Then - 'Try - Select Case Settings.MemoryMapping - Case MemoryMapping.ElsManager + Try + Select Case Settings.MemoryMapping + Case MemoryMapping.ElsManager - Case MemoryMapping.Default, - MemoryMapping.ToolManager, - MemoryMapping.ToolTable + Case MemoryMapping.Default, + MemoryMapping.ToolManager, + MemoryMapping.ToolTable - 'Matricola - nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3403, sValue) - Me._Matricola = sValue(0) - 'Teste - nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3405, sValue) - Me._Teste = sValue(0) - 'Magazzini - nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3407, sValue) - Me._Magazzini = sValue(0) - 'Manine per Magazzino - ReDim Me._ManineMagazzino(Me._Magazzini - 1) - ReDim ucValue(19) - nReturn = O_RW_Byte(R, MemTypeWord.MW_CODE, 2900, LOW_ORDER, ucValue) - Array.Copy(ucValue, Me._ManineMagazzino, Me._ManineMagazzino.Length) - ReDim ucValue(0) + 'Matricola + nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3403, sValue) + Me._Matricola = sValue(0) + 'Teste + nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3405, sValue) + Me._Teste = sValue(0) + 'Magazzini + nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3407, sValue) + Me._Magazzini = sValue(0) + 'Manine per Magazzino + ReDim Me._ManineMagazzino(Me._Magazzini - 1) + ReDim ucValue(19) + nReturn = O_RW_Byte(R, MemTypeWord.MW_CODE, 2900, LOW_ORDER, ucValue) + Array.Copy(ucValue, Me._ManineMagazzino, Me._ManineMagazzino.Length) + ReDim ucValue(0) - 'Magazzini Con Attrezzaggio Automatico (maschera) - O_RW_Integer(R, MemTypeWord.MW_CODE, 4060, nValue) - Me._MagazziniConAttrezzaggioAutomatico = nValue(0) - End Select + 'Magazzini Con Attrezzaggio Automatico (maschera) + O_RW_Integer(R, MemTypeWord.MW_CODE, 4060, nValue) + Me._MagazziniConAttrezzaggioAutomatico = nValue(0) + End Select - Me._MaxUtensiliGestibili = 300 'TODO IMPLEMENTARE - Me._MaxIdUtensile = 300 'TODO IMPLEMENTARE + Me._MaxUtensiliGestibili = 300 'TODO IMPLEMENTARE + Me._MaxIdUtensile = 300 'TODO IMPLEMENTARE - Select Case Settings.MemoryMapping - Case MemoryMapping.ElsManager - Case MemoryMapping.ToolManager - Case MemoryMapping.Default, - MemoryMapping.ToolTable - 'ZoomSpeed - nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3425, sValue) - If sValue(0) > 0 And sValue(0) <= 100 Then - Me._ZoomSpeed = sValue(0) - Else - Me._ZoomSpeed = 1 - End If - End Select + Select Case Settings.MemoryMapping + Case MemoryMapping.ElsManager + Case MemoryMapping.ToolManager + Case MemoryMapping.Default, + MemoryMapping.ToolTable + 'ZoomSpeed + nReturn = O_RW_Short(R, MemTypeWord.MW_CODE, 3425, sValue) + If sValue(0) > 0 And sValue(0) <= 100 Then + Me._ZoomSpeed = sValue(0) + Else + Me._ZoomSpeed = 1 + End If + End Select - bStaticDataReaded = True + bStaticDataReaded = True - 'Catch ex As CmsNcException - ' Me.CncException(ex.Message) - 'End Try + Catch ex As CmsNcException + Me.CncException(ex.Message) + End Try End If End Sub diff --git a/MTC_Adapter/CMSCncLib/CNC/CNC/CNC.CNC.vb b/MTC_Adapter/CMSCncLib/CNC/CNC/CNC.CNC.vb index 7bdc7b1..9ae1903 100644 --- a/MTC_Adapter/CMSCncLib/CNC/CNC/CNC.CNC.vb +++ b/MTC_Adapter/CMSCncLib/CNC/CNC/CNC.CNC.vb @@ -207,30 +207,6 @@ Namespace CNC Public Overridable Sub CloseCnc() End Sub - ''' - ''' Riduce a icona la finestra CNC - ''' - Public Overridable Sub MinimizeCnc() - End Sub - - ''' - ''' Mostra a dimensioni normali la finestra CNC - ''' - Public Overridable Sub NormalizeCnc() - End Sub - - ''' - ''' Setta il focus sulla finestra CNC - ''' - Public Overridable Sub SetCncFocus() - End Sub - - ''' - ''' Setta il focus sulla finestra CNC - ''' - Public Overridable Sub MoveCnc() - End Sub - End Class