From 949764ab956f67b539c86af64fcff683707f4126 Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Sun, 6 Nov 2016 22:38:35 -0200 Subject: [PATCH] 06-11-2016 - GeoSan 7.4.5 - Alterações para controle de erro para identificar não conformidade referente a issue #6 onde existe bug esporádico quando salva ramal e ponto da ligação do ramal --- trunk/Forms/frmCanvas.frm | 24 +++++++++++++++++------- trunk/Forms/frmMain.frm | 22 +++++++++++----------- trunk/GeoSan.exe | Bin 4009984 -> 0 bytes trunk/GeoSan.vbp | 18 +++++++++--------- trunk/GeoSan.vbw | 4 ++-- trunk/Modules/Global.bas | 2 +- 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/trunk/Forms/frmCanvas.frm b/trunk/Forms/frmCanvas.frm index db53bf3..db436c9 100644 --- a/trunk/Forms/frmCanvas.frm +++ b/trunk/Forms/frmCanvas.frm @@ -369,16 +369,26 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A TeDatabase1.getCenterGeometry 0, stringObject_id_ligacaoGPS, TypeGeometry.points, coordX_pontoGPS, coordY_pontoGPS retornoPontoGPS = TeDatabase1.setCurrentLayer("WATERLINES") retornoLinhaPerpendicular = TeDatabase1.getMinimumDistance(0, stringObject_id_rede, TypeGeometry.lines, coordX_pontoGPS, coordY_pontoGPS, comprimentoDoRamal, pontoSobreALinha, coord_x_NaLinha, coord_y_NaLinha) - linhaRamalX(0) = coord_x_NaLinha - linhaRamalY(0) = coord_y_NaLinha - linhaRamalX(1) = coordX_pontoGPS - linhaRamalY(1) = coordY_pontoGPS - retornoPontoGPS = TeDatabase1.setCurrentLayer("RAMAIS_AGUA") - retornoAdicionaLinhaRamal = TeDatabase1.addLine(idUnicoRamaisAgua, linhaRamalX(0), linhaRamalY(0), 2) + If retornoLinhaPerpendicular = 1 And coordX_pontoGPS > 0 And coordY_pontoGPS > 0 Then + linhaRamalX(0) = coord_x_NaLinha + linhaRamalY(0) = coord_y_NaLinha + linhaRamalX(1) = coordX_pontoGPS + linhaRamalY(1) = coordY_pontoGPS + retornoPontoGPS = TeDatabase1.setCurrentLayer("RAMAIS_AGUA") + retornoAdicionaLinhaRamal = TeDatabase1.addLine(idUnicoRamaisAgua, linhaRamalX(0), linhaRamalY(0), 2) + Else + debugCodigoErro = "2 - stringObject_id_ligacaoGPS = " + stringObject_id_ligacaoGPS + " retornoPerpendicular = " + CStr(retornoLinhaPerpendicular) + " coordX_pontoGPS = " + CStr(coordX_pontoGPS) + " coordY_pontoGPS = " + CStr(coordY_pontoGPS) + GoTo Trata_Erro 'por algum motivo em poucos casos acontece de ele não pergar a coordenada do ponto do ramal (extremidade do mesmo) foi colocado isso para poder identificar o que está acontecendo + End If '4 - Adiciona geometria do ponto ao ramail debugCodigoErro = "3" - retornoPontoDoRamalInserido = TeDatabase1.addPoint(idUnicoRamaisAgua, coordX_pontoGPS, coordY_pontoGPS) + If coordX_pontoGPS > 0 And coordY_pontoGPS > 0 Then 'só adiciona o ponto do ramal se existir a coordenada. Este if é para identificar o que pode estar acontecendo em poucos casos quando se cadastra o ramal automaticamente + retornoPontoDoRamalInserido = TeDatabase1.addPoint(idUnicoRamaisAgua, coordX_pontoGPS, coordY_pontoGPS) + Else + debugCodigoErro = "3 - stringObject_id_ligacaoGPS = " + stringObject_id_ligacaoGPS + " retornoPerpendicular = " + CStr(retornoLinhaPerpendicular) + " coordX_pontoGPS = " + CStr(coordX_pontoGPS) + " coordY_pontoGPS = " + CStr(coordY_pontoGPS) + GoTo Trata_Erro + End If '5 - Insere em RAMAIS_AGUA_LIGACAO a ligação selecionada pelo usuário On Error GoTo Transacao_Erro diff --git a/trunk/Forms/frmMain.frm b/trunk/Forms/frmMain.frm index 56741c5..159c182 100644 --- a/trunk/Forms/frmMain.frm +++ b/trunk/Forms/frmMain.frm @@ -2,11 +2,11 @@ VERSION 5.00 Object = "{9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0"; "TeComConnection.dll" Object = "{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0"; "TeComDatabase.dll" Object = "{C51C74EC-6107-4A01-8400-40B53BB20D42}#1.0#0"; "TeComExport.dll" -Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "COMDLG32.OCX" +Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "comdlg32.ocx" Object = "{1A397116-3057-40EE-9ECA-6FA4CC1E5FC3}#1.0#0"; "NexusPM4.ocx" Object = "{2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0"; "TeComImport.dll" Object = "{91488A85-7250-4842-8681-87818334B791}#1.0#0"; "NxViewManager2.ocx" -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0"; "MSCOMCTL.OCX" +Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0"; "mscomctl.ocx" Begin VB.MDIForm FrmMain BackColor = &H8000000C& Caption = " NEXUS - GeoSan - Tecnologia Terralib" @@ -320,7 +320,7 @@ Begin VB.MDIForm FrmMain AutoSize = 2 Object.Width = 3519 MinWidth = 3528 - TextSave = "10:02" + TextSave = "20:16" EndProperty BeginProperty Panel4 {8E3867AB-8586-11D1-B16A-00C0F0283628} AutoSize = 2 @@ -1526,7 +1526,7 @@ Private Sub mnu_PatternCurves_Click() Dim frm As New frmEPANavegator - frm.init + frm.Init Set frm = Nothing End Sub @@ -1867,7 +1867,7 @@ Private Sub mnuExpAutoCad_Click() 'Se nao houver canvas aberto não é possivel exportar nada... If FrmMain.Tag > 0 Then - frm.init Conn, ActiveForm.TCanvas, Me + frm.Init Conn, ActiveForm.TCanvas, Me Else MsgBox "Não é possível exportar quando não existe uma área de trabalho do mapa.", vbInformation, "Atenção!" End If @@ -2002,7 +2002,7 @@ Dim frm As New frmImportDxf Conecta - frm.init Conn, TeImport1, TeDatabase1 + frm.Init Conn, TeImport1, TeDatabase1 Set frm = Nothing 'changeSelIntersectionPoint End Sub @@ -2021,7 +2021,7 @@ Private Sub mnuImportSIG_Click() Conecta - frm.init Conn, TeImport1, TeDatabase1 + frm.Init Conn, TeImport1, TeDatabase1 Set frm = Nothing End Sub @@ -2034,7 +2034,7 @@ End Sub Private Sub mnuInsertLabel_Click() - FrmCreatTextForLayer.init + FrmCreatTextForLayer.Init End Sub @@ -2241,7 +2241,7 @@ End Sub Private Sub mnuTypes_Click() - FrmSelectTypes.init + FrmSelectTypes.Init End Sub @@ -2534,7 +2534,7 @@ End Sub ' Private Sub mnuOpen_Click() Set TCanvas = New frmCanvas - TCanvas.init Conn, usuario.UseName + TCanvas.Init Conn, usuario.UseName End Sub @@ -2669,7 +2669,7 @@ On Error GoTo Trata_Erro tbToolBar.Buttons("kselection").value = tbrPressed - Me.ActiveForm.Caption = "ista: " & ViewName + Me.ActiveForm.Caption = "Vista: " & ViewName sbStatusBar.Panels(1).Text = "Modo de seleção: Selecione um objeto do plano referente ao tema ativo" Trata_Erro: diff --git a/trunk/GeoSan.exe b/trunk/GeoSan.exe index 8eb6be6..9c0fa82 100644 Binary files a/trunk/GeoSan.exe and b/trunk/GeoSan.exe differ diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index 71840da..91ac064 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -2,8 +2,8 @@ Type=Exe Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\Windows\SysWOW64\stdole2.tlb#OLE Automation Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#..\..\..\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\Windows\SysWOW64\scrrun.dll#Microsoft Scripting Runtime -Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\Windows\SysWow64\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP6) -Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#..\..\..\Windows\SysWow64\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4) +Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\Windows\SysWow64\msstdfmt.dll#Microsoft Data Formatting Object Library 6.0 (SP6) +Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#..\..\..\Windows\SysWow64\msdbrpt.dll#Microsoft Data Report Designer 6.0 (SP4) Reference=*\G{00025E01-0000-0000-C000-000000000046}#5.0#0#..\..\..\Program Files (x86)\Common Files\Microsoft Shared\DAO\dao360.dll#Microsoft DAO 3.6 Object Library Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#..\..\..\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection Reference=*\G{CDDC1EC0-B6FD-4915-B3E6-B6B8F0C5CAEA}#1.0#0#..\..\..\Arquivos de Programas\GeoSan\Controles\NSecurity.dll#NSecurity @@ -24,20 +24,20 @@ Object={18576B0E-A129-4A50-9930-59E18A6FE5E1}#1.0#0; TeComCanvas.dll Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll Object={87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0; TeComDatabase.dll Object={C51C74EC-6107-4A01-8400-40B53BB20D42}#1.0#0; TeComExport.dll -Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX -Object={5E9E78A0-531B-11CF-91F6-C2863C385E30}#1.0#0; MSFLXGRD.OCX -Object={65E121D4-0C60-11D2-A9FC-0000F8754DA1}#2.0#0; MSCHRT20.OCX -Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX +Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx +Object={5E9E78A0-531B-11CF-91F6-C2863C385E30}#1.0#0; msflxgrd.ocx +Object={65E121D4-0C60-11D2-A9FC-0000F8754DA1}#2.0#0; mschrt20.ocx +Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; richtx32.ocx Object={CDE57A40-8B86-11D0-B3C6-00A0C90AEA82}#1.0#0; MSDATGRD.OCX Object={648A5603-2C6E-101B-82B6-000000000014}#1.1#0; MSCOMM32.OCX -Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX +Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx Object={1A397116-3057-40EE-9ECA-6FA4CC1E5FC3}#1.0#0; NexusPM4.ocx Object={E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0; TeComNetwork.dll Object={F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0; TeComViewManager.dll Object={2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0; TeComImport.dll Object={EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0; TeComViewDatabase.dll Object={91488A85-7250-4842-8681-87818334B791}#1.0#0; NxViewManager2.ocx -Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; MSCOMCTL.OCX +Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; mscomctl.ocx Module=Global; Modules\Global.bas Module=calcDetecta; Modules\calcDetecta.bas Form=Forms\FrmCreatTextForLayer.frm @@ -151,7 +151,7 @@ HelpContextID="0" CompatibleMode="0" MajorVer=7 MinorVer=4 -RevisionVer=4 +RevisionVer=5 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/GeoSan.vbw b/trunk/GeoSan.vbw index 198b6ff..8fef547 100644 --- a/trunk/GeoSan.vbw +++ b/trunk/GeoSan.vbw @@ -5,9 +5,9 @@ frmAbout = 0, 0, 0, 0, C, 154, 154, 1273, 886, C FrmTypes = 0, 0, 0, 0, C, 176, 176, 1295, 908, C FrmMain = 16, 71, 1246, 591, C, 139, 12, 1258, 744, C FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C -FrmCadastroRamal = 63, 13, 1453, 742, , 45, 39, 1164, 771, C +FrmCadastroRamal = 63, 13, 1453, 742, C, 45, 39, 1164, 771, C frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C -frmCanvas = 12, 33, 1452, 829, C, 110, 110, 1229, 842, C +frmCanvas = 12, 33, 1452, 829, , 110, 110, 1229, 842, C frmConsumidoresDesabastecidos = 110, 110, 1229, 842, C, 308, 308, 1427, 1040, C frmConsumoLote = 150, 150, 1296, 781, C, 330, 330, 1449, 1062, C frmConsumoLoteGraf = 175, 175, 1321, 806, C, 352, 352, 1471, 1084, C diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index c2bb0e6..5d365d7 100644 --- a/trunk/Modules/Global.bas +++ b/trunk/Modules/Global.bas @@ -200,7 +200,7 @@ Public Sub Main() End If 'Configura a versão atual do GeoSan Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision - Versao_Geo = "07.04.04" + Versao_Geo = "07.04.05" glo.diretorioGeoSan = App.path 'salva globalmente o caminho onde encontra-se o GeoSan.exe SaveLoadGlobalData glo.diretorioGeoSan + "/controles/variaveisGlobais.txt", True 'salva em um arquivo todas as variáveis globais para poderem ser acessadas por outras aplicações connn = "" -- libgit2 0.21.2