From 99339a04501cc6dd665f3366c51ab0978f97bfa2 Mon Sep 17 00:00:00 2001 From: José Maria Villac Pinheiro Date: Sat, 15 Jan 2022 00:31:46 -0200 Subject: [PATCH] V. 8.1.2 - Os textos dos materiais das redes de esgoto não estavam funcionando. Corrigido. --- install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe | Bin 3997696 -> 0 bytes install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss | 2 +- trunk/GeoSan.exe | Bin 3997696 -> 0 bytes trunk/GeoSan.vbp | 4 ++-- trunk/Modules/Global.bas | 2 +- trunk/Projeto_NxViewmanager/NxViewManager2.oca | Bin 19968 -> 0 bytes trunk/classes/clsTerraLib.cls | 9 +++++++-- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe b/install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe index 7666bc7..a917202 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 f408ea3..9cc65a5 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 "08.02.00" +#define AppVersionFile "08.01.02" [Setup] AppName=GeoSan diff --git a/trunk/GeoSan.exe b/trunk/GeoSan.exe index 7666bc7..a917202 100644 Binary files a/trunk/GeoSan.exe and b/trunk/GeoSan.exe differ diff --git a/trunk/GeoSan.vbp b/trunk/GeoSan.vbp index f81ffcc..38a66b2 100644 --- a/trunk/GeoSan.vbp +++ b/trunk/GeoSan.vbp @@ -139,8 +139,8 @@ Class=clsRamalController; classes\clsRamalController.cls Class=clsConsumidorModel; classes\clsConsumidorModel.cls Class=clsConsumidorControler; classes\clsConsumidorControler.cls Object={F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0; TeComViewManager.dll -ResFile32="GeoSan.RES" Class=CAcertaZsDosNosEsgoto; classes\CAcertaZsDosNosEsgoto.cls +ResFile32="GeoSan.RES" IconForm="FrmMain" Startup="Sub Main" HelpFile="" @@ -153,7 +153,7 @@ HelpContextID="0" CompatibleMode="0" MajorVer=8 MinorVer=1 -RevisionVer=1 +RevisionVer=2 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda." diff --git a/trunk/Modules/Global.bas b/trunk/Modules/Global.bas index fc1be15..96c4e89 100644 --- a/trunk/Modules/Global.bas +++ b/trunk/Modules/Global.bas @@ -201,7 +201,7 @@ Public Sub Main() End If 'Configura a versão atual do GeoSan Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision - Versao_Geo = "08.02.00" + Versao_Geo = "08.01.02" 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 = "" diff --git a/trunk/Projeto_NxViewmanager/NxViewManager2.oca b/trunk/Projeto_NxViewmanager/NxViewManager2.oca index e5e08f0..43f6756 100644 Binary files a/trunk/Projeto_NxViewmanager/NxViewManager2.oca and b/trunk/Projeto_NxViewmanager/NxViewManager2.oca differ diff --git a/trunk/classes/clsTerraLib.cls b/trunk/classes/clsTerraLib.cls index 9f0a30c..0b09be3 100644 --- a/trunk/classes/clsTerraLib.cls +++ b/trunk/classes/clsTerraLib.cls @@ -989,13 +989,18 @@ End Function Private Function InsertTextAttributesLine(LayerName As String, geom_id As Long, object_id As String) As Boolean On Error GoTo Trata_Erro Dim Length As Double, Diameter As String, Material As String, CotaIni As Double, CotaFim As Double + + If cgeo.GetTypeText(tcs.getCurrentLayer) = 1 Then ' redes de água + a = "X_MATERIAL" + Else ' redes de esgoto ou drenagem + a = "X_MATERIAL_ESGOTO" + End If - a = "X_MATERIAL" b = "MATERIAL" c = "MATERIALID" d = "OBJECT_ID_" If frmCanvas.TipoConexao <> 4 Then - Set rs = Conn.execute("SELECT * From " & tcs.getCurrentLayer & " left JOIN x_Material on material=materialid where object_id_='" & object_id & "'") + Set rs = Conn.execute("SELECT * From " & tcs.getCurrentLayer & " left JOIN " & a & " on material=materialid where object_id_='" & object_id & "'") Else 'MsgBox "ARQUIVO DEBUG SALVO" 'WritePrivateProfileString "A", "A", "SELECT * From " + """" + tcs.getCurrentLayer + """" + " left JOIN " + """" + a + """" + " on" + """" + b + """" + "=" + """" + c + """" + " where " + """" + d + """" + "='" & object_id & "'", App.path & "\DEBUG.INI" -- libgit2 0.21.2