diff --git a/Olivia/olv.cpp b/Olivia/olv.cpp index cf1a8af..4e92253 100644 --- a/Olivia/olv.cpp +++ b/Olivia/olv.cpp @@ -40,7 +40,7 @@ COlivia::COlivia(void) olv_reco=NULL; olv_sock = new Colv_sock(this); lock = new Clock(); - strcpy_s(paths.path_cfg_geo,"C:\\olivia\\cfg_geo.ini"); + strcpy_s(paths.path_cfg_geo,""); modo_multitask=FALSE; memset(&infotask,0,sizeof(InfoIniTask)); @@ -213,7 +213,7 @@ BOOL COlivia::inicia(char *cmdline,char *err, int nerr) BOOL ret = TRUE; borra_log_old();//borra log antiguo----- - olvlog(LOG_TODO, "olv", "Param %s", cmdline); + //olvlog(LOG_TODO, "olv", "Param %s", cmdline); if(!coge_param(cmdline)) { diff --git a/Olivia/olv_limp.cpp b/Olivia/olv_limp.cpp index 9d18d38..53d5d19 100644 --- a/Olivia/olv_limp.cpp +++ b/Olivia/olv_limp.cpp @@ -470,6 +470,48 @@ int Colv_limp::pon_config(char *config_) if(!olv->dame_param(token, camps.atr_circ[OLV_ATR_CIRC_PEDES], sizeof(camps.atr_circ[OLV_ATR_CIRC_PEDES]))) break; } + else if (strstr(token, OliviaDef::GeneralDef::GTO_anch_peat)) + { + if (!olv->dame_param(token, &anchos_def[OLV_ANCH_DEF_PEAT])) + break; + } + else if (strstr(token, OliviaDef::GeneralDef::GTO_anch_ace)) + { + if (!olv->dame_param(token, &anchos_def[OLV_ANCH_DEF_ACE])) + break; + } + else if (strstr(token, OliviaDef::GeneralDef::GTO_anch_aplin)) + { + if (!olv->dame_param(token, &anchos_def[OLV_ANCH_DEF_APLIN])) + break; + } + else if (strstr(token, OliviaDef::GeneralDef::GTO_anch_apbat)) + { + if (!olv->dame_param(token, &anchos_def[OLV_ANCH_DEF_APBAT])) + break; + } + else if (strstr(token, OliviaDef::GeneralDef::GTO_anch_bordlib)) + { + if (!olv->dame_param(token, &anchos_def[OLV_ANCH_DEF_BORD])) + break; + } + else if (strstr(token, OliviaDef::GeneralDef::GTO_girmax)) + { + double ang; + if (!olv->dame_param(token, &ang)) + break; + ang_lim = ang * OLV_PI / 180; + } + else if (strstr(token, OliviaDef::GeneralDef::GTO_desv_max)) + { + if (!olv->dame_param(token, &DESV_MAX)) + break; + } + else if (strstr(token, OliviaDef::GeneralDef::GTO_desv_max_abs)) + { + if (!olv->dame_param(token, &DESV_MAX_ABS)) + break; + } else { token = strtok(NULL, OliviaDef::GeneralDef::EjecGeoParamSep); @@ -504,7 +546,7 @@ BOOL Colv_limp::rellena_campos_ini(char *path) if(!ini.lee(path)) return FALSE; - + /* param=OliviaDef::GeneralDef::GrupoCampoLimp; ig=ini.get_grupo(param.GetBuffer(param.GetLength())); if(ig>=0) @@ -548,7 +590,7 @@ BOOL Colv_limp::rellena_campos_ini(char *path) param=OliviaDef::GeneralDef::GAL_ap_bat; strcpy_s(camps.atr_tip_apa[OLV_ATR_TIP_AP_BAT],OLV_LIMP_MAX_CAMP,ini.get(ig,param.GetBuffer(param.GetLength()),camps.atr_tip_apa[OLV_ATR_TIP_AP_BAT])); - } + }*/ ////////////////////////////////////////////////////// param=OliviaDef::GeneralDef::GrupoCampoOtros; ig=ini.get_grupo(param.GetBuffer(param.GetLength())); @@ -672,7 +714,7 @@ void Colv_limp::rellena_campos() DESV_MAX=OLV_DESV_MAX; DESV_MAX_ABS=OLV_DESV_MAX_ABS; - if(olv->paths.path_cfg_geo[0]) + if(olv->paths.path_cfg_geo!=NULL && olv->paths.path_cfg_geo[0]!='0' && olv->paths.path_cfg_geo[0]!=0) { rellena_campos_ini(olv->paths.path_cfg_geo); } diff --git a/Olivia/olv_reco.cpp b/Olivia/olv_reco.cpp index 7f08342..c40a8de 100644 --- a/Olivia/olv_reco.cpp +++ b/Olivia/olv_reco.cpp @@ -303,7 +303,7 @@ void Colv_reco::rellena_campos_sens() info_sens.modo_pet=OLV_SENS_PET_UNICO; info_sens.porc_lim= 0; - if(olv->paths.path_cfg_geo[0]) + if(olv->paths.path_cfg_geo != NULL && olv->paths.path_cfg_geo[0] != '0' && olv->paths.path_cfg_geo[0] != 0) { if(!lee_campos_sens_ini(olv->paths.path_cfg_geo)) guarda_campos_sens_ini(olv->paths.path_cfg_geo); diff --git a/OliviaTasks/OliviaTasks.cpp b/OliviaTasks/OliviaTasks.cpp index 58a4c3c..9dec095 100644 --- a/OliviaTasks/OliviaTasks.cpp +++ b/OliviaTasks/OliviaTasks.cpp @@ -65,6 +65,10 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm ShowWindow(Stealth,SW_SHOWNORMAL); #endif + +#ifdef _DEBUG + system("pause"); +#endif //pilla path temporal StrArray buf; strcpy(app->log.nombre,"Olivia"); @@ -73,10 +77,6 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm strcpy(app->log.path,buf.get(nn)); buf.borra(); -#ifdef _DEBUG - system("pause"); -#endif - //verifica versión----------------------------------- ClienteLicencias lic; char strtem[MAX_PATH];