diff --git a/Olivia/Olivia.vcxproj b/Olivia/Olivia.vcxproj index bc60251..c149c32 100644 --- a/Olivia/Olivia.vcxproj +++ b/Olivia/Olivia.vcxproj @@ -22,25 +22,25 @@ {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B} Olivia MFCDLLProj - 10.0.17763.0 + 10.0 DynamicLibrary - v141 + v142 Dynamic NotSet true DynamicLibrary - v141 + v142 Dynamic NotSet DynamicLibrary - v141 + v142 Dynamic NotSet true @@ -215,7 +215,7 @@ copy ..\lib\$(IntDir)sqlite3.lib $(OutDir) copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) copy $(OutDir)Olivia.lib ..\lib\$(IntDir) -copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\ + diff --git a/Olivia/olv_limp.cpp b/Olivia/olv_limp.cpp index c39a22e..4dd169a 100644 --- a/Olivia/olv_limp.cpp +++ b/Olivia/olv_limp.cpp @@ -61,7 +61,7 @@ Colv_limp::Colv_limp(COlivia *olv) nomb_tto[0]=0; barr_mix=FALSE; usa_secuen = FALSE; - revisa_elev = TRUE; + revisa_elev = FALSE; memset(mima, 0, N_COOR_MIMA * sizeof(double)); } //******************************************************************************************************************************************* @@ -424,6 +424,12 @@ int Colv_limp::pon_config(char *config_) if(!olv->dame_param(token, camps.atr_tip_apa[OLV_ATR_TIP_AP_BAT], sizeof(camps.atr_tip_apa[OLV_ATR_TIP_AP_BAT]))) break; } + else if (strstr(token, OliviaDef::GeneralDef::GG_elev)) + { + if (!olv->dame_param(token, (int*)&revisa_elev)) + break; + + } //los campos a leer de la dbf de la red navegable /*else if (strstr(token, OliviaDef::GeneralDef::GTC_onew)) { @@ -729,7 +735,7 @@ void Colv_limp::rellena_campos() //TOM TOM sprintf_s(camps.campo_circ_ft,OLV_LIMP_MAX_CAMP,"_sen_ft"); sprintf_s(camps.campo_circ_tf, OLV_LIMP_MAX_CAMP, "_sen_tf"); - sprintf_s(camps.campo_velo,OLV_LIMP_MAX_CAMP,"_velo"); + sprintf_s(camps.campo_velo,OLV_LIMP_MAX_CAMP,"_vel"); sprintf_s(camps.campo_fow,OLV_LIMP_MAX_CAMP,"_pea"); sprintf_s(camps.campo_name,OLV_LIMP_MAX_CAMP,"_dir"); sprintf_s(camps.campo_name, OLV_LIMP_MAX_CAMP, "_evita"); diff --git a/OliviaTasks/OliviaTasks.cpp b/OliviaTasks/OliviaTasks.cpp index e5e0696..87bfe7c 100644 --- a/OliviaTasks/OliviaTasks.cpp +++ b/OliviaTasks/OliviaTasks.cpp @@ -153,7 +153,7 @@ BOOL coge_param(char *cmdline, OlvTaskProcess *task) { //ip strcpy_s(OlvApp.ip,64,token); - } + } else if(j==1) { //puerto diff --git a/OliviaTasks/OliviaTasks.vcxproj b/OliviaTasks/OliviaTasks.vcxproj index 9754d0f..900f20e 100644 --- a/OliviaTasks/OliviaTasks.vcxproj +++ b/OliviaTasks/OliviaTasks.vcxproj @@ -22,32 +22,32 @@ {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA} OliviaTasks Win32Proj - 10.0.17763.0 + 10.0 Application - v141 + v142 Dynamic MultiByte true Application - v141 + v142 Dynamic MultiByte Application - v141 + v142 Dynamic MultiByte true Application - v141 + v142 Dynamic MultiByte @@ -152,7 +152,7 @@ copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir) copy ..\Licencia\OliviaTasks.lic ..\bin\$(IntDir) -copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\ + diff --git a/includes/Olivia/OliviaDef.cs b/includes/Olivia/OliviaDef.cs index 83e7229..b3ea9ac 100644 --- a/includes/Olivia/OliviaDef.cs +++ b/includes/Olivia/OliviaDef.cs @@ -51,8 +51,8 @@ namespace OliviaDef public const int ProgrMax = 100; public const int ProgrStep = 5; public const int ParamN = 5; - public const int ParamLimpN = 44; - public const int ParamRecoN = 42; + public const int ParamLimpN = 45; + public const int ParamRecoN = 43; /* * Define el separador entre parĂ¡metros de la llamada al proceso oliviatasks */ @@ -160,6 +160,8 @@ namespace OliviaDef public const string GG_hini = "h_inicio"; public const string GG_trafic = "trafico"; public const string GG_ais = "aislados"; + public const string GG_elev = "elevacion"; + /** * Define las propiedades de limpieza a enviar a oliviatasks