diff --git a/Olivia/Olivia.rc b/Olivia/Olivia.rc index 0081c4d..8b94da8 100644 --- a/Olivia/Olivia.rc +++ b/Olivia/Olivia.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,1,3,0 - PRODUCTVERSION 3,1,3,0 + FILEVERSION 3,1,5,0 + PRODUCTVERSION 3,1,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,12 +46,12 @@ BEGIN BEGIN VALUE "CompanyName", "VSM" VALUE "FileDescription", "Librería de la aplicación Olivia" - VALUE "FileVersion", "3.1.3.0" + VALUE "FileVersion", "3.1.5.0" VALUE "InternalName", "Olivia.dll" VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved." VALUE "OriginalFilename", "Olivia.dll" VALUE "ProductName", "OLIVIA" - VALUE "ProductVersion", "3.1.3.0" + VALUE "ProductVersion", "3.1.5.0" END END BLOCK "VarFileInfo" diff --git a/Olivia/olv_limp_thr.cpp b/Olivia/olv_limp_thr.cpp index 5377d84..e0a037e 100644 --- a/Olivia/olv_limp_thr.cpp +++ b/Olivia/olv_limp_thr.cpp @@ -9719,7 +9719,7 @@ BOOL Colv_limp_thr::genera_list_rut_ctrl() { Info_planif *pp; Colv_csv cc; - char tto_desp[32],observ[32],calle[1024],path_csv[MAX_PATH],fila[256],fila0[256]; + char tto_desp[32],observ[32],calle[1024],path_csv[MAX_PATH],fila[256],fila0[256], calle_ultima[1024]; int i,j,h,m,seg,ii,dt; double ltot,ltot0,tt,t0,linst[2]; BOOL mal; @@ -9727,6 +9727,7 @@ BOOL Colv_limp_thr::genera_list_rut_ctrl() double lttt; linst[0] = linst[1] = 0; + calle_ultima[0] = 0; mal=FALSE; strcpy_s(path_csv,MAX_PATH,olv_limp->olv->paths.path_data); @@ -9872,6 +9873,18 @@ BOOL Colv_limp_thr::genera_list_rut_ctrl() else calle[0]=0; + if (calle[0] == 0) + { + //si no ha encontrado nombre de calle y tiene guardado el último, lo copia + if(calle_ultima[0] != 0) + strcpy_s(calle, 1024, calle_ultima); + } + else + { + //se guarda la última calle para usarla si la siguiente no encuentra nombre + strcpy_s(calle_ultima, 1024, calle); + } + tt=pp->elem[i].coste+t0; //a todos los costes de la ruta se añade el tiempo de desplazamiento ltot=ltot0+pp->elem[i].ltot; ltot0=0; diff --git a/OliviaTasks/OliviaTasks.rc b/OliviaTasks/OliviaTasks.rc index bcb2c27..4cf56c4 100644 --- a/OliviaTasks/OliviaTasks.rc +++ b/OliviaTasks/OliviaTasks.rc @@ -82,8 +82,8 @@ MAINICON ICON "favicon.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,1,3,0 - PRODUCTVERSION 3,1,3,0 + FILEVERSION 3,1,5,0 + PRODUCTVERSION 3,1,5,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -100,12 +100,12 @@ BEGIN BEGIN VALUE "CompanyName", "VSM" VALUE "FileDescription", "Launcher de la aplicación Olivia" - VALUE "FileVersion", "3.1.3.0" + VALUE "FileVersion", "3.1.5.0" VALUE "InternalName", "OliviaTasks" VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved." VALUE "OriginalFilename", "OliviaTasks.exe" VALUE "ProductName", "OliviaTasks" - VALUE "ProductVersion", "3.1.3.0" + VALUE "ProductVersion", "3.1.5.0" END END BLOCK "VarFileInfo"