1
Download as
Browse Code »

Commit e4f899b6b577ae585443a29a7f365a7626ef19fb

Authored by José Maria Villac Pinheiro
1 parent 82ebafdd
Exists in master

26-10-2016 - GeoSan 7.4.3 - Correção de travamento quando cadastrava mais de 32 mil ramais.

Showing 9 changed files with 32 additions and 32 deletions   Show diff stats
install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe
View file @e4f899b
No preview for this file type
install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss
  Diff comments   View file @e4f899b
1 1 #define SetupBaseName "SetupGeoSan-v."
2   -#define AppVersionFile "07.04.01"
  2 +#define AppVersionFile "07.04.03"
3 3  
4 4 [Setup]
5 5 AppName=GeoSan
... ...
install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.04.03.exe 0 → 100644
View file @e4f899b
No preview for this file type
trunk/Forms/frmCanvas.frm
  Diff comments   View file @e4f899b
... ... @@ -269,15 +269,13 @@ Trata_Erro:
269 269 Resume Next
270 270 Else
271 271 ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails
272   - End
273 272 End If
274 273 Exit Sub
275 274  
276 275 Transacao_Erro:
277 276 Conn.RollbackTrans
278   - Conn.Close
  277 + 'Conn.Close
279 278 ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails
280   - End
281 279 Exit Sub
282 280 End Sub
283 281  
... ... @@ -296,7 +294,7 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A
296 294 Dim rsAtualizaDadosLinhaRamal As ADODB.Recordset
297 295 Dim rsInsereRamaisAguaLigacao As ADODB.Recordset
298 296 Dim rsApagaLigacaoGpsCadastrada As ADODB.Recordset
299   - Dim idUnicoRamaisAgua As Integer
  297 + Dim idUnicoRamaisAgua As Long
300 298 Dim retornoLinhaPerpendicular As Long
301 299 Dim pontoSobreALinha As Long
302 300 Dim comprimentoDoRamal As Double
... ... @@ -319,7 +317,7 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A
319 317 Dim strApagaLigacaoGpsCadastrada As String
320 318 Dim strApagaGeometriaDaLigacaoGpsCadastrada As String
321 319 Dim retornoPontoDoRamalInserido As Long
322   - Dim geomIdRamal As Integer
  320 + Dim geomIdRamal As Long
323 321 Dim volumeFaturado As Double
324 322 Dim numeroDaLigacaoComDV As String
325 323  
... ... @@ -342,19 +340,23 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A
342 340 rsAdicionaNovoAtributoRamalAgua.Update 'Atualiza no banco de dados a tabela RAMAIS_AGUA
343 341 rsAdicionaNovoAtributoRamalAgua.Close
344 342 Conn.CommitTrans
  343 + debugCodigoErro = debugCodigoErro + " " + objIdRamalTemporarioDoUsuario
345 344  
346 345 '2 - Atualiza os dados de RAMAIS_AGUA inclusive com o OBJECT_ID do trecho de rede e OBJECT_ID do ramal
347 346 On Error GoTo Trata_Erro
348 347 Set rsAtualizaDadosDoRamal = New ADODB.Recordset
349 348 strAtualizaObjIdRamal = "SELECT * FROM RAMAIS_AGUA WHERE OBJECT_ID_ = '" + objIdRamalTemporarioDoUsuario + "'"
350   - debugCodigoErro = "1"
  349 + debugCodigoErro = "1" + " - " + strAtualizaObjIdRamal
351 350 On Error GoTo Transacao_Erro
352 351 Conn.BeginTrans
353 352 rsAtualizaDadosDoRamal.Open strAtualizaObjIdRamal, Conn, adOpenKeyset, adLockOptimistic, adCmdText
354 353 If rsAtualizaDadosDoRamal.EOF = False Then 'Tem que encontrar a linha em RAMAIS_AGUA que acabou de ser inserida
355 354 idUnicoRamaisAgua = rsAtualizaDadosDoRamal.Fields("ID").value 'Obtem o ID da nova linha inserida em RAMAIS_AGUA (que foi gerado automaticamente, para poder depois localizar este ramal e colocar os demais dados na tabela de atributos dele
356   - rsAtualizaDadosDoRamal!Object_id_ = idUnicoRamaisAgua 'ID autonumérico da tabela Ramais 'Agora coloca o OBJECT_ID do ramal correto, o anterior tinha o nome do usuário-data-hora
  355 + debugCodigoErro = debugCodigoErro + " idUnicoRamaisAgua: " + CStr(idUnicoRamaisAgua)
  356 + rsAtualizaDadosDoRamal!Object_id_ = CStr(idUnicoRamaisAgua) 'ID autonumérico da tabela Ramais 'Agora coloca o OBJECT_ID do ramal correto, o anterior tinha o nome do usuário-data-hora
  357 + debugCodigoErro = debugCodigoErro + " object_id_: " + rsAtualizaDadosDoRamal!Object_id_
357 358 rsAtualizaDadosDoRamal!USUARIO_LOG = strUser 'Salva o nome do usuário
  359 + debugCodigoErro = debugCodigoErro + " strUser: " + rsAtualizaDadosDoRamal!USUARIO_LOG
358 360 rsAtualizaDadosDoRamal.Update
359 361 End If
360 362 rsAtualizaDadosDoRamal.Close
... ... @@ -419,15 +421,13 @@ Trata_Erro:
419 421 Resume Next
420 422 Else
421 423 ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails
422   - End
423 424 End If
424 425 Exit Sub
425 426  
426 427 Transacao_Erro:
427 428 Conn.RollbackTrans
428   - Conn.Close
  429 + 'Conn.Close
429 430 ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails
430   - End
431 431 Exit Sub
432 432 End Sub
433 433  
... ...
trunk/Forms/frmMain.frm
  Diff comments   View file @e4f899b
... ... @@ -320,7 +320,7 @@ Begin VB.MDIForm FrmMain
320 320 AutoSize = 2
321 321 Object.Width = 3519
322 322 MinWidth = 3528
323   - TextSave = "10:54"
  323 + TextSave = "10:02"
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
... ... @@ -1915,12 +1915,12 @@ Private Sub mnuImagem_Click()
1915 1915  
1916 1916 'Se nao houver canvas aberto não é possivel exportar nada...
1917 1917 If FrmMain.Tag > 0 Then
1918   - With CDL
  1918 + With Cdl
1919 1919 .FileName = ""
1920 1920 .Filter = "Bitmap (*.bmp)|*.bmp | GIF (*.gif) | *.gif | JPG (*.jpg) | *.jpg | PNG (*.png) | *.png | TIF (*.tif) | *.tif"
1921 1921 .ShowOpen
1922 1922 If .FileName <> "" Then
1923   - ActiveForm.TCanvas.saveImageToFile CDL.FileName, .FilterIndex - 1
  1923 + ActiveForm.TCanvas.saveImageToFile Cdl.FileName, .FilterIndex - 1
1924 1924 End If
1925 1925 End With
1926 1926 Else
... ... @@ -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  
... ...
trunk/GeoSan.exe
View file @e4f899b
No preview for this file type
trunk/GeoSan.vbp
  Diff comments   View file @e4f899b
... ... @@ -151,7 +151,7 @@ HelpContextID=&quot;0&quot;
151 151 CompatibleMode="0"
152 152 MajorVer=7
153 153 MinorVer=4
154   -RevisionVer=1
  154 +RevisionVer=3
155 155 AutoIncrementVer=0
156 156 ServerSupportFiles=0
157 157 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
... ...
trunk/GeoSan.vbw
  Diff comments   View file @e4f899b
1   -Global = 78, 7, 979, 602, Z
  1 +Global = 78, 7, 979, 602,
2 2 calcDetecta = 0, 0, 0, 0, C
3 3 FrmCreatTextForLayer = 0, 0, 0, 0, C, 132, 132, 1251, 864, C
4 4 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   -FrmMain = -209, 52, 1021, 665, C, -107, 100, 1012, 832, C
7   -FrmAssociation = 39, 209, 1277, 778, C, 220, 220, 1339, 952, C
8   -FrmCadastroRamal = -448, 44, 942, 773, C, 45, 39, 1164, 771, C
  6 +FrmMain = 16, 71, 1246, 591, C, 139, 12, 1258, 744, C
  7 +FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C
  8 +FrmCadastroRamal = -55, 4, 1335, 733, C, 45, 39, 1164, 771, C
9 9 frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C
10   -frmCanvas = -74, 93, 1045, 858, , 110, 110, 1229, 842, C
  10 +frmCanvas = 12, 33, 1452, 829, C, 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
... ... @@ -22,8 +22,8 @@ frmImportFile = 0, 0, 0, 0, C, 154, 154, 1273, 886, C
22 22 FrmManufactures = 0, 0, 0, 0, C, 176, 176, 1295, 908, C
23 23 FrmMsg = 0, 0, 0, 0, C, 198, 198, 1317, 930, C
24 24 frmNetWorkLegth = 50, 50, 1009, 463, C, 220, 220, 1339, 952, C
25   -FrmPesquisaCliente = 200, 200, 1346, 831, C, 242, 242, 1361, 974, C
26   -FrmProcess = 0, 0, 0, 0, C, 264, 264, 1383, 996, C
  25 +FrmPesquisaCliente = -302, 86, 844, 717, C, 242, 242, 1361, 974, C
  26 +FrmProcess = 0, 0, 842, 450, C, 264, 264, 1383, 996, C
27 27 frmProgressBar = 0, 0, 0, 0, C, 286, 286, 1405, 1018, C
28 28 frmProjection = 0, 0, 0, 0, C, 308, 308, 1427, 1040, C
29 29 FrmRemoverPlano = 0, 0, 0, 0, C, 330, 330, 1449, 1062, C
... ... @@ -33,7 +33,7 @@ FrmSelectTypes = 0, 0, 0, 0, C, 22, 22, 1141, 754, C
33 33 FrmSubTypes = 0, 0, 0, 0, C, 44, 44, 1163, 776, C
34 34 FrmSuppliers = 0, 0, 0, 0, C, 66, 66, 1185, 798, C
35 35 FrmSuppliersSub = 0, 0, 0, 0, C, 88, 88, 1207, 820, C
36   -clsTerraLib = 56, 35, 1052, 839,
  36 +clsTerraLib = 1, -9, 997, 795, C
37 37 clsEPACurves = 0, 0, 0, 0, C
38 38 clsEPAPatterns = 0, 0, 0, 0, C
39 39 clsGeoReference = 132, 132, 1251, 864, C
... ... @@ -61,7 +61,7 @@ frmLoginTema = 0, 0, 0, 0, C, 88, 88, 1207, 820, C
61 61 mdlRelatoriosProdutividade = 286, 286, 1405, 1018, C
62 62 frmPageSetup = 0, 0, 0, 0, C, 110, 110, 1229, 842, C
63 63 Form1 = 0, 0, 0, 0, C, 132, 132, 1251, 864, C
64   -frmEncontraConsumidor = 0, 0, 0, 0, C, 154, 154, 1273, 886, C
  64 +frmEncontraConsumidor = 125, 125, 967, 575, C, 154, 154, 1273, 886, C
65 65 clsTeCanvas = 44, 44, 1163, 776, C
66 66 frmCadastroRamalAutoLote = 0, 0, 0, 0, C, 176, 176, 1295, 908, C
67 67 frmRelAvanComando = 0, 0, 0, 0, C, 198, 198, 1317, 930, C
... ...
trunk/Modules/Global.bas
  Diff comments   View file @e4f899b
... ... @@ -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.01"
  203 + Versao_Geo = "07.04.03"
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 = ""
... ...