Narvaling
/
Olivia_v2017
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrección falta nombre de calle en csv y subida versión

Gerardo/estandarizacion
Elena 2023-04-16 21:32:59 +02:00
parent 070f041570
commit 64ab326c67
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Olivia/Olivia.rc
View File

@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,3,0 FILEVERSION 3,1,5,0
PRODUCTVERSION 3,1,3,0 PRODUCTVERSION 3,1,5,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -46,12 +46,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "VSM" VALUE "CompanyName", "VSM"
VALUE "FileDescription", "Librería de la aplicación Olivia" 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 "InternalName", "Olivia.dll"
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved." VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
VALUE "OriginalFilename", "Olivia.dll" VALUE "OriginalFilename", "Olivia.dll"
VALUE "ProductName", "OLIVIA" VALUE "ProductName", "OLIVIA"
VALUE "ProductVersion", "3.1.3.0" VALUE "ProductVersion", "3.1.5.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

15
Olivia/olv_limp_thr.cpp
View File

@ -9719,7 +9719,7 @@ BOOL Colv_limp_thr::genera_list_rut_ctrl()
{ {
Info_planif *pp; Info_planif *pp;
Colv_csv cc; 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; int i,j,h,m,seg,ii,dt;
double ltot,ltot0,tt,t0,linst[2]; double ltot,ltot0,tt,t0,linst[2];
BOOL mal; BOOL mal;
@ -9727,6 +9727,7 @@ BOOL Colv_limp_thr::genera_list_rut_ctrl()
double lttt; double lttt;
linst[0] = linst[1] = 0; linst[0] = linst[1] = 0;
calle_ultima[0] = 0;
mal=FALSE; mal=FALSE;
strcpy_s(path_csv,MAX_PATH,olv_limp->olv->paths.path_data); 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 else
calle[0]=0; 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 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; ltot=ltot0+pp->elem[i].ltot;
ltot0=0; ltot0=0;

8
OliviaTasks/OliviaTasks.rc
View File

@ -82,8 +82,8 @@ MAINICON ICON "favicon.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,3,0 FILEVERSION 3,1,5,0
PRODUCTVERSION 3,1,3,0 PRODUCTVERSION 3,1,5,0
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -100,12 +100,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "VSM" VALUE "CompanyName", "VSM"
VALUE "FileDescription", "Launcher de la aplicación Olivia" VALUE "FileDescription", "Launcher de la aplicación Olivia"
VALUE "FileVersion", "3.1.3.0" VALUE "FileVersion", "3.1.5.0"
VALUE "InternalName", "OliviaTasks" VALUE "InternalName", "OliviaTasks"
VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved." VALUE "LegalCopyright", "OLIVIA (c) VSM 2020. All rights reserved."
VALUE "OriginalFilename", "OliviaTasks.exe" VALUE "OriginalFilename", "OliviaTasks.exe"
VALUE "ProductName", "OliviaTasks" VALUE "ProductName", "OliviaTasks"
VALUE "ProductVersion", "3.1.3.0" VALUE "ProductVersion", "3.1.5.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"