From e834cdfb578d7d7de4159714caccfb2f63b6c575 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Fri, 17 Feb 2023 11:16:44 +0100 Subject: [PATCH] =?UTF-8?q?Arreglos=20varios=20pedidos=20de=20cambio=20de?= =?UTF-8?q?=20t=C3=ADtulos=20y=20env=C3=ADo=20de=20mima=20de=20nw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Helper/HelperGdb.cs | 4 ++-- Model/OliviaConf.cs | 4 ++-- Model/OliviaDef.cs | 9 +++++++-- Model/TratamientoComun.cs | 4 ++++ Services/ConfigServ.cs | 2 +- Services/EjecServ.cs | 6 +++++- Services/LanzaSrv/LanzaLimpSrv.cs | 7 ++++++- Services/LanzaSrv/LanzaRecoSrv.cs | 7 ++++++- View/Configuracion/PaneConfigView.xaml | 9 ++++++--- View/Limpieza/PaneLimpiezaSub2.xaml.cs | 6 +++--- 10 files changed, 42 insertions(+), 16 deletions(-) diff --git a/Helper/HelperGdb.cs b/Helper/HelperGdb.cs index 4ae5073..9950349 100644 --- a/Helper/HelperGdb.cs +++ b/Helper/HelperGdb.cs @@ -77,7 +77,7 @@ namespace OliviaAddInPro.Helper } //Proceso para sacar un diálogo y seleccionar una o varias geometrías de dentro de una fclass - public static ArcGIS.Core.Geometry.Geometry OpenGeom(TiposOpenFileDlg tipo, out string txt_sal, string initialLoc = "") + public static ArcGIS.Core.Geometry.Geometry OpenGeom(TiposOpenFileDlg tipo, out string txt_sal, string initialLoc = "", bool multisel = false) { //inicialmente ArcGIS.Core.Geometry.Geometry geom = null; @@ -88,7 +88,7 @@ namespace OliviaAddInPro.Helper if (fc != null) { //hace geom - geom = SelecLeeGeom(fc, out txt_sal, true); + geom = SelecLeeGeom(fc, out txt_sal, multisel); if (geom == null && (HelperGdb.OutStr.Length > 0)) HelperGlobal.ponMsg(HelperGdb.OutStr, System.Windows.MessageBoxImage.Error); diff --git a/Model/OliviaConf.cs b/Model/OliviaConf.cs index ef84e95..03aa0d9 100644 --- a/Model/OliviaConf.cs +++ b/Model/OliviaConf.cs @@ -239,14 +239,14 @@ namespace OliviaAddInPro.Model [Category("General")] [PropertyOrder(5)] - [DisplayName("GDB para Importación")] + [DisplayName("GDB para Resultados")] [Description("Gdb en la que se importarán los resultados de la ejecución")] [Editor(typeof(PropertyGridFilePickerGDB), typeof(PropertyGridFilePickerGDB))] public string Path_Gdb_Import { get; set; } [Category("General")] [PropertyOrder(6)] - [DisplayName("Dataset para Importación")] + [DisplayName("Dataset para Resultados")] [Description("Dataset, dentro de la GDB, en la que se importarán los resultados de la ejecución")] [Editor(typeof(PropertyGridFilePickerDataset), typeof(PropertyGridFilePickerDataset))] public string Path_Dataset_Import { get; set; } diff --git a/Model/OliviaDef.cs b/Model/OliviaDef.cs index effee8a..fe9ffd1 100644 --- a/Model/OliviaDef.cs +++ b/Model/OliviaDef.cs @@ -51,8 +51,8 @@ namespace OliviaAddInPro.Model public const int ProgrMax = 100; public const int ProgrStep = 5; public const int ParamN = 5; - public const int ParamLimpN = 48; - public const int ParamRecoN = 46; + public const int ParamLimpN = 52; + public const int ParamRecoN = 50; /* * Define el separador entre parámetros de la llamada al proceso oliviatasks */ @@ -533,6 +533,11 @@ namespace OliviaAddInPro.Model public const string GTO_camp_objectid = "Camp_objectid"; public const string GTO_camp_sector = "Camp_sector"; public const string GTO_camp_secuencia = "Camp_secuencia"; + //mima + public const string GTO_mima_xmin = "Coor_mima_xmin"; + public const string GTO_mima_xmax = "Coor_mima_xmax"; + public const string GTO_mima_ymin = "Coor_mima_ymin"; + public const string GTO_mima_ymax = "Coor_mima_ymax"; /** * Define el nombre para mandar a oliviatasks la configuración diff --git a/Model/TratamientoComun.cs b/Model/TratamientoComun.cs index 199a597..8f291f8 100644 --- a/Model/TratamientoComun.cs +++ b/Model/TratamientoComun.cs @@ -116,6 +116,10 @@ namespace OliviaAddInPro.Model * Ignorar o noelementos aislados */ public bool IgnoAis { get; set; } = LimpiezaDef.Parametros.igno_ais; + /** + * Coordenadas Min y Max de la red navegable + */ + public Envelope MimaNw { get; set; } = null; /** * Almacena la consulta para exportar los ámbitos */ diff --git a/Services/ConfigServ.cs b/Services/ConfigServ.cs index c6b764b..63e2fb9 100644 --- a/Services/ConfigServ.cs +++ b/Services/ConfigServ.cs @@ -313,7 +313,7 @@ namespace OliviaAddInPro.Services c.frac= "FRACCION"; c.capac= "CAPACIDAD"; c.uds= "UNIDADES"; - c.kgrec= "KGRECO"; + c.kgrec= "Kg_Recog"; c.kgrec_val=200; c.is_lleno=false; c.is_campo=false; diff --git a/Services/EjecServ.cs b/Services/EjecServ.cs index 6c6609f..5e66f9d 100644 --- a/Services/EjecServ.cs +++ b/Services/EjecServ.cs @@ -331,7 +331,11 @@ namespace OliviaAddInPro.Services * / } }*/ - + ////////////////////////////////////// + //guarda la mima de la geometría de la red navegable a exportar + com.MimaNw = geom_export.Extent; + ////////////////////////////////////// + /// //Hace el filtro con la geometría final filtroEspacial = HelperGdb.CreateFiler(String.Empty, geom_export); if (filtroEspacial == null) diff --git a/Services/LanzaSrv/LanzaLimpSrv.cs b/Services/LanzaSrv/LanzaLimpSrv.cs index 6557ab8..bc83db3 100644 --- a/Services/LanzaSrv/LanzaLimpSrv.cs +++ b/Services/LanzaSrv/LanzaLimpSrv.cs @@ -97,7 +97,12 @@ namespace OliviaAddInPro.Services.LanzaSrv GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_ace + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_ace + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_aplin + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_aplin + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_apbat + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_apbat + " " + - GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_bordlib + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_bordlib + " "; + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_bordlib + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_bordlib + " " + + //mima de la nw + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmin + GeneralDef.EjecGeoParamIgual + limp.MimaNw.XMin + " " + + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmax + GeneralDef.EjecGeoParamIgual + limp.MimaNw.XMax + " " + + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymin + GeneralDef.EjecGeoParamIgual + limp.MimaNw.YMin + " " + + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymax + GeneralDef.EjecGeoParamIgual + limp.MimaNw.YMax + " "; base.str_cfg = str; diff --git a/Services/LanzaSrv/LanzaRecoSrv.cs b/Services/LanzaSrv/LanzaRecoSrv.cs index 57e49be..991e238 100644 --- a/Services/LanzaSrv/LanzaRecoSrv.cs +++ b/Services/LanzaSrv/LanzaRecoSrv.cs @@ -91,7 +91,12 @@ namespace OliviaAddInPro.Services.LanzaSrv GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_fechaf + GeneralDef.EjecGeoParamIgual + "0 " + GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_modo + GeneralDef.EjecGeoParamIgual + "0 " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + (reco.IgnoAis?1:0) + " " + - GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.TipoLate + " "; + GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.TipoLate + " " + + //mima de la nw + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmin + GeneralDef.EjecGeoParamIgual + reco.MimaNw.XMin + " " + + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmax + GeneralDef.EjecGeoParamIgual + reco.MimaNw.XMax + " " + + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymin + GeneralDef.EjecGeoParamIgual + reco.MimaNw.YMin + " " + + GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymax + GeneralDef.EjecGeoParamIgual + reco.MimaNw.YMax + " "; base.str_cfg = str; diff --git a/View/Configuracion/PaneConfigView.xaml b/View/Configuracion/PaneConfigView.xaml index 406cd20..af624f6 100644 --- a/View/Configuracion/PaneConfigView.xaml +++ b/View/Configuracion/PaneConfigView.xaml @@ -19,9 +19,12 @@