1
Download as
Browse Code »

Commit 949764ab956f67b539c86af64fcff683707f4126

Authored by José Maria Villac Pinheiro
1 parent 345a5b78
Exists in master

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
Showing 6 changed files with 40 additions and 30 deletions   Show diff stats
trunk/Forms/frmCanvas.frm
  Diff comments   View file @949764a
... ... @@ -369,16 +369,26 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A
369 369 TeDatabase1.getCenterGeometry 0, stringObject_id_ligacaoGPS, TypeGeometry.points, coordX_pontoGPS, coordY_pontoGPS
370 370 retornoPontoGPS = TeDatabase1.setCurrentLayer("WATERLINES")
371 371 retornoLinhaPerpendicular = TeDatabase1.getMinimumDistance(0, stringObject_id_rede, TypeGeometry.lines, coordX_pontoGPS, coordY_pontoGPS, comprimentoDoRamal, pontoSobreALinha, coord_x_NaLinha, coord_y_NaLinha)
372   - linhaRamalX(0) = coord_x_NaLinha
373   - linhaRamalY(0) = coord_y_NaLinha
374   - linhaRamalX(1) = coordX_pontoGPS
375   - linhaRamalY(1) = coordY_pontoGPS
376   - retornoPontoGPS = TeDatabase1.setCurrentLayer("RAMAIS_AGUA")
377   - retornoAdicionaLinhaRamal = TeDatabase1.addLine(idUnicoRamaisAgua, linhaRamalX(0), linhaRamalY(0), 2)
  372 + If retornoLinhaPerpendicular = 1 And coordX_pontoGPS > 0 And coordY_pontoGPS > 0 Then
  373 + linhaRamalX(0) = coord_x_NaLinha
  374 + linhaRamalY(0) = coord_y_NaLinha
  375 + linhaRamalX(1) = coordX_pontoGPS
  376 + linhaRamalY(1) = coordY_pontoGPS
  377 + retornoPontoGPS = TeDatabase1.setCurrentLayer("RAMAIS_AGUA")
  378 + retornoAdicionaLinhaRamal = TeDatabase1.addLine(idUnicoRamaisAgua, linhaRamalX(0), linhaRamalY(0), 2)
  379 + Else
  380 + debugCodigoErro = "2 - stringObject_id_ligacaoGPS = " + stringObject_id_ligacaoGPS + " retornoPerpendicular = " + CStr(retornoLinhaPerpendicular) + " coordX_pontoGPS = " + CStr(coordX_pontoGPS) + " coordY_pontoGPS = " + CStr(coordY_pontoGPS)
  381 + 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
  382 + End If
378 383  
379 384 '4 - Adiciona geometria do ponto ao ramail
380 385 debugCodigoErro = "3"
381   - retornoPontoDoRamalInserido = TeDatabase1.addPoint(idUnicoRamaisAgua, coordX_pontoGPS, coordY_pontoGPS)
  386 + 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
  387 + retornoPontoDoRamalInserido = TeDatabase1.addPoint(idUnicoRamaisAgua, coordX_pontoGPS, coordY_pontoGPS)
  388 + Else
  389 + debugCodigoErro = "3 - stringObject_id_ligacaoGPS = " + stringObject_id_ligacaoGPS + " retornoPerpendicular = " + CStr(retornoLinhaPerpendicular) + " coordX_pontoGPS = " + CStr(coordX_pontoGPS) + " coordY_pontoGPS = " + CStr(coordY_pontoGPS)
  390 + GoTo Trata_Erro
  391 + End If
382 392  
383 393 '5 - Insere em RAMAIS_AGUA_LIGACAO a ligação selecionada pelo usuário
384 394 On Error GoTo Transacao_Erro
... ...
trunk/Forms/frmMain.frm
  Diff comments   View file @949764a
... ... @@ -2,11 +2,11 @@ VERSION 5.00
2 2 Object = "{9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0"; "TeComConnection.dll"
3 3 Object = "{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0"; "TeComDatabase.dll"
4 4 Object = "{C51C74EC-6107-4A01-8400-40B53BB20D42}#1.0#0"; "TeComExport.dll"
5   -Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "COMDLG32.OCX"
  5 +Object = "{F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0"; "comdlg32.ocx"
6 6 Object = "{1A397116-3057-40EE-9ECA-6FA4CC1E5FC3}#1.0#0"; "NexusPM4.ocx"
7 7 Object = "{2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0"; "TeComImport.dll"
8 8 Object = "{91488A85-7250-4842-8681-87818334B791}#1.0#0"; "NxViewManager2.ocx"
9   -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0"; "MSCOMCTL.OCX"
  9 +Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0"; "mscomctl.ocx"
10 10 Begin VB.MDIForm FrmMain
11 11 BackColor = &H8000000C&
12 12 Caption = " NEXUS - GeoSan - Tecnologia Terralib"
... ... @@ -320,7 +320,7 @@ Begin VB.MDIForm FrmMain
320 320 AutoSize = 2
321 321 Object.Width = 3519
322 322 MinWidth = 3528
323   - TextSave = "10:02"
  323 + TextSave = "20:16"
324 324 EndProperty
325 325 BeginProperty Panel4 {8E3867AB-8586-11D1-B16A-00C0F0283628}
326 326 AutoSize = 2
... ... @@ -1526,7 +1526,7 @@ Private Sub mnu_PatternCurves_Click()
1526 1526  
1527 1527 Dim frm As New frmEPANavegator
1528 1528  
1529   - frm.init
  1529 + frm.Init
1530 1530 Set frm = Nothing
1531 1531  
1532 1532 End Sub
... ... @@ -1867,7 +1867,7 @@ Private Sub mnuExpAutoCad_Click()
1867 1867  
1868 1868 'Se nao houver canvas aberto não é possivel exportar nada...
1869 1869 If FrmMain.Tag > 0 Then
1870   - frm.init Conn, ActiveForm.TCanvas, Me
  1870 + frm.Init Conn, ActiveForm.TCanvas, Me
1871 1871 Else
1872 1872 MsgBox "Não é possível exportar quando não existe uma área de trabalho do mapa.", vbInformation, "Atenção!"
1873 1873 End If
... ... @@ -2002,7 +2002,7 @@ Dim frm As New frmImportDxf
2002 2002 Conecta
2003 2003  
2004 2004  
2005   - frm.init Conn, TeImport1, TeDatabase1
  2005 + frm.Init Conn, TeImport1, TeDatabase1
2006 2006 Set frm = Nothing
2007 2007 'changeSelIntersectionPoint
2008 2008 End Sub
... ... @@ -2021,7 +2021,7 @@ Private Sub mnuImportSIG_Click()
2021 2021 Conecta
2022 2022  
2023 2023  
2024   - frm.init Conn, TeImport1, TeDatabase1
  2024 + frm.Init Conn, TeImport1, TeDatabase1
2025 2025 Set frm = Nothing
2026 2026  
2027 2027 End Sub
... ... @@ -2034,7 +2034,7 @@ End Sub
2034 2034  
2035 2035 Private Sub mnuInsertLabel_Click()
2036 2036  
2037   - FrmCreatTextForLayer.init
  2037 + FrmCreatTextForLayer.Init
2038 2038  
2039 2039 End Sub
2040 2040  
... ... @@ -2241,7 +2241,7 @@ End Sub
2241 2241  
2242 2242 Private Sub mnuTypes_Click()
2243 2243  
2244   - FrmSelectTypes.init
  2244 + FrmSelectTypes.Init
2245 2245  
2246 2246 End Sub
2247 2247  
... ... @@ -2534,7 +2534,7 @@ End Sub
2534 2534 '
2535 2535 Private Sub mnuOpen_Click()
2536 2536 Set TCanvas = New frmCanvas
2537   - TCanvas.init Conn, usuario.UseName
  2537 + TCanvas.Init Conn, usuario.UseName
2538 2538 End Sub
2539 2539  
2540 2540  
... ... @@ -2669,7 +2669,7 @@ On Error GoTo Trata_Erro
2669 2669  
2670 2670 tbToolBar.Buttons("kselection").value = tbrPressed
2671 2671  
2672   - Me.ActiveForm.Caption = "ista: " & ViewName
  2672 + Me.ActiveForm.Caption = "Vista: " & ViewName
2673 2673 sbStatusBar.Panels(1).Text = "Modo de seleção: Selecione um objeto do plano referente ao tema ativo"
2674 2674  
2675 2675 Trata_Erro:
... ...
trunk/GeoSan.exe
View file @949764a
No preview for this file type
trunk/GeoSan.vbp
  Diff comments   View file @949764a
... ... @@ -2,8 +2,8 @@ Type=Exe
2 2 Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\Windows\SysWOW64\stdole2.tlb#OLE Automation
3 3 Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#..\..\..\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library
4 4 Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\Windows\SysWOW64\scrrun.dll#Microsoft Scripting Runtime
5   -Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\Windows\SysWow64\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP6)
6   -Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#..\..\..\Windows\SysWow64\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4)
  5 +Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\Windows\SysWow64\msstdfmt.dll#Microsoft Data Formatting Object Library 6.0 (SP6)
  6 +Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#..\..\..\Windows\SysWow64\msdbrpt.dll#Microsoft Data Report Designer 6.0 (SP4)
7 7 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
8 8 Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#..\..\..\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection
9 9 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
24 24 Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll
25 25 Object={87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0; TeComDatabase.dll
26 26 Object={C51C74EC-6107-4A01-8400-40B53BB20D42}#1.0#0; TeComExport.dll
27   -Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
28   -Object={5E9E78A0-531B-11CF-91F6-C2863C385E30}#1.0#0; MSFLXGRD.OCX
29   -Object={65E121D4-0C60-11D2-A9FC-0000F8754DA1}#2.0#0; MSCHRT20.OCX
30   -Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX
  27 +Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx
  28 +Object={5E9E78A0-531B-11CF-91F6-C2863C385E30}#1.0#0; msflxgrd.ocx
  29 +Object={65E121D4-0C60-11D2-A9FC-0000F8754DA1}#2.0#0; mschrt20.ocx
  30 +Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; richtx32.ocx
31 31 Object={CDE57A40-8B86-11D0-B3C6-00A0C90AEA82}#1.0#0; MSDATGRD.OCX
32 32 Object={648A5603-2C6E-101B-82B6-000000000014}#1.1#0; MSCOMM32.OCX
33   -Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX
  33 +Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx
34 34 Object={1A397116-3057-40EE-9ECA-6FA4CC1E5FC3}#1.0#0; NexusPM4.ocx
35 35 Object={E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0; TeComNetwork.dll
36 36 Object={F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0; TeComViewManager.dll
37 37 Object={2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0; TeComImport.dll
38 38 Object={EE78E37B-39BE-42FA-80B7-E525529739F7}#1.0#0; TeComViewDatabase.dll
39 39 Object={91488A85-7250-4842-8681-87818334B791}#1.0#0; NxViewManager2.ocx
40   -Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; MSCOMCTL.OCX
  40 +Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; mscomctl.ocx
41 41 Module=Global; Modules\Global.bas
42 42 Module=calcDetecta; Modules\calcDetecta.bas
43 43 Form=Forms\FrmCreatTextForLayer.frm
... ... @@ -151,7 +151,7 @@ HelpContextID="0"
151 151 CompatibleMode="0"
152 152 MajorVer=7
153 153 MinorVer=4
154   -RevisionVer=4
  154 +RevisionVer=5
155 155 AutoIncrementVer=0
156 156 ServerSupportFiles=0
157 157 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
... ...
trunk/GeoSan.vbw
  Diff comments   View file @949764a
... ... @@ -5,9 +5,9 @@ frmAbout = 0, 0, 0, 0, C, 154, 154, 1273, 886, C
5 5 FrmTypes = 0, 0, 0, 0, C, 176, 176, 1295, 908, C
6 6 FrmMain = 16, 71, 1246, 591, C, 139, 12, 1258, 744, C
7 7 FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C
8   -FrmCadastroRamal = 63, 13, 1453, 742, , 45, 39, 1164, 771, C
  8 +FrmCadastroRamal = 63, 13, 1453, 742, C, 45, 39, 1164, 771, C
9 9 frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C
10   -frmCanvas = 12, 33, 1452, 829, C, 110, 110, 1229, 842, C
  10 +frmCanvas = 12, 33, 1452, 829, , 110, 110, 1229, 842, C
11 11 frmConsumidoresDesabastecidos = 110, 110, 1229, 842, C, 308, 308, 1427, 1040, C
12 12 frmConsumoLote = 150, 150, 1296, 781, C, 330, 330, 1449, 1062, C
13 13 frmConsumoLoteGraf = 175, 175, 1321, 806, C, 352, 352, 1471, 1084, C
... ...
trunk/Modules/Global.bas
  Diff comments   View file @949764a
... ... @@ -200,7 +200,7 @@ Public Sub Main()
200 200 End If
201 201 'Configura a versão atual do GeoSan
202 202 Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision
203   - Versao_Geo = "07.04.04"
  203 + Versao_Geo = "07.04.05"
204 204 glo.diretorioGeoSan = App.path 'salva globalmente o caminho onde encontra-se o GeoSan.exe
205 205 SaveLoadGlobalData glo.diretorioGeoSan + "/controles/variaveisGlobais.txt", True 'salva em um arquivo todas as variáveis globais para poderem ser acessadas por outras aplicações
206 206 connn = ""
... ...