From e4f899b6b577ae585443a29a7f365a7626ef19fb Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Wed, 26 Oct 2016 17:51:41 -0200 Subject: [PATCH] 26-10-2016 - GeoSan 7.4.3 - Correção de travamento quando cadastrava mais de 32 mil ramais. --- install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe | Bin 4009984 -> 0 bytes install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss | 2 +- install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.04.03.exe | Bin 0 -> 25304218 bytes trunk/Forms/frmCanvas.frm | 20 ++++++++++---------- trunk/Forms/frmMain.frm | 20 ++++++++++---------- trunk/GeoSan.exe | Bin 4009984 -> 0 bytes trunk/GeoSan.vbp | 2 +- trunk/GeoSan.vbw | 18 +++++++++--------- trunk/Modules/Global.bas | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.04.03.exe diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe index ec6d393..faffa96 100644 Binary files a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe and b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe differ diff --git a/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss b/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss index 28853b0..f0e73d8 100644 --- a/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss +++ b/install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss @@ -1,5 +1,5 @@ #define SetupBaseName "SetupGeoSan-v." -#define AppVersionFile "07.04.01" +#define AppVersionFile "07.04.03" [Setup] AppName=GeoSan diff --git a/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.04.03.exe b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.04.03.exe new file mode 100644 index 0000000..42f1430 Binary files /dev/null and b/install/GeraSetupGeoSan/Output/SetupGeoSan-v.07.04.03.exe differ diff --git a/trunk/Forms/frmCanvas.frm b/trunk/Forms/frmCanvas.frm index ef65e19..db53bf3 100644 --- a/trunk/Forms/frmCanvas.frm +++ b/trunk/Forms/frmCanvas.frm @@ -269,15 +269,13 @@ Trata_Erro: Resume Next Else ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails - End End If Exit Sub Transacao_Erro: Conn.RollbackTrans - Conn.Close + 'Conn.Close ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails - End Exit Sub End Sub @@ -296,7 +294,7 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A Dim rsAtualizaDadosLinhaRamal As ADODB.Recordset Dim rsInsereRamaisAguaLigacao As ADODB.Recordset Dim rsApagaLigacaoGpsCadastrada As ADODB.Recordset - Dim idUnicoRamaisAgua As Integer + Dim idUnicoRamaisAgua As Long Dim retornoLinhaPerpendicular As Long Dim pontoSobreALinha As Long Dim comprimentoDoRamal As Double @@ -319,7 +317,7 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A Dim strApagaLigacaoGpsCadastrada As String Dim strApagaGeometriaDaLigacaoGpsCadastrada As String Dim retornoPontoDoRamalInserido As Long - Dim geomIdRamal As Integer + Dim geomIdRamal As Long Dim volumeFaturado As Double Dim numeroDaLigacaoComDV As String @@ -342,19 +340,23 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A rsAdicionaNovoAtributoRamalAgua.Update 'Atualiza no banco de dados a tabela RAMAIS_AGUA rsAdicionaNovoAtributoRamalAgua.Close Conn.CommitTrans + debugCodigoErro = debugCodigoErro + " " + objIdRamalTemporarioDoUsuario '2 - Atualiza os dados de RAMAIS_AGUA inclusive com o OBJECT_ID do trecho de rede e OBJECT_ID do ramal On Error GoTo Trata_Erro Set rsAtualizaDadosDoRamal = New ADODB.Recordset strAtualizaObjIdRamal = "SELECT * FROM RAMAIS_AGUA WHERE OBJECT_ID_ = '" + objIdRamalTemporarioDoUsuario + "'" - debugCodigoErro = "1" + debugCodigoErro = "1" + " - " + strAtualizaObjIdRamal On Error GoTo Transacao_Erro Conn.BeginTrans rsAtualizaDadosDoRamal.Open strAtualizaObjIdRamal, Conn, adOpenKeyset, adLockOptimistic, adCmdText If rsAtualizaDadosDoRamal.EOF = False Then 'Tem que encontrar a linha em RAMAIS_AGUA que acabou de ser inserida 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 - 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 + debugCodigoErro = debugCodigoErro + " idUnicoRamaisAgua: " + CStr(idUnicoRamaisAgua) + 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 + debugCodigoErro = debugCodigoErro + " object_id_: " + rsAtualizaDadosDoRamal!Object_id_ rsAtualizaDadosDoRamal!USUARIO_LOG = strUser 'Salva o nome do usuário + debugCodigoErro = debugCodigoErro + " strUser: " + rsAtualizaDadosDoRamal!USUARIO_LOG rsAtualizaDadosDoRamal.Update End If rsAtualizaDadosDoRamal.Close @@ -419,15 +421,13 @@ Trata_Erro: Resume Next Else ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails - End End If Exit Sub Transacao_Erro: Conn.RollbackTrans - Conn.Close + 'Conn.Close ErroUsuario.Registra "frmCanvas", "InsereRamalLigacaoGPS - Código Erro: " & debugCodigoErro, CStr(Err.Number), CStr(Err.Description), True, glo.enviaEmails - End Exit Sub End Sub diff --git a/trunk/Forms/frmMain.frm b/trunk/Forms/frmMain.frm index 73fb012..56741c5 100644 --- a/trunk/Forms/frmMain.frm +++ b/trunk/Forms/frmMain.frm @@ -320,7 +320,7 @@ Begin VB.MDIForm FrmMain AutoSize = 2 Object.Width = 3519 MinWidth = 3528 - TextSave = "10:54" + TextSave = "10:02" 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 @@ -1915,12 +1915,12 @@ Private Sub mnuImagem_Click() 'Se nao houver canvas aberto não é possivel exportar nada... If FrmMain.Tag > 0 Then - With CDL + With Cdl .FileName = "" .Filter = "Bitmap (*.bmp)|*.bmp | GIF (*.gif) | *.gif | JPG (*.jpg) | *.jpg | PNG (*.png) | *.png | TIF (*.tif) | *.tif" .ShowOpen If .FileName <> "" Then - ActiveForm.TCanvas.saveImageToFile CDL.FileName, .FilterIndex - 1 + ActiveForm.TCanvas.saveImageToFile Cdl.FileName, .FilterIndex - 1 End If End With Else @@ -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 diff --git a/trunk/GeoSan.exe b/trunk/GeoSan.exe index ec6d393..faffa96 100644 Binary files a/trunk/GeoSan.exe and b/trunk/GeoSan.exe differ diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index 416ed53..ece7315 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -151,7 +151,7 @@ HelpContextID="0" CompatibleMode="0" MajorVer=7 MinorVer=4 -RevisionVer=1 +RevisionVer=3 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/GeoSan.vbw b/trunk/GeoSan.vbw index 05ee989..1762814 100644 --- a/trunk/GeoSan.vbw +++ b/trunk/GeoSan.vbw @@ -1,13 +1,13 @@ -Global = 78, 7, 979, 602, Z +Global = 78, 7, 979, 602, calcDetecta = 0, 0, 0, 0, C FrmCreatTextForLayer = 0, 0, 0, 0, C, 132, 132, 1251, 864, C frmAbout = 0, 0, 0, 0, C, 154, 154, 1273, 886, C FrmTypes = 0, 0, 0, 0, C, 176, 176, 1295, 908, C -FrmMain = -209, 52, 1021, 665, C, -107, 100, 1012, 832, C -FrmAssociation = 39, 209, 1277, 778, C, 220, 220, 1339, 952, C -FrmCadastroRamal = -448, 44, 942, 773, C, 45, 39, 1164, 771, C +FrmMain = 16, 71, 1246, 591, C, 139, 12, 1258, 744, C +FrmAssociation = 35, 68, 1273, 637, C, 220, 220, 1339, 952, C +FrmCadastroRamal = -55, 4, 1335, 733, C, 45, 39, 1164, 771, C frmCadastroRamalFiltro = 100, 100, 1246, 731, C, 264, 264, 1383, 996, C -frmCanvas = -74, 93, 1045, 858, , 110, 110, 1229, 842, C +frmCanvas = 12, 33, 1452, 829, C, 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 @@ -22,8 +22,8 @@ frmImportFile = 0, 0, 0, 0, C, 154, 154, 1273, 886, C FrmManufactures = 0, 0, 0, 0, C, 176, 176, 1295, 908, C FrmMsg = 0, 0, 0, 0, C, 198, 198, 1317, 930, C frmNetWorkLegth = 50, 50, 1009, 463, C, 220, 220, 1339, 952, C -FrmPesquisaCliente = 200, 200, 1346, 831, C, 242, 242, 1361, 974, C -FrmProcess = 0, 0, 0, 0, C, 264, 264, 1383, 996, C +FrmPesquisaCliente = -302, 86, 844, 717, C, 242, 242, 1361, 974, C +FrmProcess = 0, 0, 842, 450, C, 264, 264, 1383, 996, C frmProgressBar = 0, 0, 0, 0, C, 286, 286, 1405, 1018, C frmProjection = 0, 0, 0, 0, C, 308, 308, 1427, 1040, C 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 FrmSubTypes = 0, 0, 0, 0, C, 44, 44, 1163, 776, C FrmSuppliers = 0, 0, 0, 0, C, 66, 66, 1185, 798, C FrmSuppliersSub = 0, 0, 0, 0, C, 88, 88, 1207, 820, C -clsTerraLib = 56, 35, 1052, 839, +clsTerraLib = 1, -9, 997, 795, C clsEPACurves = 0, 0, 0, 0, C clsEPAPatterns = 0, 0, 0, 0, C clsGeoReference = 132, 132, 1251, 864, C @@ -61,7 +61,7 @@ frmLoginTema = 0, 0, 0, 0, C, 88, 88, 1207, 820, C mdlRelatoriosProdutividade = 286, 286, 1405, 1018, C frmPageSetup = 0, 0, 0, 0, C, 110, 110, 1229, 842, C Form1 = 0, 0, 0, 0, C, 132, 132, 1251, 864, C -frmEncontraConsumidor = 0, 0, 0, 0, C, 154, 154, 1273, 886, C +frmEncontraConsumidor = 125, 125, 967, 575, C, 154, 154, 1273, 886, C clsTeCanvas = 44, 44, 1163, 776, C frmCadastroRamalAutoLote = 0, 0, 0, 0, C, 176, 176, 1295, 908, C frmRelAvanComando = 0, 0, 0, 0, C, 198, 198, 1317, 930, C diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index b09873f..691ecfe 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.01" + Versao_Geo = "07.04.03" 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