Download as
Browse Code »

Commit 3f888c3560128cad37982a82648eced89e05c7e7

Authored by José Maria Villac Pinheiro
1 parent afe8b5eb
Exists in main

Feitas alterações em todos os outros módulos do GeoSan, mas o de exportar aprese… 

…nta 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.
Showing 32 changed files with 69 additions and 48 deletions   Show diff stats
install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSanIni.exe
View file @3f888c3
No preview for this file type
install/GeraSetupGeoSan/ArquivosInstGeoSan/NSecurity.dll
View file @3f888c3
No preview for this file type
install/GeraSetupGeoSan/ArquivosInstGeoSan/NxViewManager2.ocx
View file @3f888c3
No preview for this file type
install/GeraSetupGeoSan/ArquivosInstGeoSan/Updates.txt
  Diff comments   View file @3f888c3
1 -GeoSan.exe;c:\tempApp;7.0.0.30;C:\Arquivos de programas\GeoSan  
2 -GeoSanIni.exe;c:\tempApp;2.0.0.1;C:\Arquivos de programas\GeoSan  
3 \ No newline at end of file 1 \ No newline at end of file
  2 +GeoSan.exe;c:\tempApp;7.0.0.1;C:\Program Files\GeoSan
  3 +GeoSanIni.exe;c:\tempApp;2.0.0.0;C:\Program Files\GeoSan
4 \ No newline at end of file 4 \ No newline at end of file
trunk/Exporte EPANet.exe
View file @3f888c3
No preview for this file type
trunk/Forms/GeoSan.vbp
  Diff comments   View file @3f888c3
@@ -9,7 +9,7 @@ Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\..\..\..\..\W @@ -9,7 +9,7 @@ Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#..\..\..\..\..\..\..\W
9 Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\..\..\..\..\WINDOWS\system32\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP6) 9 Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\..\..\..\..\WINDOWS\system32\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP6)
10 Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#..\..\..\..\..\..\..\WINDOWS\system32\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4) 10 Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#..\..\..\..\..\..\..\WINDOWS\system32\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4)
11 Object={2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0; TeComImport.dll 11 Object={2CCABA93-B681-4E7F-8047-BD4D623301BA}#1.0#0; TeComImport.dll
12 -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 12 +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
13 Object={F141AAE7-BD4C-4793-88DB-10FE8CBA518C}#1.0#0; TeComPrinter.dll 13 Object={F141AAE7-BD4C-4793-88DB-10FE8CBA518C}#1.0#0; TeComPrinter.dll
14 Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll 14 Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll
15 Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#..\..\..\..\..\..\..\DLL\GeoSan\NexusConnection.dll#NexusConnection 15 Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#..\..\..\..\..\..\..\DLL\GeoSan\NexusConnection.dll#NexusConnection
trunk/Forms/frmCadastroRamalAgua.frm
  Diff comments   View file @3f888c3
@@ -599,7 +599,7 @@ On Error GoTo Trata_Erro @@ -599,7 +599,7 @@ On Error GoTo Trata_Erro
599 retval = Dir(App.Path & "\Controles\FRamais.txt") 599 retval = Dir(App.Path & "\Controles\FRamais.txt")
600 If retval <> "" Then 'verifica se o arquivo existe na pasta 600 If retval <> "" Then 'verifica se o arquivo existe na pasta
601 Open App.Path & "\Controles\FRamais.txt" For Input As #3 601 Open App.Path & "\Controles\FRamais.txt" For Input As #3
602 - 'Open "C:\ARQUIVOS DE PROGRAMAS\GEOSAN\Controles\FRamais.txt" For Input As #3 602 + 'Open "C:\Program Files\GEOSAN\Controles\FRamais.txt" For Input As #3
603 'Do While Not EOF(3) = True 603 'Do While Not EOF(3) = True
604 Do While Not EOF(3) 604 Do While Not EOF(3)
605 Line Input #3, str 605 Line Input #3, str
trunk/Forms/frmCadastroRamalEsgoto.frm
  Diff comments   View file @3f888c3
@@ -526,7 +526,7 @@ Attribute VB_Exposed = False @@ -526,7 +526,7 @@ Attribute VB_Exposed = False
526 ' retval = Dir(App.path & "\Controles\FRamais.txt") 526 ' retval = Dir(App.path & "\Controles\FRamais.txt")
527 ' If retval <> "" Then 'verifica se o arquivo existe na pasta 527 ' If retval <> "" Then 'verifica se o arquivo existe na pasta
528 ' Open App.path & "\Controles\FRamais.txt" For Input As #3 528 ' Open App.path & "\Controles\FRamais.txt" For Input As #3
529 -' 'Open "C:\ARQUIVOS DE PROGRAMAS\GEOSAN\Controles\FRamais.txt" For Input As #3 529 +' 'Open "C:\Program Files\GEOSAN\Controles\FRamais.txt" For Input As #3
530 ' 'Do While Not EOF(3) = True 530 ' 'Do While Not EOF(3) = True
531 ' Do While Not EOF(3) 531 ' Do While Not EOF(3)
532 ' Line Input #3, str 532 ' Line Input #3, str
trunk/Forms/frmVerificaConectividade.frm
  Diff comments   View file @3f888c3
@@ -189,7 +189,7 @@ Private Sub Form_Load() @@ -189,7 +189,7 @@ Private Sub Form_Load()
189 TeDatabase1.Connection = Conn 'usa a variável global para identificar a conexão 189 TeDatabase1.Connection = Conn 'usa a variável global para identificar a conexão
190 TeDatabase1.setCurrentLayer ("WATERLINES") 190 TeDatabase1.setCurrentLayer ("WATERLINES")
191 191
192 - Text1.Text = "C:\Arquivos de Programas\Geosan\Controles\DiagosticoRede" & Format(Now, "HHMM") & ".txt" 192 + Text1.Text = "C:\Program Files\Geosan\Controles\DiagosticoRede" & Format(Now, "HHMM") & ".txt"
193 End Sub 193 End Sub
194 194
195 Private Sub cmdInciar_Click() 195 Private Sub cmdInciar_Click()
trunk/GeoSan.vbp
  Diff comments   View file @3f888c3
@@ -6,7 +6,7 @@ Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#C:\Windows\SysWow64\MS @@ -6,7 +6,7 @@ Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#C:\Windows\SysWow64\MS
6 Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#C:\Windows\SysWow64\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4) 6 Reference=*\G{78E93843-85FD-11D0-8487-00A0C90DC8A9}#1.0#0#C:\Windows\SysWow64\MSDBRPT.DLL#Microsoft Data Report Designer 6.0 (SP4)
7 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 7 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
8 Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#C:\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection 8 Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#C:\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection
9 -Reference=*\G{CDDC1EC0-B6FD-4915-B3E6-B6B8F0C5CAEA}#1.0#0#C:\Arquivos de Programas\GeoSan\Controles\NSecurity.dll#NSecurity 9 +Reference=*\G{CDDC1EC0-B6FD-4915-B3E6-B6B8F0C5CAEA}#1.0#0#Projeto_NSecurity\NSecurity.dll#NSecurity
10 Reference=*\G{6C260C10-9D11-468A-9828-BAAB01436E0F}#1.1#0#C:\Arquivos de Programas\GeoSan\Controles\NUsers.dll#NexusUsers 10 Reference=*\G{6C260C10-9D11-468A-9828-BAAB01436E0F}#1.1#0#C:\Arquivos de Programas\GeoSan\Controles\NUsers.dll#NexusUsers
11 Reference=*\G{CD000000-8B95-11D1-82DB-00C04FB1625D}#1.0#0#C:\Windows\SysWow64\cdosys.dll#Microsoft CDO for Windows 2000 Library 11 Reference=*\G{CD000000-8B95-11D1-82DB-00C04FB1625D}#1.0#0#C:\Windows\SysWow64\cdosys.dll#Microsoft CDO for Windows 2000 Library
12 Reference=*\G{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}#1.0#0#C:\Windows\SysWOW64\shell32.dll#Microsoft Shell Controls And Automation 12 Reference=*\G{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}#1.0#0#C:\Windows\SysWOW64\shell32.dll#Microsoft Shell Controls And Automation
trunk/GeoSanIni.exe
View file @3f888c3
No preview for this file type
trunk/Projeto_AtualizaApp/GeoSanIni.exe
View file @3f888c3
No preview for this file type
trunk/Projeto_AtualizaApp/GeoSanIni.vbp
  Diff comments   View file @3f888c3
1 Type=Exe 1 Type=Exe
2 -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWow64\STDOLE2.TLB#OLE Automation 2 +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWOW64\stdole2.tlb#OLE Automation
3 Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#C:\Windows\SysWOW64\scrrun.dll#Microsoft Scripting Runtime 3 Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#C:\Windows\SysWOW64\scrrun.dll#Microsoft Scripting Runtime
4 Reference=*\G{CD000000-8B95-11D1-82DB-00C04FB1625D}#1.0#0#C:\Windows\SysWow64\cdosys.dll#Microsoft CDO for Windows 2000 Library 4 Reference=*\G{CD000000-8B95-11D1-82DB-00C04FB1625D}#1.0#0#C:\Windows\SysWow64\cdosys.dll#Microsoft CDO for Windows 2000 Library
5 Object={48E59290-9880-11CF-9754-00AA00C00908}#1.0#0; MSINET.OCX 5 Object={48E59290-9880-11CF-9754-00AA00C00908}#1.0#0; MSINET.OCX
@@ -24,9 +24,9 @@ Command32=&quot;&quot; @@ -24,9 +24,9 @@ Command32=&quot;&quot;
24 Name="GeoSanIni" 24 Name="GeoSanIni"
25 HelpContextID="0" 25 HelpContextID="0"
26 CompatibleMode="0" 26 CompatibleMode="0"
27 -MajorVer=2  
28 -MinorVer=0  
29 -RevisionVer=1 27 +MajorVer=8
  28 +MinorVer=3
  29 +RevisionVer=0
30 AutoIncrementVer=0 30 AutoIncrementVer=0
31 ServerSupportFiles=0 31 ServerSupportFiles=0
32 VersionCompanyName="NEXUS GeoEngenharia" 32 VersionCompanyName="NEXUS GeoEngenharia"
trunk/Projeto_AtualizaApp/classes/CEmail.cls
  Diff comments   View file @3f888c3
@@ -88,7 +88,7 @@ Public Function leConfiguracoesEmail() @@ -88,7 +88,7 @@ Public Function leConfiguracoesEmail()
88 Dim configuracoes As CArquivoIni 88 Dim configuracoes As CArquivoIni
89 89
90 Set configuracoes = New CArquivoIni 90 Set configuracoes = New CArquivoIni
91 - configuracoes.dirGeoSanIni = "C:\Arquivos de programas\GeoSan\Controles" 91 + configuracoes.dirGeoSanIni = "C:\Program Files\GeoSan\Controles"
92 emailDestinatario = configuracoes.ReadINI("EMAIL", "EMAILDESTINATARIO") 92 emailDestinatario = configuracoes.ReadINI("EMAIL", "EMAILDESTINATARIO")
93 emailRemetente = configuracoes.ReadINI("EMAIL", "EMAILREMETENTE") 93 emailRemetente = configuracoes.ReadINI("EMAIL", "EMAILREMETENTE")
94 enderecoSMTP = configuracoes.ReadINI("EMAIL", "ENDERECOSMTP") 94 enderecoSMTP = configuracoes.ReadINI("EMAIL", "ENDERECOSMTP")
trunk/Projeto_AtualizaApp/forms/frmAtualiza.frm
  Diff comments   View file @3f888c3
@@ -74,7 +74,7 @@ Attribute VB_Exposed = False @@ -74,7 +74,7 @@ Attribute VB_Exposed = False
74 ' 74 '
75 Private Sub fecha_Click() 75 Private Sub fecha_Click()
76 On Error GoTo Trata_Erro 76 On Error GoTo Trata_Erro
77 - Shell ("C:\Arquivos de programas\GeoSan\GeoSan.exe") 77 + Shell ("C:\Program Files\GeoSan\GeoSan.exe")
78 End 78 End
79 79
80 Trata_Erro: 80 Trata_Erro:
trunk/Projeto_AtualizaApp/modules/CAtualiza.cls
  Diff comments   View file @3f888c3
@@ -22,7 +22,7 @@ Private Function LeConfiguracoes() @@ -22,7 +22,7 @@ Private Function LeConfiguracoes()
22 22
23 Set conf = New CArquivoIni 'leitura e escrita no arquivo GeoSan.ini 23 Set conf = New CArquivoIni 'leitura e escrita no arquivo GeoSan.ini
24 Set carrega = New CDownload 24 Set carrega = New CDownload
25 - conf.dirGeoSanIni = "C:\Arquivos de programas\GeoSan\Controles" 25 + conf.dirGeoSanIni = "C:\Program Files\GeoSan\Controles"
26 carrega.atualizacaoWeb = conf.ReadINI("ATUALIZACAO", "WEB") 'se a atualização será realizada pela web ou não 26 carrega.atualizacaoWeb = conf.ReadINI("ATUALIZACAO", "WEB") 'se a atualização será realizada pela web ou não
27 carrega.diretorioServidor = conf.ReadINI("ATUALIZACAO", "DIRETORIO") '\download\GeoSan 27 carrega.diretorioServidor = conf.ReadINI("ATUALIZACAO", "DIRETORIO") '\download\GeoSan
28 carrega.portaWww = conf.ReadINI("ATUALIZACAO", "PORTAWWW") 'porta do servidor na web em que estão os arquivos 28 carrega.portaWww = conf.ReadINI("ATUALIZACAO", "PORTAWWW") 'porta do servidor na web em que estão os arquivos
trunk/Projeto_ExportEpaNe/Classes/RedeBancoDados.cls
  Diff comments   View file @3f888c3
@@ -524,7 +524,9 @@ Public Function RsWaterCompTypes_ExitemParametros() As Boolean @@ -524,7 +524,9 @@ Public Function RsWaterCompTypes_ExitemParametros() As Boolean
524 If rsWaterCompTypes.EOF = False Then 524 If rsWaterCompTypes.EOF = False Then
525 RsWaterCompTypes_ExitemParametros = True 525 RsWaterCompTypes_ExitemParametros = True
526 Else 526 Else
527 - MsgBox "Não será possivel identificar e exportar bombas e válvulas pois a tabela WATERCOMPONENTSTYPES está vazia.", vbExclamation, "" 527 + Open "C:\Program Files\GeoSan\Controles\testeExportacaoEpanet.txt" For Append As #20
  528 + Print #20, "Não será possível identificar e exportar bombas e válvulas pois a tabela WATERCOMPONENTSTYPES está vazia."
  529 + Close #20
528 RsWaterCompTypes_ExitemParametros = False 530 RsWaterCompTypes_ExitemParametros = False
529 End If 531 End If
530 End Function 532 End Function
trunk/Projeto_ExportEpaNe/Classes/TrechosRedeEpanet.cls
  Diff comments   View file @3f888c3
@@ -19,7 +19,7 @@ Private conBd As ADODB.Connection @@ -19,7 +19,7 @@ Private conBd As ADODB.Connection
19 Private trechos As New TrechosRedeEpanet 19 Private trechos As New TrechosRedeEpanet
20 Private usuario_global As String 20 Private usuario_global As String
21 Private conn_global As ADODB.Connection 21 Private conn_global As ADODB.Connection
22 -Private az As Integer 22 +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
23 Private rsWaterCompTypes As New ADODB.Recordset 'RecordSet de referencia para consulta do tipo de componente 23 Private rsWaterCompTypes As New ADODB.Recordset 'RecordSet de referencia para consulta do tipo de componente
24 Private blnRsWaterCompTypes As Boolean 'Indicador para informar se a tabela RsWaterCompTypes foi carregada com registros 24 Private blnRsWaterCompTypes As Boolean 'Indicador para informar se a tabela RsWaterCompTypes foi carregada com registros
25 Private strTipoComp As String 'Variável que receberá o tipo de componente (Junction, valve,pump...) 25 Private strTipoComp As String 'Variável que receberá o tipo de componente (Junction, valve,pump...)
@@ -80,6 +80,7 @@ End Function @@ -80,6 +80,7 @@ End Function
80 ' 80 '
81 ' 81 '
82 Function ExportaParaEpanet() 82 Function ExportaParaEpanet()
  83 + On Error GoTo Trata_Erro
83 Dim no As String 'Vaviavel que guadará o nó a ser processado 84 Dim no As String 'Vaviavel que guadará o nó a ser processado
84 Dim contadorTrechos As Integer 'para contar quantos trechos está exportando 85 Dim contadorTrechos As Integer 'para contar quantos trechos está exportando
85 Dim mPROVEDOR As String 86 Dim mPROVEDOR As String
@@ -104,13 +105,15 @@ Function ExportaParaEpanet() @@ -104,13 +105,15 @@ Function ExportaParaEpanet()
104 Dim verticeInicial_x As Double, verticeInicial_y As Double, vertice_Y As Double, vertice_X As Double 105 Dim verticeInicial_x As Double, verticeInicial_y As Double, vertice_Y As Double, vertice_X As Double
105 Dim idLinha As String 106 Dim idLinha As String
106 Dim idNo As String 107 Dim idNo As String
107 - 108 + Dim mensagemDeErro As String 'para informar o motivo de ter encontrado o erro
  109 +
  110 + mensagemDeErro = ""
108 Open "C:\Program Files\GeoSan\Controles\testeExportacaoEpanet.txt" For Append As #20 111 Open "C:\Program Files\GeoSan\Controles\testeExportacaoEpanet.txt" For Append As #20
109 - Print #20, "Início" 112 + Print #20, "Início =========================================================="
110 Close #20 113 Close #20
111 114
112 contadorTrechos = 0 'Informa que o contador de trechos exportados é zero 115 contadorTrechos = 0 'Informa que o contador de trechos exportados é zero
113 - If (az <> 10) Then 116 + If (leuDadosConexaoComBancoDeDados = False) Then
114 mSERVIDOR = ReadINI("CONEXAO", "SERVIDOR", App.Path & "\CONTROLES\GEOSAN.ini") 117 mSERVIDOR = ReadINI("CONEXAO", "SERVIDOR", App.Path & "\CONTROLES\GEOSAN.ini")
115 mPORTA = ReadINI("CONEXAO", "PORTA", App.Path & "\CONTROLES\GEOSAN.ini") 118 mPORTA = ReadINI("CONEXAO", "PORTA", App.Path & "\CONTROLES\GEOSAN.ini")
116 mBANCO = ReadINI("CONEXAO", "BANCO", App.Path & "\CONTROLES\GEOSAN.ini") 119 mBANCO = ReadINI("CONEXAO", "BANCO", App.Path & "\CONTROLES\GEOSAN.ini")
@@ -118,7 +121,10 @@ Function ExportaParaEpanet() @@ -118,7 +121,10 @@ Function ExportaParaEpanet()
118 Senha = ReadINI("CONEXAO", "SENHA", App.Path & "\CONTROLES\GEOSAN.ini") 121 Senha = ReadINI("CONEXAO", "SENHA", App.Path & "\CONTROLES\GEOSAN.ini")
119 prov = ReadINI("CONEXAO", "PROVEDOR", App.Path & "\CONTROLES\GEOSAN.ini") 122 prov = ReadINI("CONEXAO", "PROVEDOR", App.Path & "\CONTROLES\GEOSAN.ini")
120 decriptada = FunDecripta(Senha) 123 decriptada = FunDecripta(Senha)
121 - az = 10 124 + leuDadosConexaoComBancoDeDados = true
  125 + Open "C:\Program Files\GeoSan\Controles\testeExportacaoEpanet.txt" For Append As #20 'Já leu, não precisa ler mais
  126 + Print #20, "Servidor: " + mSERVIDOR + " Porta: " + mPORTA + " Provedor: " + prov + " Banco: " + mBANCO + " Usuário: " + mUSUARIO + " Senha: " + decriptada
  127 + Close #20
122 End If 128 End If
123 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 129 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
124 tb.Connection = conn 130 tb.Connection = conn
@@ -207,6 +213,19 @@ Function ExportaParaEpanet() @@ -207,6 +213,19 @@ Function ExportaParaEpanet()
207 End If 213 End If
208 banco.Rs_trechosDeRede_moveParaProximo 214 banco.Rs_trechosDeRede_moveParaProximo
209 Loop 215 Loop
  216 + Exit Function
  217 +
  218 +Trata_Erro:
  219 + If Err.Number = 0 Or Err.Number = 20 Then
  220 + Resume Next
  221 + Else
  222 + Close #2
  223 + Open App.Path & "\LogErroExportEPANET.txt" For Append As #2
  224 + Print #2, Now & "-(TrechosRedeEpanet-ExportaParaEpanet)-" & Err.Number & "-" & Err.Description
  225 + Close #2
  226 + 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
  227 + Exit Function
  228 + End If
210 End Function 229 End Function
211 230
212 'Converte um ponto (nó) em trecho. 231 'Converte um ponto (nó) em trecho.
trunk/Projeto_ExportEpaNe/EpanetExport.vbp
  Diff comments   View file @3f888c3
1 Type=Exe 1 Type=Exe
2 -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\Windows\SysWOW64\stdole2.tlb#OLE Automation  
3 -Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#..\..\..\..\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library  
4 -Reference=*\G{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0#..\..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComDatabase.dll#TeComDatabase 4.0.0  
5 -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  
6 -Reference=*\G{56BF9020-7A2F-11D0-9482-00A0C91110ED}#1.0#0#..\..\..\..\Windows\SysWow64\MSBIND.DLL#Microsoft Data Binding Collection VB 6.0 (SP4) 2 +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWOW64\stdole2.tlb#OLE Automation
  3 +Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#C:\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library
  4 +Reference=*\G{87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComDatabase.dll#TeComDatabase 4.0.0
  5 +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
  6 +Reference=*\G{56BF9020-7A2F-11D0-9482-00A0C91110ED}#1.0#0#C:\Windows\SysWow64\MSBIND.DLL#Microsoft Data Binding Collection VB 6.0 (SP4)
7 Object={87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0; TeComDatabase.dll 7 Object={87AC6DA5-272D-40EB-B60A-F83246B1B8D7}#1.0#0; TeComDatabase.dll
8 -Reference=*\G{E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0#..\..\..\..\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComNetwork.dll#TeComNetwork 4.0.0 8 +Reference=*\G{E2759C45-0D26-4D19-A579-43BC909CB86F}#1.0#0#C:\Arquivos de Programas\NEXUS\TeCom4.2.0\TeComNetwork.dll#TeComNetwork 4.0.0
9 Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll 9 Object={9AB389E7-EAED-4DBF-941D-EB86ED1F9A76}#1.0#0; TeComConnection.dll
10 -Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#..\..\..\..\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection 10 +Reference=*\G{B318DBAE-FB7D-4A15-A9AF-DBCEAE2D5571}#1.0#0#C:\Arquivos de Programas\GeoSan\Controles\NexusConnection.dll#NexusConnection
11 Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX 11 Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX
12 Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 12 Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
13 Object={CDE57A40-8B86-11D0-B3C6-00A0C90AEA82}#1.0#0; MSDATGRD.OCX 13 Object={CDE57A40-8B86-11D0-B3C6-00A0C90AEA82}#1.0#0; MSDATGRD.OCX
@@ -30,9 +30,9 @@ Command32=&quot;&quot; @@ -30,9 +30,9 @@ Command32=&quot;&quot;
30 Name="EpanetExport" 30 Name="EpanetExport"
31 HelpContextID="0" 31 HelpContextID="0"
32 CompatibleMode="0" 32 CompatibleMode="0"
33 -MajorVer=7  
34 -MinorVer=0  
35 -RevisionVer=55 33 +MajorVer=8
  34 +MinorVer=3
  35 +RevisionVer=0
36 AutoIncrementVer=0 36 AutoIncrementVer=0
37 ServerSupportFiles=0 37 ServerSupportFiles=0
38 VersionCompanyName="NEXUS Geoengenharia e Comércio Ltda." 38 VersionCompanyName="NEXUS Geoengenharia e Comércio Ltda."
trunk/Projeto_NSecurity/NSecurity.dll
View file @3f888c3
No preview for this file type
trunk/Projeto_NSecurity/NSecurity.exp
View file @3f888c3
No preview for this file type
trunk/Projeto_NSecurity/NSecurity.lib
View file @3f888c3
No preview for this file type
trunk/Projeto_NSecurity/NSecurity.vbp
  Diff comments   View file @3f888c3
1 Type=OleDll 1 Type=OleDll
2 -Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\Windows\SysWOW64\stdole2.tlb#OLE Automation  
3 -Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#..\..\..\..\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library  
4 -Reference=*\G{6C260C10-9D11-468A-9828-BAAB01436E0F}#1.1#0#..\..\..\..\Arquivos de Programas\GeoSan\Controles\NUsers.dll#NexusUsers 2 +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\Windows\SysWOW64\stdole2.tlb#OLE Automation
  3 +Reference=*\G{00000206-0000-0010-8000-00AA006D2EA4}#2.6#0#C:\Windows\SysWow64\MSADO26.TLB#Microsoft ActiveX Data Objects 2.6 Library
  4 +Reference=*\G{6C260C10-9D11-468A-9828-BAAB01436E0F}#1.1#0#C:\Arquivos de Programas\GeoSan\Controles\NUsers.dll#NexusUsers
5 Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; MSCOMCTL.OCX 5 Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0; MSCOMCTL.OCX
6 Form=Forms\FrmGroups.frm 6 Form=Forms\FrmGroups.frm
7 Class=AppMode; Modules\AppMode.cls 7 Class=AppMode; Modules\AppMode.cls
@@ -19,11 +19,11 @@ Command32=&quot;&quot; @@ -19,11 +19,11 @@ Command32=&quot;&quot;
19 Name="NSecurity" 19 Name="NSecurity"
20 HelpContextID="0" 20 HelpContextID="0"
21 CompatibleMode="2" 21 CompatibleMode="2"
22 -CompatibleEXE32="NSecurity2.dll" 22 +CompatibleEXE32="NSecurity.dll"
23 VersionCompatible32="1" 23 VersionCompatible32="1"
24 -MajorVer=7  
25 -MinorVer=1  
26 -RevisionVer=2 24 +MajorVer=8
  25 +MinorVer=3
  26 +RevisionVer=0
27 AutoIncrementVer=0 27 AutoIncrementVer=0
28 ServerSupportFiles=0 28 ServerSupportFiles=0
29 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." 29 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
@@ -44,7 +44,7 @@ Retained=0 @@ -44,7 +44,7 @@ Retained=0
44 ThreadPerObject=0 44 ThreadPerObject=0
45 MaxNumberOfThreads=1 45 MaxNumberOfThreads=1
46 DebugStartupOption=2 46 DebugStartupOption=2
47 -DebugStartupComponent=C:\Arquivos de programas\Microsoft Visual Studio\VB98\VB6.EXE 47 +DebugStartupComponent=C:\Program Files\Microsoft Visual Studio\VB98\VB6.EXE
48 48
49 [MS Transaction Server] 49 [MS Transaction Server]
50 AutoRefresh=1 50 AutoRefresh=1
trunk/Projeto_NxConnection/Connection.vbp
  Diff comments   View file @3f888c3
1 Type=OleDll 1 Type=OleDll
2 Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINDOWS\system32\STDOLE2.TLB#OLE Automation 2 Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINDOWS\system32\STDOLE2.TLB#OLE Automation
3 -Reference=*\G{1BCD446E-7095-11D0-9C4E-00AA00BDD685}#1.0#0#..\..\..\..\..\Arquivos de programas\Microsoft Visual Studio\Common\Tools\APE\REGTOOL5.DLL#Registry Access Functions  
4 -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  
5 -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 3 +Reference=*\G{1BCD446E-7095-11D0-9C4E-00AA00BDD685}#1.0#0#..\..\..\..\..\Program Files\Microsoft Visual Studio\Common\Tools\APE\REGTOOL5.DLL#Registry Access Functions
  4 +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
  5 +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
6 Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 6 Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
7 Class=App; Classes\App.cls 7 Class=App; Classes\App.cls
8 Form=Forms\FrmConnection.frm 8 Form=Forms\FrmConnection.frm
trunk/Projeto_NxViewmanager/NxViewManager.vbp
  Diff comments   View file @3f888c3
@@ -31,9 +31,9 @@ HelpContextID=&quot;0&quot; @@ -31,9 +31,9 @@ HelpContextID=&quot;0&quot;
31 CompatibleMode="2" 31 CompatibleMode="2"
32 CompatibleEXE32="NxViewManager2.ocx" 32 CompatibleEXE32="NxViewManager2.ocx"
33 VersionCompatible32="1" 33 VersionCompatible32="1"
34 -MajorVer=7  
35 -MinorVer=1  
36 -RevisionVer=4 34 +MajorVer=8
  35 +MinorVer=3
  36 +RevisionVer=0
37 AutoIncrementVer=0 37 AutoIncrementVer=0
38 ServerSupportFiles=0 38 ServerSupportFiles=0
39 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." 39 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
trunk/Projeto_NxViewmanager/NxViewManager2.exp
View file @3f888c3
No preview for this file type
trunk/Projeto_NxViewmanager/NxViewManager2.lib
View file @3f888c3
No preview for this file type
trunk/Projeto_NxViewmanager/NxViewManager2.oca
View file @3f888c3
No preview for this file type
trunk/Projeto_NxViewmanager/NxViewManager2.ocx
View file @3f888c3
No preview for this file type
trunk/Projeto_NxViewmanager/ViewManager.ctl
  Diff comments   View file @3f888c3
@@ -303,7 +303,7 @@ Private Sub LoadTheme() @@ -303,7 +303,7 @@ Private Sub LoadTheme()
303 Dim i As String 303 Dim i As String
304 Dim j As String 304 Dim j As String
305 305
306 - Call SaveLoadGlobalData("C:\Arquivos de programas\GeoSan" + "\controles\variaveisGlobais.txt", False) 'Carrega as variáveis globais do GeoSan.exe 306 + Call SaveLoadGlobalData("C:\Program Files\GeoSan" + "\controles\variaveisGlobais.txt", False) 'Carrega as variáveis globais do GeoSan.exe
307 aa = "te_theme" 307 aa = "te_theme"
308 b = "te_view" 308 b = "te_view"
309 c = "theme_id" 309 c = "theme_id"
trunk/Projeto_NxViewmanager/frmTheme.frm
  Diff comments   View file @3f888c3
@@ -945,7 +945,7 @@ Public Function Init(mtvm As Object, mtheme As String, mLayerName As String) As @@ -945,7 +945,7 @@ Public Function Init(mtvm As Object, mtheme As String, mLayerName As String) As
945 Dim vetor As Variant 945 Dim vetor As Variant
946 Dim str As String 946 Dim str As String
947 'LoozeXP1.InitSubClassing 947 'LoozeXP1.InitSubClassing
948 - Call SaveLoadGlobalData("C:\Arquivos de programas\GeoSan" + "\controles\variaveisGlobais.txt", False) 'recupera as variáveis globais da aplicação principal do GeoSan 948 + Call SaveLoadGlobalData("C:\Program Files\GeoSan" + "\controles\variaveisGlobais.txt", False) 'recupera as variáveis globais da aplicação principal do GeoSan
949 Confirm = False 949 Confirm = False
950 Set tvm = mtvm 950 Set tvm = mtvm
951 LoadCboLine cboLineStyle 951 LoadCboLine cboLineStyle
trunk/Updates.txt
  Diff comments   View file @3f888c3
1 -GeoSan.exe;c:\tempApp;7.0.0.1;C:\Arquivos de programas\GeoSan  
2 -GeoSanIni.exe;c:\tempApp;2.0.0.0;C:\Arquivos de programas\GeoSan  
3 \ No newline at end of file 1 \ No newline at end of file
  2 +GeoSan.exe;c:\tempApp;7.0.0.1;C:\Program Files\GeoSan
  3 +GeoSanIni.exe;c:\tempApp;2.0.0.0;C:\Program Files\GeoSan
4 \ No newline at end of file 4 \ No newline at end of file