From fb06bd0c3772d6898a8635f0a89600000ffe7d45 Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Fri, 21 Oct 2016 22:07:45 -0200 Subject: [PATCH] 21-10-2016 - GeoSan 7.4.1 - Realizada alteração para corrigir melhorar a forma de atualização dos ramais. --- install/GeoSan/SetupGeoSan-v.06.08.01.exe | Bin 3373998 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.05.exe | Bin 3392358 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.06.exe | Bin 3392731 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.07.exe | Bin 3392370 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.12.exe | Bin 3396841 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.13.exe | Bin 3397980 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.14.exe | Bin 3400020 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.16.exe | Bin 3398654 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.09.17.exe | Bin 3398094 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.00.exe | Bin 3428242 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.09.exe | Bin 3526896 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.13.exe | Bin 3529289 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.14.exe | Bin 3530854 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.15.exe | Bin 3529457 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.20.exe | Bin 3529955 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.21.exe | Bin 3532124 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.34.exe | Bin 4000079 -> 0 bytes install/GeoSan/SetupGeoSan-v.06.10.35.exe | Bin 4000059 -> 0 bytes install/GeoSan/SetupGeoSan-v.07.00.00.exe | Bin 20208453 -> 0 bytes install/GeoSan/SetupGeoSan-v.07.00.48.exe | Bin 25284943 -> 0 bytes install/GeoSan/SetupGeoSan-v.07.00.49.exe | Bin 25284986 -> 0 bytes install/GeoSan/SetupGeoSan-v.07.00.51.exe | Bin 25285174 -> 0 bytes install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe | Bin 4009984 -> 0 bytes install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss | 2 +- trunk/Forms/frmCanvas.frm | 73 ++++++++++++++++++++++++++++++++++--------------------------------------- trunk/GeoSan.exe | Bin 4009984 -> 0 bytes trunk/GeoSan.vbp | 2 +- trunk/Modules/Global.bas | 2 +- 28 files changed, 37 insertions(+), 42 deletions(-) delete mode 100644 install/GeoSan/SetupGeoSan-v.06.08.01.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.05.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.06.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.07.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.12.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.13.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.14.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.16.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.09.17.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.00.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.09.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.13.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.14.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.15.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.20.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.21.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.34.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.06.10.35.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.07.00.00.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.07.00.48.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.07.00.49.exe delete mode 100644 install/GeoSan/SetupGeoSan-v.07.00.51.exe diff --git a/install/GeoSan/SetupGeoSan-v.06.08.01.exe b/install/GeoSan/SetupGeoSan-v.06.08.01.exe deleted file mode 100644 index 1382786..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.08.01.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.05.exe b/install/GeoSan/SetupGeoSan-v.06.09.05.exe deleted file mode 100644 index e02814e..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.05.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.06.exe b/install/GeoSan/SetupGeoSan-v.06.09.06.exe deleted file mode 100644 index a8a9900..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.06.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.07.exe b/install/GeoSan/SetupGeoSan-v.06.09.07.exe deleted file mode 100644 index 03cd64d..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.07.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.12.exe b/install/GeoSan/SetupGeoSan-v.06.09.12.exe deleted file mode 100644 index fa6ceaa..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.12.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.13.exe b/install/GeoSan/SetupGeoSan-v.06.09.13.exe deleted file mode 100644 index 645e25b..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.13.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.14.exe b/install/GeoSan/SetupGeoSan-v.06.09.14.exe deleted file mode 100644 index 6699113..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.14.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.16.exe b/install/GeoSan/SetupGeoSan-v.06.09.16.exe deleted file mode 100644 index 959772d..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.16.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.09.17.exe b/install/GeoSan/SetupGeoSan-v.06.09.17.exe deleted file mode 100644 index 63b5f47..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.09.17.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.00.exe b/install/GeoSan/SetupGeoSan-v.06.10.00.exe deleted file mode 100644 index 408f0c8..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.00.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.09.exe b/install/GeoSan/SetupGeoSan-v.06.10.09.exe deleted file mode 100644 index d899741..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.09.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.13.exe b/install/GeoSan/SetupGeoSan-v.06.10.13.exe deleted file mode 100644 index d358cd6..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.13.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.14.exe b/install/GeoSan/SetupGeoSan-v.06.10.14.exe deleted file mode 100644 index 5e11e02..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.14.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.15.exe b/install/GeoSan/SetupGeoSan-v.06.10.15.exe deleted file mode 100644 index baebdf3..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.15.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.20.exe b/install/GeoSan/SetupGeoSan-v.06.10.20.exe deleted file mode 100644 index 0a6215e..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.20.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.21.exe b/install/GeoSan/SetupGeoSan-v.06.10.21.exe deleted file mode 100644 index 238340e..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.21.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.34.exe b/install/GeoSan/SetupGeoSan-v.06.10.34.exe deleted file mode 100644 index b1072f2..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.34.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.06.10.35.exe b/install/GeoSan/SetupGeoSan-v.06.10.35.exe deleted file mode 100644 index 9200b53..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.06.10.35.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.07.00.00.exe b/install/GeoSan/SetupGeoSan-v.07.00.00.exe deleted file mode 100644 index e10afaa..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.07.00.00.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.07.00.48.exe b/install/GeoSan/SetupGeoSan-v.07.00.48.exe deleted file mode 100644 index f5a1739..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.07.00.48.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.07.00.49.exe b/install/GeoSan/SetupGeoSan-v.07.00.49.exe deleted file mode 100644 index c846a5c..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.07.00.49.exe and /dev/null differ diff --git a/install/GeoSan/SetupGeoSan-v.07.00.51.exe b/install/GeoSan/SetupGeoSan-v.07.00.51.exe deleted file mode 100644 index 781a6ad..0000000 Binary files a/install/GeoSan/SetupGeoSan-v.07.00.51.exe and /dev/null differ diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe index a63f1cd..ec6d393 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 7380f0a..28853b0 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.00" +#define AppVersionFile "07.04.01" [Setup] AppName=GeoSan diff --git a/trunk/Forms/frmCanvas.frm b/trunk/Forms/frmCanvas.frm index c373b17..ef65e19 100644 --- a/trunk/Forms/frmCanvas.frm +++ b/trunk/Forms/frmCanvas.frm @@ -236,7 +236,7 @@ Private Sub InsereLigacaoNoRamalSelecionado(object_id_ramalSelecionado As Long, strAbreConexaoInsereRamaisAguaLigacao = "SELECT NRO_LIGACA, VOL_FATURA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidoreSelecionado) debugCodigoErro = "1 - Select: " & strAbreConexaoInsereRamaisAguaLigacao rsInsereRamaisAguaLigacao.Open strAbreConexaoInsereRamaisAguaLigacao, Conn, adOpenKeyset, adLockOptimistic, adCmdText - 'Inicia a atualização de RAMAIS_AGUA com todos os dados + '2 - Inicia a atualização de RAMAIS_AGUA com todos os dados If rsInsereRamaisAguaLigacao.EOF = False Then 'Tem que encontrar a linha em RAMAIS_AGUA que acabou de ser inserida volumeFaturado = IIf(IsNull(rsInsereRamaisAguaLigacao!VOL_FATURA), 0, rsInsereRamaisAguaLigacao!VOL_FATURA) numeroDaLigacaoComDV = rsInsereRamaisAguaLigacao!NRO_LIGACA @@ -246,7 +246,7 @@ Private Sub InsereLigacaoNoRamalSelecionado(object_id_ramalSelecionado As Long, Conn.execute (strInsereLigacao) rsInsereRamaisAguaLigacao.Close - ' 7 - Apaga NX GPS + '3 - Apaga NX GPS debugCodigoErro = "2" Set rsApagaLigacaoGpsCadastrada = New ADODB.Recordset strApagaLigacaoGpsCadastrada = "SELECT NRO_LIGACA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado) @@ -330,24 +330,39 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A dataCadastroRamal = Now objIdRamalTemporarioDoUsuario = strUser & dataCadastroRamal strAdicionaNovoRamalAgua = "RAMAIS_AGUA" - Set rsAdicionaNovoAtributoRamalAgua = New ADODB.Recordset On Error GoTo Transacao_Erro Conn.BeginTrans rsAdicionaNovoAtributoRamalAgua.Open strAdicionaNovoRamalAgua, Conn, adOpenKeyset, adLockOptimistic - rsAdicionaNovoAtributoRamalAgua.AddNew 'Cria uma nova linha na tabela RAMAIS_AGUA - rsAdicionaNovoAtributoRamalAgua.Fields("OBJECT_ID_").value = objIdRamalTemporarioDoUsuario 'Atualiza o OBJECT_ID_ da tabela RAMAIS_AGUA com o nome do usuário, data e hora (temporáriamente) - rsAdicionaNovoAtributoRamalAgua.Fields("OBJECT_ID_TRECHO").value = object_id_rede 'Atualiza o OBJECT_ID do trecho de rede de água em RAMAIS_AGUA com zero (temporariamente) + rsAdicionaNovoAtributoRamalAgua.AddNew 'Cria uma nova linha na tabela RAMAIS_AGUA + rsAdicionaNovoAtributoRamalAgua.Fields("OBJECT_ID_").value = objIdRamalTemporarioDoUsuario 'Atualiza o OBJECT_ID_ da tabela RAMAIS_AGUA com o nome do usuário, data e hora (temporáriamente) + rsAdicionaNovoAtributoRamalAgua.Fields("OBJECT_ID_TRECHO").value = object_id_rede 'Atualiza o OBJECT_ID do trecho de rede de água em RAMAIS_AGUA com zero (temporariamente) rsAdicionaNovoAtributoRamalAgua.Fields("DATA_LOG").value = dataCadastroRamal - rsAdicionaNovoAtributoRamalAgua.Update 'Atualiza no banco de dados a tabela RAMAIS_AGUA - 'FINALIZA RAMAIS_AGUA - idUnicoRamaisAgua = rsAdicionaNovoAtributoRamalAgua.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 - rsAdicionaNovoAtributoRamalAgua.Close 'Termina de adicionar a linha do ramal de água com os dados temporários da mesma + rsAdicionaNovoAtributoRamalAgua!USUARIO_LOG = strUser 'Salva o nome do usuário + rsAdicionaNovoAtributoRamalAgua.Update 'Atualiza no banco de dados a tabela RAMAIS_AGUA + rsAdicionaNovoAtributoRamalAgua.Close Conn.CommitTrans + + '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 - - '2 - Adiciona geometria da linha de ramal de água + Set rsAtualizaDadosDoRamal = New ADODB.Recordset + strAtualizaObjIdRamal = "SELECT * FROM RAMAIS_AGUA WHERE OBJECT_ID_ = '" + objIdRamalTemporarioDoUsuario + "'" debugCodigoErro = "1" + 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 + rsAtualizaDadosDoRamal!USUARIO_LOG = strUser 'Salva o nome do usuário + rsAtualizaDadosDoRamal.Update + End If + rsAtualizaDadosDoRamal.Close + Conn.CommitTrans + On Error GoTo Trata_Erro + + '3 - Adiciona geometria da linha de ramal de água + debugCodigoErro = "2" retornoPontoGPS = TeDatabase1.setCurrentLayer("NXGS_V_LIG_COMERCIAL_GPS") TeDatabase1.getCenterGeometry 0, stringObject_id_ligacaoGPS, TypeGeometry.points, coordX_pontoGPS, coordY_pontoGPS retornoPontoGPS = TeDatabase1.setCurrentLayer("WATERLINES") @@ -359,37 +374,17 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A retornoPontoGPS = TeDatabase1.setCurrentLayer("RAMAIS_AGUA") retornoAdicionaLinhaRamal = TeDatabase1.addLine(idUnicoRamaisAgua, linhaRamalX(0), linhaRamalY(0), 2) - On Error GoTo Trata_Erro '4 - Adiciona geometria do ponto ao ramail debugCodigoErro = "3" retornoPontoDoRamalInserido = TeDatabase1.addPoint(idUnicoRamaisAgua, coordX_pontoGPS, coordY_pontoGPS) - ' 4 - Atualiza os dados de RAMAIS_AGUA inclusive com o OBJECT_ID do trecho de rede e OBJECT_ID do ramal - 'BOM, até agora ele criou uma linha em RAMAIS_AGUA, e inseriu as geometrias de linha (LINES7) e ponto (POINTS7) do ramal. Então tem agora que atualizar a linha recem inserida em RAMAIS_AGUA com os dados do ramal - - Set rsAtualizaDadosDoRamal = New ADODB.Recordset - strAtualizaObjIdRamal = "SELECT * FROM RAMAIS_AGUA WHERE OBJECT_ID_ = '" + objIdRamalTemporarioDoUsuario + "'" - debugCodigoErro = "4" + '5 - Insere em RAMAIS_AGUA_LIGACAO a ligação selecionada pelo usuário On Error GoTo Transacao_Erro Conn.BeginTrans - rsAtualizaDadosDoRamal.Open strAtualizaObjIdRamal, Conn, adOpenKeyset, adLockOptimistic, adCmdText - 'Inicia a atualização de RAMAIS_AGUA com todos os dados - If rsAtualizaDadosDoRamal.EOF = False Then 'Tem que encontrar a linha em RAMAIS_AGUA que acabou de ser inserida - 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 - rsAtualizaDadosDoRamal!USUARIO_LOG = strUser 'Salva o nome do usuário - rsAtualizaDadosDoRamal.Update - End If - rsAtualizaDadosDoRamal.Close - Conn.CommitTrans - On Error GoTo Trata_Erro - - ' 6 - Insere em RAMAIS_AGUA_LIGACAO a ligação selecionada pelo usuário - On Error GoTo Transacao_Erro - Conn.BeginTrans - debugCodigoErro = "6" + debugCodigoErro = "4" Set rsInsereRamaisAguaLigacao = New ADODB.Recordset strAbreConexaoInsereRamaisAguaLigacao = "SELECT NRO_LIGACA, VOL_FATURA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado) - debugCodigoErro = "6 - Select: " & strAbreConexaoInsereRamaisAguaLigacao + debugCodigoErro = "5 - Select: " & strAbreConexaoInsereRamaisAguaLigacao rsInsereRamaisAguaLigacao.Open strAbreConexaoInsereRamaisAguaLigacao, Conn, adOpenKeyset, adLockOptimistic, adCmdText 'Inicia a atualização de RAMAIS_AGUA com todos os dados If rsInsereRamaisAguaLigacao.EOF = False Then 'Tem que encontrar a linha em RAMAIS_AGUA que acabou de ser inserida @@ -401,20 +396,20 @@ Private Sub InsereRamalLigacaoGPS(object_id_ligacaoGPS As Long, object_id_rede A Conn.execute (strInsereLigacao) rsInsereRamaisAguaLigacao.Close - ' 7 - Apaga NX GPS - debugCodigoErro = "7" + '6 - Apaga NX GPS + debugCodigoErro = "6" Set rsApagaLigacaoGpsCadastrada = New ADODB.Recordset strApagaLigacaoGpsCadastrada = "SELECT NRO_LIGACA FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado) rsApagaLigacaoGpsCadastrada.Open strAbreConexaoInsereRamaisAguaLigacao, Conn, adOpenKeyset, adLockOptimistic, adCmdText strApagaLigacaoGpsCadastrada = "DELETE FROM NXGS_V_LIG_COMERCIAL_GPS WHERE object_id_331 = " + CStr(object_id_consumidorSelecionado) Conn.execute (strApagaLigacaoGpsCadastrada) - debugCodigoErro = "8" + debugCodigoErro = "7" strApagaGeometriaDaLigacaoGpsCadastrada = "DELETE FROM POINTS331 WHERE object_id = " + CStr(object_id_consumidorSelecionado) Conn.execute (strApagaGeometriaDaLigacaoGpsCadastrada) rsApagaLigacaoGpsCadastrada.Close Conn.CommitTrans On Error GoTo Trata_Erro - debugCodigoErro = "9" + debugCodigoErro = "8" TCanvas.plotView Exit Sub diff --git a/trunk/GeoSan.exe b/trunk/GeoSan.exe index a63f1cd..ec6d393 100644 Binary files a/trunk/GeoSan.exe and b/trunk/GeoSan.exe differ diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index e9420a2..416ed53 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -151,7 +151,7 @@ HelpContextID="0" CompatibleMode="0" MajorVer=7 MinorVer=4 -RevisionVer=0 +RevisionVer=1 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index 1152ef5..b09873f 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.00" + Versao_Geo = "07.04.01" 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