diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aed5473 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +#Ignore thumbnails created by Windows +Thumbs.db +#Ignore files built by Visual Studio +*.obj +*.exe +*.pdb +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +[Dd]ebug*/ +*.lib +*.sbr +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +.vs/ +#Nuget packages folder +packages/ +x64*/ +Olivia/x64*/ +Olivia/[Rr]elease*/ +Olivia/[Dd]ebug*/ +OliviaTasks/x64/ +OliviaTasks/[Rr]elease*/ +OliviaTasks/[Dd]ebug*/ +lib/ +bin/ +bin/ diff --git a/Olivia/Olivia.vcxproj b/Olivia/Olivia.vcxproj index c211e87..a99f16c 100644 --- a/Olivia/Olivia.vcxproj +++ b/Olivia/Olivia.vcxproj @@ -22,6 +22,7 @@ {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B} Olivia MFCDLLProj + 10.0.17763.0 diff --git a/Olivia/olv_limp_def.h b/Olivia/olv_limp_def.h index 8036716..7dd042d 100644 --- a/Olivia/olv_limp_def.h +++ b/Olivia/olv_limp_def.h @@ -358,7 +358,7 @@ typedef struct Info_sec { short namb; //sec[i].namb=0; olv_limp->sec[i].iamb_ini_def=-1; + olv_limp->sec[i].sec_def = i+1; olv_limp->sec[i].t_despl[0]=olv_limp->sec[i].t_despl[1]=(float)olv_limp->t_despl; for(j=0;jn_amb;j++) { @@ -6337,7 +6338,7 @@ BOOL Colv_limp_thr::pon_estado( int namb,int n_sec, Info_amb_sec *aa, Info_sec * for (i=0; i> l_sec; olvlog(LOG_TODO,"olv_limp_t","Comienza lectura de sectorización"); @@ -6613,7 +6615,7 @@ BOOL Colv_limp_thr::lee_secto() s=dbf.getI(ics); - //la primera vez lo añade vacío + //el primero lo añade vacío, por si se marca la secuencia con cuál empezar if(l_sec[dbf.getI(ics)].size()==0) l_sec[s].push_back(-1); @@ -6646,6 +6648,7 @@ BOOL Colv_limp_thr::lee_secto() for (std::map>::iterator it=l_sec.begin(); it!=l_sec.end(); ++it) { i++; + olv_limp->sec[i].sec_def = it->first; olv_limp->sec[i].namb = (int)it->second.size()-1; olv_limp->sec[i].iamb_ini_def = it->second[0]; for(int ia=1;iasec[i].namb+1;ia++) @@ -8024,7 +8027,7 @@ BOOL Colv_limp_thr::guarda_cols_ruta_tram(char *path_shp) strcpy_s(path_dbf,MAX_PATH,path_shp); //cambiaext(path_dbf,".shp",".dbf"); strcpy((Cdir_manager::extension_archivo(path_dbf)),"dbf"); - info = (char *)malloc(ntram*OLV_SHP_SZ_CAMP_CHAR); + info = (char *)malloc(ntram*OLV_SHP_SZ_CAMP_CHAR*2); //x2 porque se va a usar el mismo array para guardar int y double if(!info) { return FALSE; @@ -9255,7 +9258,7 @@ BOOL Colv_limp_thr::guarda_dbf_sector(int modo) switch(mod) { case 0://sector - dt=olv_limp->amb_sec[i].sec+1; + dt= olv_limp->sec[olv_limp->amb_sec[i].sec].sec_def; break; case 1://secuencia vacía dt=0; diff --git a/OliviaTasks/OliviaTasks.vcxproj b/OliviaTasks/OliviaTasks.vcxproj index 712826f..e7d6c65 100644 --- a/OliviaTasks/OliviaTasks.vcxproj +++ b/OliviaTasks/OliviaTasks.vcxproj @@ -22,6 +22,7 @@ {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA} OliviaTasks Win32Proj + 10.0.17763.0 diff --git a/Olivia_libs.sln b/Olivia_libs.sln new file mode 100644 index 0000000..a0f43a3 --- /dev/null +++ b/Olivia_libs.sln @@ -0,0 +1,108 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30011.22 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Olivia", "Olivia\Olivia.vcxproj", "{192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}" + ProjectSection(ProjectDependencies) = postProject + {AA58C828-7025-4A4C-868E-76B8902AF6BB} = {AA58C828-7025-4A4C-868E-76B8902AF6BB} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OliviaTasks", "OliviaTasks\OliviaTasks.vcxproj", "{A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}" + ProjectSection(ProjectDependencies) = postProject + {04E5B10E-5A75-48A2-857B-805659C7877D} = {04E5B10E-5A75-48A2-857B-805659C7877D} + {AA58C828-7025-4A4C-868E-76B8902AF6BB} = {AA58C828-7025-4A4C-868E-76B8902AF6BB} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientLic", "..\ClientLic\ClientLic.vcxproj", "{22EEEE5A-0A71-4655-B57F-5FB8E1692389}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LicServer", "..\LicServer\LicServer\LicServer.vcxproj", "{D22EED4D-CE8E-4310-9C3A-DC7DE0368623}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "licUtiles", "..\licUtiles\licUtiles.vcxproj", "{04E5B10E-5A75-48A2-857B-805659C7877D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utiles", "..\utiles\utiles.vcxproj", "{AA58C828-7025-4A4C-868E-76B8902AF6BB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileTransfer", "..\TransferSrv\FileTransfer\FileTransfer.vcxproj", "{149E3D49-90F8-44E6-A4F9-BDEE84F65A70}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TransferSrv", "..\TransferSrv\TransferSrv\TransferSrv.vcxproj", "{30C05365-2DFC-4AD4-905E-8A414AE0D0A0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Debug|Win32.ActiveCfg = Debug|Win32 + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Debug|Win32.Build.0 = Debug|Win32 + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Debug|x64.ActiveCfg = Debug|x64 + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Debug|x64.Build.0 = Debug|x64 + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Release|Win32.ActiveCfg = Release|Win32 + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Release|Win32.Build.0 = Release|Win32 + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Release|x64.ActiveCfg = Release|x64 + {192BCB82-D8B4-4FB0-807A-7CC9B6EA623B}.Release|x64.Build.0 = Release|x64 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Debug|Win32.Build.0 = Debug|Win32 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Debug|x64.ActiveCfg = Debug|x64 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Debug|x64.Build.0 = Debug|x64 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|Win32.ActiveCfg = Release|Win32 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|Win32.Build.0 = Release|Win32 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|x64.ActiveCfg = Release|x64 + {A8C66186-EDEF-4041-B7DD-B4FAFCC528EA}.Release|x64.Build.0 = Release|x64 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|Win32.ActiveCfg = Debug|Win32 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|Win32.Build.0 = Debug|Win32 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|x64.ActiveCfg = Debug|x64 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Debug|x64.Build.0 = Debug|x64 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|Win32.ActiveCfg = Release|Win32 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|Win32.Build.0 = Release|Win32 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|x64.ActiveCfg = Release|x64 + {22EEEE5A-0A71-4655-B57F-5FB8E1692389}.Release|x64.Build.0 = Release|x64 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Debug|Win32.ActiveCfg = Debug|Win32 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Debug|Win32.Build.0 = Debug|Win32 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Debug|x64.ActiveCfg = Debug|x64 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Debug|x64.Build.0 = Debug|x64 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Release|Win32.ActiveCfg = Release|Win32 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Release|Win32.Build.0 = Release|Win32 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Release|x64.ActiveCfg = Release|x64 + {D22EED4D-CE8E-4310-9C3A-DC7DE0368623}.Release|x64.Build.0 = Release|x64 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|Win32.ActiveCfg = Debug|Win32 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|Win32.Build.0 = Debug|Win32 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|x64.ActiveCfg = Debug|x64 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Debug|x64.Build.0 = Debug|x64 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Release|Win32.ActiveCfg = Release|Win32 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Release|Win32.Build.0 = Release|Win32 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Release|x64.ActiveCfg = Release|x64 + {04E5B10E-5A75-48A2-857B-805659C7877D}.Release|x64.Build.0 = Release|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|Win32.Build.0 = Debug|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|x64.ActiveCfg = Debug|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Debug|x64.Build.0 = Debug|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|Win32.ActiveCfg = Release|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|Win32.Build.0 = Release|Win32 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|x64.ActiveCfg = Release|x64 + {AA58C828-7025-4A4C-868E-76B8902AF6BB}.Release|x64.Build.0 = Release|x64 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Debug|Win32.ActiveCfg = Debug|Win32 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Debug|Win32.Build.0 = Debug|Win32 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Debug|x64.ActiveCfg = Debug|x64 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Debug|x64.Build.0 = Debug|x64 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Release|Win32.ActiveCfg = Release|Win32 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Release|Win32.Build.0 = Release|Win32 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Release|x64.ActiveCfg = Release|x64 + {149E3D49-90F8-44E6-A4F9-BDEE84F65A70}.Release|x64.Build.0 = Release|x64 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Debug|Win32.Build.0 = Debug|Win32 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Debug|x64.ActiveCfg = Debug|x64 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Debug|x64.Build.0 = Debug|x64 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Release|Win32.ActiveCfg = Release|Win32 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Release|Win32.Build.0 = Release|Win32 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Release|x64.ActiveCfg = Release|x64 + {30C05365-2DFC-4AD4-905E-8A414AE0D0A0}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4CAC4A77-AD66-4285-A26F-4551AB036F5C} + EndGlobalSection +EndGlobal