Download as
Browse Code »

Commit 99339a04501cc6dd665f3366c51ab0978f97bfa2

Authored by José Maria Villac Pinheiro
1 parent 3b3ecfd1
Exists in textosRedesEsgoto

V. 8.1.2 - Os textos dos materiais das redes de esgoto não estavam funcionando. Corrigido.

Showing 7 changed files with 11 additions and 6 deletions   Show diff stats
install/GeraSetupGeoSan/ArquivosInstGeoSan/GeoSan.exe
View file @99339a0
No preview for this file type
install/GeraSetupGeoSan/Codigo Gerador Instalador Geosan com TerraComponents.iss
  Diff comments   View file @99339a0
1 1 #define SetupBaseName "SetupGeoSan-v."
2   -#define AppVersionFile "08.02.00"
  2 +#define AppVersionFile "08.01.02"
3 3  
4 4 [Setup]
5 5 AppName=GeoSan
... ...
trunk/GeoSan.exe
View file @99339a0
No preview for this file type
trunk/GeoSan.vbp
  Diff comments   View file @99339a0
... ... @@ -139,8 +139,8 @@ Class=clsRamalController; classes\clsRamalController.cls
139 139 Class=clsConsumidorModel; classes\clsConsumidorModel.cls
140 140 Class=clsConsumidorControler; classes\clsConsumidorControler.cls
141 141 Object={F03ABD98-7B60-43E4-9934-DA5F0D19FDAC}#1.0#0; TeComViewManager.dll
142   -ResFile32="GeoSan.RES"
143 142 Class=CAcertaZsDosNosEsgoto; classes\CAcertaZsDosNosEsgoto.cls
  143 +ResFile32="GeoSan.RES"
144 144 IconForm="FrmMain"
145 145 Startup="Sub Main"
146 146 HelpFile=""
... ... @@ -153,7 +153,7 @@ HelpContextID="0"
153 153 CompatibleMode="0"
154 154 MajorVer=8
155 155 MinorVer=1
156   -RevisionVer=1
  156 +RevisionVer=2
157 157 AutoIncrementVer=0
158 158 ServerSupportFiles=0
159 159 VersionCompanyName="NEXUS GeoEngenharia e Com. Ltda."
... ...
trunk/Modules/Global.bas
  Diff comments   View file @99339a0
... ... @@ -201,7 +201,7 @@ Public Sub Main()
201 201 End If
202 202 'Configura a versão atual do GeoSan
203 203 Versao_Geo = App.Major & "." & App.Minor & "." & App.Revision
204   - Versao_Geo = "08.02.00"
  204 + Versao_Geo = "08.01.02"
205 205 glo.diretorioGeoSan = App.path 'salva globalmente o caminho onde encontra-se o GeoSan.exe
206 206 SaveLoadGlobalData glo.diretorioGeoSan + "/controles/variaveisGlobais.txt", True 'salva em um arquivo todas as variáveis globais para poderem ser acessadas por outras aplicações
207 207 connn = ""
... ...
trunk/Projeto_NxViewmanager/NxViewManager2.oca
View file @99339a0
No preview for this file type
trunk/classes/clsTerraLib.cls
  Diff comments   View file @99339a0
... ... @@ -989,13 +989,18 @@ End Function
989 989 Private Function InsertTextAttributesLine(LayerName As String, geom_id As Long, object_id As String) As Boolean
990 990 On Error GoTo Trata_Erro
991 991 Dim Length As Double, Diameter As String, Material As String, CotaIni As Double, CotaFim As Double
  992 +
  993 + If cgeo.GetTypeText(tcs.getCurrentLayer) = 1 Then ' redes de água
  994 + a = "X_MATERIAL"
  995 + Else ' redes de esgoto ou drenagem
  996 + a = "X_MATERIAL_ESGOTO"
  997 + End If
992 998  
993   - a = "X_MATERIAL"
994 999 b = "MATERIAL"
995 1000 c = "MATERIALID"
996 1001 d = "OBJECT_ID_"
997 1002 If frmCanvas.TipoConexao <> 4 Then
998   - Set rs = Conn.execute("SELECT * From " & tcs.getCurrentLayer & " left JOIN x_Material on material=materialid where object_id_='" & object_id & "'")
  1003 + Set rs = Conn.execute("SELECT * From " & tcs.getCurrentLayer & " left JOIN " & a & " on material=materialid where object_id_='" & object_id & "'")
999 1004 Else
1000 1005 'MsgBox "ARQUIVO DEBUG SALVO"
1001 1006 'WritePrivateProfileString "A", "A", "SELECT * From " + """" + tcs.getCurrentLayer + """" + " left JOIN " + """" + a + """" + " on" + """" + b + """" + "=" + """" + c + """" + " where " + """" + d + """" + "='" & object_id & "'", App.path & "\DEBUG.INI"
... ...