diff --git a/OliviaAddIn/Base/LimpiezaDef.cs b/OliviaAddIn/Base/LimpiezaDef.cs index 8e3a0ef..150f8d6 100644 --- a/OliviaAddIn/Base/LimpiezaDef.cs +++ b/OliviaAddIn/Base/LimpiezaDef.cs @@ -132,6 +132,17 @@ namespace OliviaAddIn public static int vdespLS; //OLIVIA AddIn {0718b3b3-5422-4d80-97ad-f72b18a3e476} Add-In de ArcMap para la herramienta de optimización de la limpieza viaria, OLIVIA. - 2.0.0.0 + 2.0.0.3 Images\OliviaAddIn.png VSM VSM - 15/12/2019 + 09/03/2020 diff --git a/OliviaAddIn/Dlg/RecogidaDlg.cs b/OliviaAddIn/Dlg/RecogidaDlg.cs index c9492a8..9b6b9a8 100644 --- a/OliviaAddIn/Dlg/RecogidaDlg.cs +++ b/OliviaAddIn/Dlg/RecogidaDlg.cs @@ -283,7 +283,7 @@ namespace OliviaAddIn OliviaGlob.gdb_reco.carg_otra = RecogidaDef.tipos_carg_str[reco.tipo_carg]; } reco.lateralidad = -1; - if (comboBox_lateralidad.Visible == true) + if (reco.tipo_carg == (int)RecogidaDef.TiposCarga.Lateral) { reco.lateralidad = comboBox_lateralidad.SelectedIndex; if (reco.lateralidad == -1) @@ -930,6 +930,7 @@ namespace OliviaAddIn //guarda el path completo de la clase OliviaGlob.gdb_reco.path_class = path_recogida; + OliviaGlob.gdb_reco.path_import=null; //se comprueba que la capa seleccionada sea de puntos fc = FunGDB.abre_ftclass(OliviaGlob.gdb_reco.path_class); diff --git a/OliviaAddIn/Ejecuta/Ejecuta.cs b/OliviaAddIn/Ejecuta/Ejecuta.cs index 064969f..f522718 100644 --- a/OliviaAddIn/Ejecuta/Ejecuta.cs +++ b/OliviaAddIn/Ejecuta/Ejecuta.cs @@ -123,7 +123,7 @@ namespace OliviaAddIn GeneralDef.EjecGeoParamSep + GeneralDef.GG_port + GeneralDef.EjecGeoParamIgual + OliviaGlob.puerto + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_tout + GeneralDef.EjecGeoParamIgual + OliviaGlob.t_out_sock + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_pt + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathTemp + " " + - GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathWork + "cfg_geo.ini" + " " ; + GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathCfg + " "; pfi = new ProcessStartInfo(OliviaGlob.Paths.PathExeOlivia, args); System.Diagnostics.Process.Start(pfi); diff --git a/OliviaAddIn/Gdb/DatosGDB.cs b/OliviaAddIn/Gdb/DatosGDB.cs index 14fa726..5dc7dff 100644 --- a/OliviaAddIn/Gdb/DatosGDB.cs +++ b/OliviaAddIn/Gdb/DatosGDB.cs @@ -1506,19 +1506,21 @@ namespace OliviaAddIn string[] list = Directory.GetFiles(OliviaGlob.Paths.DirData, capa + ".*"); ext = System.IO.Path.GetExtension(list[0]); copia = System.IO.Path.GetDirectoryName(list[0]) + "\\" + System.IO.Path.GetFileNameWithoutExtension(list[0]) + name_aux + ext; - if (!File.Exists(copia)) + foreach (string f in list) { - foreach (string f in list) + if (System.IO.Path.GetExtension(f) == ".lock") + continue; + + ext = System.IO.Path.GetExtension(f); + copia = System.IO.Path.GetDirectoryName(f) + "\\" + System.IO.Path.GetFileNameWithoutExtension(f) + name_aux + ext; + if (File.Exists(copia)) { - if (System.IO.Path.GetExtension(f) == ".lock") - continue; - ext = System.IO.Path.GetExtension(f); - copia = System.IO.Path.GetDirectoryName(f) + "\\" + System.IO.Path.GetFileNameWithoutExtension(f) + name_aux + ext; - File.Copy(f, copia, false); + File.Delete(copia); } - return copia; + File.Copy(f, copia, false); } return copia; + } catch (Exception) { diff --git a/OliviaAddIn/Gdb/FunGDB.cs b/OliviaAddIn/Gdb/FunGDB.cs index 5d2449d..c4f073c 100644 --- a/OliviaAddIn/Gdb/FunGDB.cs +++ b/OliviaAddIn/Gdb/FunGDB.cs @@ -102,7 +102,7 @@ namespace OliviaAddIn path = null; } replacing = gxdlg.ReplacingObject; - final_loc = gxdlg.InternalCatalog.SelectedObject.Name; + final_loc = gxdlg.InternalCatalog.Selection.Location.Name; gxdlg.InternalCatalog.Close(); libera(gxdlg); diff --git a/OliviaDef/OliviaDef.cs b/OliviaDef/OliviaDef.cs index 085741b..6d696fb 100644 --- a/OliviaDef/OliviaDef.cs +++ b/OliviaDef/OliviaDef.cs @@ -125,6 +125,7 @@ namespace OliviaDef * Define el nombre del grupo de campos de la red navegable */ public const string GrupoCampoNW = "CAMPOS_NW"; + public const string GrupoCampoOtros = "OTROS_PARAM"; /** * Define el nombre del grupo de propiedades generales */ @@ -170,12 +171,6 @@ namespace OliviaDef /** * Define las propiedades de recogida a enviar a oliviatasks */ - //public const string GR_acce = "accesibilidad"; - //public const string GR_frac = "fracciion"; - //public const string GR_carg = "carga"; - //public const string GR_vehi = "vehiculo"; - //public const string GR_cap = "capacidad"; - //public const string GR_llen = "llenado"; public const string GR_camp_cap = "campo_capaci"; public const string GR_kgM = "kg_max"; public const string GR_camp_uds = "campo_uds"; @@ -519,6 +514,18 @@ namespace OliviaDef public const string GTA_FT = "atr_FT"; public const string GTA_N = "atr_N"; public const string GTA_pedes = "atr_pedes"; + + /** + * Nombre de los campos que lee en limpieza + */ + public const string GTO_girmax ="Giro_max_vehiculo"; + public const string GTO_anch_peat ="Ancho_peat_def"; + public const string GTO_anch_ace = "Ancho_acera_def"; + public const string GTO_anch_aplin = "Ancho_ap_lin_def"; + public const string GTO_anch_apbat = "Ancho_ap_bat_def"; + public const string GTO_anch_bordlib = "Ancho_bord_lib_def"; + public const string GTO_desv_max = "Desv_max"; + public const string GTO_desv_max_abs = "Desv_max_abs"; /** * Define el nombre para mandar a oliviatasks la configuración */ diff --git a/OliviaDef/OliviaDef.csproj b/OliviaDef/OliviaDef.csproj index 77b8ad9..2138430 100644 --- a/OliviaDef/OliviaDef.csproj +++ b/OliviaDef/OliviaDef.csproj @@ -76,7 +76,7 @@ - xcopy "$(ProjectDir)OliviaDef.cs" "..\..\..\..\..\geoincludes\" /y + xcopy "$(ProjectDir)OliviaDef.cs" "..\..\..\..\..\v2008\Olivia\includes\olivia\" /y