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

Compare commits

base: Narvaling:01f5f499e780508d3eff042a3b3c8880fe639df3
Branches Tags
Narvaling:master
Narvaling:Gerardo/ModosViaje
Narvaling:Gerardo/estandarizacion
..
compare: Narvaling:a3511c130aa5d8ca90fcd6fe448f1cc32d866154
Branches Tags
Narvaling:master
Narvaling:Gerardo/ModosViaje
Narvaling:Gerardo/estandarizacion

No commits in common. "01f5f499e780508d3eff042a3b3c8880fe639df3" and "a3511c130aa5d8ca90fcd6fe448f1cc32d866154" have entirely different histories.
01f5f499e7 ... a3511c130a

2 changed files with 17 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
Olivia/Olivia.vcxproj
View File

@ -335,7 +335,7 @@ copy ..\lib\$(IntDir)sqlite3.lib $(OutDir)</Command>
<PostBuildEvent>
<Command>copy $(OutDir)$(TargetFileName) ..\bin\$(IntDir)
copy $(OutDir)Olivia.lib ..\lib\$(IntDir)
</Command>
copy $(OutDir)$(TargetFileName) D:\Proyectos\Olivia\Instal2.0\bin\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>

31
Olivia/olv_limp_thr.cpp
View File

@ -889,8 +889,8 @@ BOOL Colv_limp_thr::rellena_info_nw()
{
///////////////////////////////
ispedestrian=FALSE;
if (olv_limp->res_circ != OLV_RES_NO)
{
if(olv_limp->res_circ!=OLV_RES_NO)
{
//("FOW" =3 OR "FOW">=7) AND ("ONEWAY" = 'N' OR "ONEWAY" = ' ' )
//si se cumple lo anterior, son como doble sentido pero no se replican
//////////////////////////
@ -898,41 +898,42 @@ BOOL Colv_limp_thr::rellena_info_nw()
int sentf, senft;
sentf = dbf.getI(icampstf);
senft = dbf.getI(icampsft);
s = 0;
if (sentf && senft)
s=0;
if(sentf && senft)
{
nboth++;
}
else if (sentf)
else if(sentf)
{
s = OLV_LIMP_FLG_CIRC_TF;
s=OLV_LIMP_FLG_CIRC_TF;
ntf++;
}
else if (senft)
else if(senft)
{
s = OLV_LIMP_FLG_CIRC_FT;
s=OLV_LIMP_FLG_CIRC_FT;
nft++;
}
else
{
//no aplica la restricción por ser servicio público, cómo se sabe si es de un único sentido?
s = OLV_LIMP_FLG_CIRC_NONE;
s=OLV_LIMP_FLG_CIRC_NONE;
nno++;
}
///////////////////////////////
//fow
f = dbf.getI(icampf);
f=dbf.getI(icampf);
//solo mira si es pedestrian, f==14
if (f)
if(f)
{
s = OLV_LIMP_FLG_CIRC_NONE;
ispedestrian = TRUE;
s=OLV_LIMP_FLG_CIRC_NONE;
ispedestrian=TRUE;
}
///////////////////////////////
olv_limp->iaso[ia].flgs |= s;
olv_limp->iaso[ia].flgs|=s;
}
///////////////////////////////