From 3f888c3560128cad37982a82648eced89e05c7e7 Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Fri, 24 Jun 2022 19:32:09 -0300 Subject: [PATCH] Feitas alterações em todos os outros módulos do GeoSan, mas o de exportar apresenta erros na exportação. Precisa corrigir. Foram deixados os executáveis do Exporte EPANet.exe que são antigos e não refletem este código. Provavelmente este executável provem do branch master, o que será investigado. --- install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSanIni.exe | Bin 163840 -> 0 bytes install/GeraSetupGeoSan/ArquivosInstGeoSan/NSecurity.dll | Bin 131072 -> 0 bytes install/GeraSetupGeoSan/ArquivosInstGeoSan/NxViewManager2.ocx | Bin 475136 -> 0 bytes install/GeraSetupGeoSan/ArquivosInstGeoSan/Updates.txt | 4 ++-- trunk/Exporte EPANet.exe | Bin 237568 -> 0 bytes trunk/Forms/GeoSan.vbp | 2 +- trunk/Forms/frmCadastroRamalAgua.frm | 2 +- trunk/Forms/frmCadastroRamalEsgoto.frm | 2 +- trunk/Forms/frmVerificaConectividade.frm | 2 +- trunk/GeoSan.vbp | 2 +- trunk/GeoSanIni.exe | Bin 163840 -> 0 bytes trunk/Projeto_AtualizaApp/GeoSanIni.exe | Bin 163840 -> 0 bytes trunk/Projeto_AtualizaApp/GeoSanIni.vbp | 8 ++++---- trunk/Projeto_AtualizaApp/classes/CEmail.cls | 2 +- trunk/Projeto_AtualizaApp/forms/frmAtualiza.frm | 2 +- trunk/Projeto_AtualizaApp/modules/CAtualiza.cls | 2 +- trunk/Projeto_ExportEpaNe/Classes/RedeBancoDados.cls | 4 +++- trunk/Projeto_ExportEpaNe/Classes/TrechosRedeEpanet.cls | 29 ++++++++++++++++++++++++----- trunk/Projeto_ExportEpaNe/EpanetExport.vbp | 20 ++++++++++---------- trunk/Projeto_NSecurity/NSecurity.dll | Bin 131072 -> 0 bytes trunk/Projeto_NSecurity/NSecurity.exp | Bin 1006 -> 0 bytes trunk/Projeto_NSecurity/NSecurity.lib | Bin 2626 -> 0 bytes trunk/Projeto_NSecurity/NSecurity.vbp | 16 ++++++++-------- trunk/Projeto_NxConnection/Connection.vbp | 6 +++--- trunk/Projeto_NxViewmanager/NxViewManager.vbp | 6 +++--- trunk/Projeto_NxViewmanager/NxViewManager2.exp | Bin 1029 -> 0 bytes trunk/Projeto_NxViewmanager/NxViewManager2.lib | Bin 2734 -> 0 bytes trunk/Projeto_NxViewmanager/NxViewManager2.oca | Bin 19968 -> 0 bytes trunk/Projeto_NxViewmanager/NxViewManager2.ocx | Bin 475136 -> 0 bytes trunk/Projeto_NxViewmanager/ViewManager.ctl | 2 +- trunk/Projeto_NxViewmanager/frmTheme.frm | 2 +- trunk/Updates.txt | 4 ++-- 32 files changed, 69 insertions(+), 48 deletions(-) diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSanIni.exe b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSanIni.exe index 8e3eac0..6043b26 100644 Binary files a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSanIni.exe and b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSanIni.exe differ diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/NSecurity.dll b/install/GeraSetupGeoSan/ArquivosInstGeoSan/NSecurity.dll index 950f85d..ecf100a 100644 Binary files a/install/GeraSetupGeoSan/ArquivosInstGeoSan/NSecurity.dll and b/install/GeraSetupGeoSan/ArquivosInstGeoSan/NSecurity.dll differ diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/NxViewManager2.ocx b/install/GeraSetupGeoSan/ArquivosInstGeoSan/NxViewManager2.ocx index 41b83e8..4a16cfb 100644 Binary files a/install/GeraSetupGeoSan/ArquivosInstGeoSan/NxViewManager2.ocx and b/install/GeraSetupGeoSan/ArquivosInstGeoSan/NxViewManager2.ocx differ diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/Updates.txt b/install/GeraSetupGeoSan/ArquivosInstGeoSan/Updates.txt index 89bc711..c33922a 100644 --- a/install/GeraSetupGeoSan/ArquivosInstGeoSan/Updates.txt +++ b/install/GeraSetupGeoSan/ArquivosInstGeoSan/Updates.txt @@ -1,2 +1,2 @@ -GeoSan.exe;c:\tempApp;7.0.0.30;C:\Arquivos de programas\GeoSan -GeoSanIni.exe;c:\tempApp;2.0.0.1;C:\Arquivos de programas\GeoSan \ No newline at end of file +GeoSan.exe;c:\tempApp;7.0.0.1;C:\Program Files\GeoSan +GeoSanIni.exe;c:\tempApp;2.0.0.0;C:\Program Files\GeoSan \ No newline at end of file diff --git a/trunk/Exporte EPANet.exe b/trunk/Exporte EPANet.exe index 4b827b8..97b1696 100644 Binary files a/trunk/Exporte EPANet.exe and b/trunk/Exporte EPANet.exe differ diff --git a/trunk/Forms/GeoSan.vbp b/trunk/Forms/GeoSan.vbp index c50be98..89bbbb9 100644 --- a/trunk/Forms/GeoSan.vbp +++ b/trunk/Forms/GeoSan.vbp @@ -9,7 +9,7 @@ Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\..\..\..\..\W Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\..\..\..\..\WINDOWS\system32\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP6) Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#..\..\..\..\..\..\..\WINDOWS\system32\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4) Object={2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0; TeComImport.dll -Reference=*\G{00025E01-0000-0000-C000-000000000046}#5.0#0#..\..\..\..\..\..\..\Arquivos de programas\Arquivos comuns\Microsoft Shared\DAO\dao360.dll#Microsoft DAO 3.6 Object Library +Reference=*\G{00025E01-0000-0000-C000-000000000046}#5.0#0#..\..\..\..\..\..\..\Program Files\Arquivos comuns\Microsoft Shared\DAO\dao360.dll#Microsoft DAO 3.6 Object Library Object={F141AAE7-BD4C-4793-88DB-10FE8CBA518C}#1.0#0; TeComPrinter.dll Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#..\..\..\..\..\..\..\DLL\GeoSan\NexusConnection.dll#NexusConnection diff --git a/trunk/Forms/frmCadastroRamalAgua.frm b/trunk/Forms/frmCadastroRamalAgua.frm index 710c340..69b4499 100644 --- a/trunk/Forms/frmCadastroRamalAgua.frm +++ b/trunk/Forms/frmCadastroRamalAgua.frm @@ -599,7 +599,7 @@ On Error GoTo Trata_Erro retval = Dir(App.Path & "\Controles\FRamais.txt") If retval <> "" Then 'verifica se o arquivo existe na pasta Open App.Path & "\Controles\FRamais.txt" For Input As #3 - 'Open "C:\ARQUIVOS DE PROGRAMAS\GEOSAN\Controles\FRamais.txt" For Input As #3 + 'Open "C:\Program Files\GEOSAN\Controles\FRamais.txt" For Input As #3 'Do While Not EOF(3) = True Do While Not EOF(3) Line Input #3, str diff --git a/trunk/Forms/frmCadastroRamalEsgoto.frm b/trunk/Forms/frmCadastroRamalEsgoto.frm index c155a73..bb593ae 100644 --- a/trunk/Forms/frmCadastroRamalEsgoto.frm +++ b/trunk/Forms/frmCadastroRamalEsgoto.frm @@ -526,7 +526,7 @@ Attribute VB_Exposed = False ' retval = Dir(App.path & "\Controles\FRamais.txt") ' If retval <> "" Then 'verifica se o arquivo existe na pasta ' Open App.path & "\Controles\FRamais.txt" For Input As #3 -' 'Open "C:\ARQUIVOS DE PROGRAMAS\GEOSAN\Controles\FRamais.txt" For Input As #3 +' 'Open "C:\Program Files\GEOSAN\Controles\FRamais.txt" For Input As #3 ' 'Do While Not EOF(3) = True ' Do While Not EOF(3) ' Line Input #3, str diff --git a/trunk/Forms/frmVerificaConectividade.frm b/trunk/Forms/frmVerificaConectividade.frm index b2f1c62..e823994 100644 --- a/trunk/Forms/frmVerificaConectividade.frm +++ b/trunk/Forms/frmVerificaConectividade.frm @@ -189,7 +189,7 @@ Private Sub Form_Load() TeDatabase1.Connection = Conn 'usa a variável global para identificar a conexão TeDatabase1.setCurrentLayer ("WATERLINES") - Text1.Text = "C:\Arquivos de Programas\Geosan\Controles\DiagosticoRede" & Format(Now, "HHMM") & ".txt" + Text1.Text = "C:\Program Files\Geosan\Controles\DiagosticoRede" & Format(Now, "HHMM") & ".txt" End Sub Private Sub cmdInciar_Click() diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index 52dc3d8..cfd5833 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -6,7 +6,7 @@ Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#C:\Windows\SysWow64\MS Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#C:\Windows\SysWow64\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4) Reference=*\G{00025E01-0000-0000-C000-000000000046}#5.0#0#C:\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#C:\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection -Reference=*\G{CDDC1EC0-B6FD-4915-B3E6-B6B8F0C5CAEA}#1.0#0#C:\Arquivos de Programas\GeoSan\Controles\NSecurity.dll#NSecurity +Reference=*\G{CDDC1EC0-B6FD-4915-B3E6-B6B8F0C5CAEA}#1.0#0#Projeto_NSecurity\NSecurity.dll#NSecurity Reference=*\G{6C260C10-9D11-468A-9828-BAAB01436E0F}#1.1#0#C:\Arquivos de Programas\GeoSan\Controles\NUsers.dll#NexusUsers Reference=*\G{CD000000-8B95-11D1-82DB-00C04FB1625D}#1.0#0#C:\Windows\SysWow64\cdosys.dll#Microsoft CDO for Windows 2000 Library Reference=*\G{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}#1.0#0#C:\Windows\SysWOW64\shell32.dll#Microsoft Shell Controls And Automation diff --git a/trunk/GeoSanIni.exe b/trunk/GeoSanIni.exe index 8e3eac0..6043b26 100644 Binary files a/trunk/GeoSanIni.exe and b/trunk/GeoSanIni.exe differ diff --git a/trunk/Projeto_AtualizaApp/GeoSanIni.exe b/trunk/Projeto_AtualizaApp/GeoSanIni.exe index 8e3eac0..6043b26 100644 Binary files a/trunk/Projeto_AtualizaApp/GeoSanIni.exe and b/trunk/Projeto_AtualizaApp/GeoSanIni.exe differ diff --git a/trunk/Projeto_AtualizaApp/GeoSanIni.vbp b/trunk/Projeto_AtualizaApp/GeoSanIni.vbp index 384b784..f5fd7e7 100644 --- a/trunk/Projeto_AtualizaApp/GeoSanIni.vbp +++ b/trunk/Projeto_AtualizaApp/GeoSanIni.vbp @@ -1,5 +1,5 @@ Type=Exe -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWow64\STDOLE2.TLB#OLE Automation +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWOW64\stdole2.tlb#OLE Automation Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#C:\Windows\SysWOW64\scrrun.dll#Microsoft Scripting Runtime Reference=*\G{CD000000-8B95-11D1-82DB-00C04FB1625D}#1.0#0#C:\Windows\SysWow64\cdosys.dll#Microsoft CDO for Windows 2000 Library Object={48E59290-9880-11CF-9754-00AA00C00908}#1.0#0; MSINET.OCX @@ -24,9 +24,9 @@ Command32="" Name="GeoSanIni" HelpContextID="0" CompatibleMode="0" -MajorVer=2 -MinorVer=0 -RevisionVer=1 +MajorVer=8 +MinorVer=3 +RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia" diff --git a/trunk/Projeto_AtualizaApp/classes/CEmail.cls b/trunk/Projeto_AtualizaApp/classes/CEmail.cls index ae556f2..6fef392 100644 --- a/trunk/Projeto_AtualizaApp/classes/CEmail.cls +++ b/trunk/Projeto_AtualizaApp/classes/CEmail.cls @@ -88,7 +88,7 @@ Public Function leConfiguracoesEmail() Dim configuracoes As CArquivoIni Set configuracoes = New CArquivoIni - configuracoes.dirGeoSanIni = "C:\Arquivos de programas\GeoSan\Controles" + configuracoes.dirGeoSanIni = "C:\Program Files\GeoSan\Controles" emailDestinatario = configuracoes.ReadINI("EMAIL", "EMAILDESTINATARIO") emailRemetente = configuracoes.ReadINI("EMAIL", "EMAILREMETENTE") enderecoSMTP = configuracoes.ReadINI("EMAIL", "ENDERECOSMTP") diff --git a/trunk/Projeto_AtualizaApp/forms/frmAtualiza.frm b/trunk/Projeto_AtualizaApp/forms/frmAtualiza.frm index bd9040b..cb857e4 100644 --- a/trunk/Projeto_AtualizaApp/forms/frmAtualiza.frm +++ b/trunk/Projeto_AtualizaApp/forms/frmAtualiza.frm @@ -74,7 +74,7 @@ Attribute VB_Exposed = False ' Private Sub fecha_Click() On Error GoTo Trata_Erro - Shell ("C:\Arquivos de programas\GeoSan\GeoSan.exe") + Shell ("C:\Program Files\GeoSan\GeoSan.exe") End Trata_Erro: diff --git a/trunk/Projeto_AtualizaApp/modules/CAtualiza.cls b/trunk/Projeto_AtualizaApp/modules/CAtualiza.cls index d52218a..ed40920 100644 --- a/trunk/Projeto_AtualizaApp/modules/CAtualiza.cls +++ b/trunk/Projeto_AtualizaApp/modules/CAtualiza.cls @@ -22,7 +22,7 @@ Private Function LeConfiguracoes() Set conf = New CArquivoIni 'leitura e escrita no arquivo GeoSan.ini Set carrega = New CDownload - conf.dirGeoSanIni = "C:\Arquivos de programas\GeoSan\Controles" + conf.dirGeoSanIni = "C:\Program Files\GeoSan\Controles" carrega.atualizacaoWeb = conf.ReadINI("ATUALIZACAO", "WEB") 'se a atualização será realizada pela web ou não carrega.diretorioServidor = conf.ReadINI("ATUALIZACAO", "DIRETORIO") '\download\GeoSan carrega.portaWww = conf.ReadINI("ATUALIZACAO", "PORTAWWW") 'porta do servidor na web em que estão os arquivos diff --git a/trunk/Projeto_ExportEpaNe/Classes/RedeBancoDados.cls b/trunk/Projeto_ExportEpaNe/Classes/RedeBancoDados.cls index e32774e..d48bfdc 100644 --- a/trunk/Projeto_ExportEpaNe/Classes/RedeBancoDados.cls +++ b/trunk/Projeto_ExportEpaNe/Classes/RedeBancoDados.cls @@ -524,7 +524,9 @@ Public Function RsWaterCompTypes_ExitemParametros() As Boolean If rsWaterCompTypes.EOF = False Then RsWaterCompTypes_ExitemParametros = True Else - MsgBox "Não será possivel identificar e exportar bombas e válvulas pois a tabela WATERCOMPONENTSTYPES está vazia.", vbExclamation, "" + Open "C:\Program Files\GeoSan\Controles\testeExportacaoEpanet.txt" For Append As #20 + Print #20, "Não será possível identificar e exportar bombas e válvulas pois a tabela WATERCOMPONENTSTYPES está vazia." + Close #20 RsWaterCompTypes_ExitemParametros = False End If End Function diff --git a/trunk/Projeto_ExportEpaNe/Classes/TrechosRedeEpanet.cls b/trunk/Projeto_ExportEpaNe/Classes/TrechosRedeEpanet.cls index 8cdcc16..f34b042 100644 --- a/trunk/Projeto_ExportEpaNe/Classes/TrechosRedeEpanet.cls +++ b/trunk/Projeto_ExportEpaNe/Classes/TrechosRedeEpanet.cls @@ -19,7 +19,7 @@ Private conBd As ADODB.Connection Private trechos As New TrechosRedeEpanet Private usuario_global As String Private conn_global As ADODB.Connection -Private az As Integer +Private leuDadosConexaoComBancoDeDados As Boolean 'Para saber se já leu as informações de como se conectar ao banco de dados e não ler novamente Private rsWaterCompTypes As New ADODB.Recordset 'RecordSet de referencia para consulta do tipo de componente Private blnRsWaterCompTypes As Boolean 'Indicador para informar se a tabela RsWaterCompTypes foi carregada com registros Private strTipoComp As String 'Variável que receberá o tipo de componente (Junction, valve,pump...) @@ -80,6 +80,7 @@ End Function ' ' Function ExportaParaEpanet() + On Error GoTo Trata_Erro Dim no As String 'Vaviavel que guadará o nó a ser processado Dim contadorTrechos As Integer 'para contar quantos trechos está exportando Dim mPROVEDOR As String @@ -104,13 +105,15 @@ Function ExportaParaEpanet() Dim verticeInicial_x As Double, verticeInicial_y As Double, vertice_Y As Double, vertice_X As Double Dim idLinha As String Dim idNo As String - + Dim mensagemDeErro As String 'para informar o motivo de ter encontrado o erro + + mensagemDeErro = "" Open "C:\Program Files\GeoSan\Controles\testeExportacaoEpanet.txt" For Append As #20 - Print #20, "Início" + Print #20, "Início ==========================================================" Close #20 contadorTrechos = 0 'Informa que o contador de trechos exportados é zero - If (az <> 10) Then + If (leuDadosConexaoComBancoDeDados = False) Then mSERVIDOR = ReadINI("CONEXAO", "SERVIDOR", App.Path & "\CONTROLES\GEOSAN.ini") mPORTA = ReadINI("CONEXAO", "PORTA", App.Path & "\CONTROLES\GEOSAN.ini") mBANCO = ReadINI("CONEXAO", "BANCO", App.Path & "\CONTROLES\GEOSAN.ini") @@ -118,7 +121,10 @@ Function ExportaParaEpanet() Senha = ReadINI("CONEXAO", "SENHA", App.Path & "\CONTROLES\GEOSAN.ini") prov = ReadINI("CONEXAO", "PROVEDOR", App.Path & "\CONTROLES\GEOSAN.ini") decriptada = FunDecripta(Senha) - az = 10 + leuDadosConexaoComBancoDeDados = true + Open "C:\Program Files\GeoSan\Controles\testeExportacaoEpanet.txt" For Append As #20 'Já leu, não precisa ler mais + Print #20, "Servidor: " + mSERVIDOR + " Porta: " + mPORTA + " Provedor: " + prov + " Banco: " + mBANCO + " Usuário: " + mUSUARIO + " Senha: " + decriptada + Close #20 End If tb.Provider = Provider 'Configura o objeto tb(Tecomdatabase) que será usado para retornar para as variáveis lin_len, x e y seus valores para cada trecho tb.Connection = conn @@ -207,6 +213,19 @@ Function ExportaParaEpanet() End If banco.Rs_trechosDeRede_moveParaProximo Loop + Exit Function + +Trata_Erro: + If Err.Number = 0 Or Err.Number = 20 Then + Resume Next + Else + Close #2 + Open App.Path & "\LogErroExportEPANET.txt" For Append As #2 + Print #2, Now & "-(TrechosRedeEpanet-ExportaParaEpanet)-" & Err.Number & "-" & Err.Description + Close #2 + MsgBox "Um posssível erro foi identificado na rotina '(TrechosRedeEpanet-ExportaParaEpanet)':" & Chr(13) & Chr(13) & Err.Description & Chr(13) & Chr(13) & "Foi gerado na pasta do aplicativo o arquivo LogErroExportEPANET.txt com informações desta ocorrencia.", vbInformation + Exit Function + End If End Function 'Converte um ponto (nó) em trecho. diff --git a/trunk/Projeto_ExportEpaNe/EpanetExport.vbp b/trunk/Projeto_ExportEpaNe/EpanetExport.vbp index a98b29b..c255a8e 100644 --- a/trunk/Projeto_ExportEpaNe/EpanetExport.vbp +++ b/trunk/Projeto_ExportEpaNe/EpanetExport.vbp @@ -1,13 +1,13 @@ 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{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0#..\..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComDatabase.dll#TeComDatabase 4.0.0 -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{56BF9020-7A2F-11D0-9482-00A0C91110ED}#1.0#0#..\..\..\..\Windows\SysWow64\MSBIND.DLL#Microsoft Data Binding Collection VB 6.0 (SP4) +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWOW64\stdole2.tlb#OLE Automation +Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#C:\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library +Reference=*\G{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComDatabase.dll#TeComDatabase 4.0.0 +Reference=*\G{00025E01-0000-0000-C000-000000000046}#5.0#0#C:\Program Files (x86)\Common Files\Microsoft Shared\DAO\dao360.dll#Microsoft DAO 3.6 Object Library +Reference=*\G{56BF9020-7A2F-11D0-9482-00A0C91110ED}#1.0#0#C:\Windows\SysWow64\MSBIND.DLL#Microsoft Data Binding Collection VB 6.0 (SP4) Object={87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0; TeComDatabase.dll -Reference=*\G{E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0#..\..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComNetwork.dll#TeComNetwork 4.0.0 +Reference=*\G{E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComNetwork.dll#TeComNetwork 4.0.0 Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll -Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#..\..\..\..\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection +Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#C:\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX Object={CDE57A40-8B86-11D0-B3C6-00A0C90AEA82}#1.0#0; MSDATGRD.OCX @@ -30,9 +30,9 @@ Command32="" Name="EpanetExport" HelpContextID="0" CompatibleMode="0" -MajorVer=7 -MinorVer=0 -RevisionVer=55 +MajorVer=8 +MinorVer=3 +RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS Geoengenharia e Comércio Ltda." diff --git a/trunk/Projeto_NSecurity/NSecurity.dll b/trunk/Projeto_NSecurity/NSecurity.dll index 950f85d..ecf100a 100644 Binary files a/trunk/Projeto_NSecurity/NSecurity.dll and b/trunk/Projeto_NSecurity/NSecurity.dll differ diff --git a/trunk/Projeto_NSecurity/NSecurity.exp b/trunk/Projeto_NSecurity/NSecurity.exp index debe47a..c2fa7f3 100644 Binary files a/trunk/Projeto_NSecurity/NSecurity.exp and b/trunk/Projeto_NSecurity/NSecurity.exp differ diff --git a/trunk/Projeto_NSecurity/NSecurity.lib b/trunk/Projeto_NSecurity/NSecurity.lib index d56b66b..685348f 100644 Binary files a/trunk/Projeto_NSecurity/NSecurity.lib and b/trunk/Projeto_NSecurity/NSecurity.lib differ diff --git a/trunk/Projeto_NSecurity/NSecurity.vbp b/trunk/Projeto_NSecurity/NSecurity.vbp index c3bd605..ee6073d 100644 --- a/trunk/Projeto_NSecurity/NSecurity.vbp +++ b/trunk/Projeto_NSecurity/NSecurity.vbp @@ -1,7 +1,7 @@ Type=OleDll -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{6C260C10-9D11-468A-9828-BAAB01436E0F}#1.1#0#..\..\..\..\Arquivos de Programas\GeoSan\Controles\NUsers.dll#NexusUsers +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWOW64\stdole2.tlb#OLE Automation +Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#C:\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library +Reference=*\G{6C260C10-9D11-468A-9828-BAAB01436E0F}#1.1#0#C:\Arquivos de Programas\GeoSan\Controles\NUsers.dll#NexusUsers Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; MSCOMCTL.OCX Form=Forms\FrmGroups.frm Class=AppMode; Modules\AppMode.cls @@ -19,11 +19,11 @@ Command32="" Name="NSecurity" HelpContextID="0" CompatibleMode="2" -CompatibleEXE32="NSecurity2.dll" +CompatibleEXE32="NSecurity.dll" VersionCompatible32="1" -MajorVer=7 -MinorVer=1 -RevisionVer=2 +MajorVer=8 +MinorVer=3 +RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." @@ -44,7 +44,7 @@ Retained=0 ThreadPerObject=0 MaxNumberOfThreads=1 DebugStartupOption=2 -DebugStartupComponent=C:\Arquivos de programas\Microsoft Visual Studio\VB98\VB6.EXE +DebugStartupComponent=C:\Program Files\Microsoft Visual Studio\VB98\VB6.EXE [MS Transaction Server] AutoRefresh=1 diff --git a/trunk/Projeto_NxConnection/Connection.vbp b/trunk/Projeto_NxConnection/Connection.vbp index c81717e..9dcfae5 100644 --- a/trunk/Projeto_NxConnection/Connection.vbp +++ b/trunk/Projeto_NxConnection/Connection.vbp @@ -1,8 +1,8 @@ Type=OleDll Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINDOWS\system32\STDOLE2.TLB#OLE Automation -Reference=*\G{1BCD446E-7095-11D0-9C4E-00AA00BDD685}#1.0#0#..\..\..\..\..\Arquivos de programas\Microsoft Visual Studio\Common\Tools\APE\REGTOOL5.DLL#Registry Access Functions -Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#..\..\..\..\..\Arquivos de programas\Arquivos comuns\system\ado\msado26.tlb#Microsoft ActiveX Data Objects 2.6 Library -Reference=*\G{4A40A2AA-DD1C-11CE-B7A6-00AA006EC3D4}#2.0#0#..\..\..\..\..\Arquivos de programas\Microsoft Visual Studio\Common\Tools\APE\ODBCTOOL.DLL#ODBC Driver & Data Source Name Functions +Reference=*\G{1BCD446E-7095-11D0-9C4E-00AA00BDD685}#1.0#0#..\..\..\..\..\Program Files\Microsoft Visual Studio\Common\Tools\APE\REGTOOL5.DLL#Registry Access Functions +Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#..\..\..\..\..\Program Files\Arquivos comuns\system\ado\msado26.tlb#Microsoft ActiveX Data Objects 2.6 Library +Reference=*\G{4A40A2AA-DD1C-11CE-B7A6-00AA006EC3D4}#2.0#0#..\..\..\..\..\Program Files\Microsoft Visual Studio\Common\Tools\APE\ODBCTOOL.DLL#ODBC Driver & Data Source Name Functions Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX Class=App; Classes\App.cls Form=Forms\FrmConnection.frm diff --git a/trunk/Projeto_NxViewmanager/NxViewManager.vbp b/trunk/Projeto_NxViewmanager/NxViewManager.vbp index 386726a..1f974e3 100644 --- a/trunk/Projeto_NxViewmanager/NxViewManager.vbp +++ b/trunk/Projeto_NxViewmanager/NxViewManager.vbp @@ -31,9 +31,9 @@ HelpContextID="0" CompatibleMode="2" CompatibleEXE32="NxViewManager2.ocx" VersionCompatible32="1" -MajorVer=7 -MinorVer=1 -RevisionVer=4 +MajorVer=8 +MinorVer=3 +RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/Projeto_NxViewmanager/NxViewManager2.exp b/trunk/Projeto_NxViewmanager/NxViewManager2.exp index f786d1e..f18299d 100644 Binary files a/trunk/Projeto_NxViewmanager/NxViewManager2.exp and b/trunk/Projeto_NxViewmanager/NxViewManager2.exp differ diff --git a/trunk/Projeto_NxViewmanager/NxViewManager2.lib b/trunk/Projeto_NxViewmanager/NxViewManager2.lib index 52836d4..0b6413d 100644 Binary files a/trunk/Projeto_NxViewmanager/NxViewManager2.lib and b/trunk/Projeto_NxViewmanager/NxViewManager2.lib differ diff --git a/trunk/Projeto_NxViewmanager/NxViewManager2.oca b/trunk/Projeto_NxViewmanager/NxViewManager2.oca index e5e08f0..00163f5 100644 Binary files a/trunk/Projeto_NxViewmanager/NxViewManager2.oca and b/trunk/Projeto_NxViewmanager/NxViewManager2.oca differ diff --git a/trunk/Projeto_NxViewmanager/NxViewManager2.ocx b/trunk/Projeto_NxViewmanager/NxViewManager2.ocx index 006dd0e..4a16cfb 100644 Binary files a/trunk/Projeto_NxViewmanager/NxViewManager2.ocx and b/trunk/Projeto_NxViewmanager/NxViewManager2.ocx differ diff --git a/trunk/Projeto_NxViewmanager/ViewManager.ctl b/trunk/Projeto_NxViewmanager/ViewManager.ctl index d7a5c27..63b62a0 100644 --- a/trunk/Projeto_NxViewmanager/ViewManager.ctl +++ b/trunk/Projeto_NxViewmanager/ViewManager.ctl @@ -303,7 +303,7 @@ Private Sub LoadTheme() Dim i As String Dim j As String - Call SaveLoadGlobalData("C:\Arquivos de programas\GeoSan" + "\controles\variaveisGlobais.txt", False) 'Carrega as variáveis globais do GeoSan.exe + Call SaveLoadGlobalData("C:\Program Files\GeoSan" + "\controles\variaveisGlobais.txt", False) 'Carrega as variáveis globais do GeoSan.exe aa = "te_theme" b = "te_view" c = "theme_id" diff --git a/trunk/Projeto_NxViewmanager/frmTheme.frm b/trunk/Projeto_NxViewmanager/frmTheme.frm index 94ae51b..645f3f1 100644 --- a/trunk/Projeto_NxViewmanager/frmTheme.frm +++ b/trunk/Projeto_NxViewmanager/frmTheme.frm @@ -945,7 +945,7 @@ Public Function Init(mtvm As Object, mtheme As String, mLayerName As String) As Dim vetor As Variant Dim str As String 'LoozeXP1.InitSubClassing - Call SaveLoadGlobalData("C:\Arquivos de programas\GeoSan" + "\controles\variaveisGlobais.txt", False) 'recupera as variáveis globais da aplicação principal do GeoSan + Call SaveLoadGlobalData("C:\Program Files\GeoSan" + "\controles\variaveisGlobais.txt", False) 'recupera as variáveis globais da aplicação principal do GeoSan Confirm = False Set tvm = mtvm LoadCboLine cboLineStyle diff --git a/trunk/Updates.txt b/trunk/Updates.txt index 5865510..c33922a 100644 --- a/trunk/Updates.txt +++ b/trunk/Updates.txt @@ -1,2 +1,2 @@ -GeoSan.exe;c:\tempApp;7.0.0.1;C:\Arquivos de programas\GeoSan -GeoSanIni.exe;c:\tempApp;2.0.0.0;C:\Arquivos de programas\GeoSan \ No newline at end of file +GeoSan.exe;c:\tempApp;7.0.0.1;C:\Program Files\GeoSan +GeoSanIni.exe;c:\tempApp;2.0.0.0;C:\Program Files\GeoSan \ No newline at end of file -- libgit2 0.21.2