Lanzadores estables
parent
4ef8273433
commit
87d0517e08
|
|
@ -0,0 +1,418 @@
|
|||
using ArcGIS.Desktop.Internal.Core;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using OliviaAddInPro.Services;
|
||||
using ArcGIS.Core.Geometry;
|
||||
using ArcGIS.Desktop.Framework.Threading.Tasks;
|
||||
using OliviaAddInPro.Helper;
|
||||
|
||||
namespace OliviaAddInPro.Model
|
||||
{
|
||||
[Flags]
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public enum TiposEjecucion
|
||||
{
|
||||
Ninguno = 0,
|
||||
Limp=1,
|
||||
Reco=2,
|
||||
Props = 4,//está editando propiedades
|
||||
Config = 8, //está configurando la ventana de limpieza o recogida por primera vez
|
||||
EjecSecto=16,//está ejecutando por primera vez
|
||||
EjecPlanif = 32,//está ejecutando después de haber planificado ya al menos una primera vez
|
||||
FinEjecOk = 64, //ha terminado de ejecutar Bien
|
||||
FinEjecNOk = 128,//ha terminado de ejecutar y ha habido errores
|
||||
Config2 =256,//está configurando la ventana de limpieza o recogida después de haber sectorizado
|
||||
//ya al menos una primera vez
|
||||
//se pone este estado cuando ha terminado ya la primera vez
|
||||
}
|
||||
static class OliviaGlob
|
||||
{
|
||||
/**
|
||||
* Paths de la configuración
|
||||
*/
|
||||
public struct Paths
|
||||
{
|
||||
public static string PathWork; //<Path del directorio de trabajo
|
||||
public static string PathCfg; //<Path de la configuración general
|
||||
public static string PathExeOlivia; //<Path del ejecutable de OliviaTask
|
||||
public static string PathTemp; //<Path temporal de generación de archivos intermedios
|
||||
public static string DirData; //<Dir donde están los shapefiles data y nw
|
||||
public static string PathData; //<Path del shp con datos a planificar, ya filtrados e intersecados con las zonas y niveles
|
||||
public static string PathNW; //<Path del shp con la red navegable
|
||||
|
||||
//paths GDBs
|
||||
public static string PathGdbGen; //<Path de la gdb general de la que se extraen los datos de interés
|
||||
public static string PathGdbNw; //<Path de la gdb referente a la red de carreteras de TOMTOM
|
||||
public static string PathSimbVSM; //<Path de la galeria de estilos aplicada por VSM
|
||||
public static string PathSimbESRI; //<Path de la galeria de estilos de ESRI
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
public struct Conexion
|
||||
{
|
||||
/**
|
||||
* IP donde va a realizar la conexión a OliviaTask, se inicializa al arrancar con la local
|
||||
*/
|
||||
public static string Ip;
|
||||
/**
|
||||
* Puerto local donde va a realizar la conexión a OliviaTask, se inicializa al arrancar
|
||||
*/
|
||||
public static int Puerto;
|
||||
/**
|
||||
* Time out de la conexión con OliviaTask, en seg
|
||||
*/
|
||||
public static int TiempoOutSocket;
|
||||
=======
|
||||
/**
|
||||
* Nombre de las capas que se van a necesitar para la exportación de datos
|
||||
*/
|
||||
public struct Capas
|
||||
{
|
||||
public static string ftclass_ejes; //<Nombre de la capa de ejes de carretera
|
||||
public static string ftclass_muni; //<Nombre de la capa de municipios de TOMTOM
|
||||
>>>>>>> Elena/reco
|
||||
};
|
||||
|
||||
private static TiposEjecucion tipoEjec = TiposEjecucion.Ninguno;
|
||||
public static Limpieza limp = new Limpieza();
|
||||
private static Recogida reco = new Recogida();
|
||||
|
||||
#region Properties
|
||||
public static TiposEjecucion TipoEjec
|
||||
{
|
||||
get { return tipoEjec; }
|
||||
set { tipoEjec = value; }
|
||||
}
|
||||
public static Limpieza Limp
|
||||
{
|
||||
get { return limp; }
|
||||
set { limp = value; }
|
||||
}
|
||||
public static Recogida Reco
|
||||
{
|
||||
get { return reco; }
|
||||
set { reco = value; }
|
||||
}
|
||||
public static EjecServ Serv { get; } = new EjecServ();
|
||||
public static SpatialReference SpatRef { get; set; } = null;
|
||||
public static ProgressDialog progrDialog { get; set; } = null;
|
||||
#endregion Properties
|
||||
|
||||
public static void Inicia()
|
||||
{
|
||||
IniDefault();
|
||||
LimpiezaDef.iniciaLimpDef();
|
||||
RecogidaDef.iniciaRecoDef();
|
||||
limp = new Limpieza();
|
||||
reco = new Recogida();
|
||||
SpatRef = ArcGIS.Core.Geometry.SpatialReferenceBuilder.CreateSpatialReference(GeneralDef.SpatRefDef);
|
||||
}
|
||||
|
||||
public static bool IsLimp()
|
||||
{
|
||||
return HasFlagTipEjec(TiposEjecucion.Limp);
|
||||
}
|
||||
public static bool IsReco()
|
||||
{
|
||||
return HasFlagTipEjec(TiposEjecucion.Reco);
|
||||
}
|
||||
public static bool IsProps()
|
||||
{
|
||||
return HasFlagTipEjec(TiposEjecucion.Props);
|
||||
}
|
||||
public static bool IsConfig2()
|
||||
{
|
||||
return HasFlagTipEjec(TiposEjecucion.Config2);
|
||||
}
|
||||
public static bool HasFlagTipEjec(TiposEjecucion flag)
|
||||
{
|
||||
return (OliviaGlob.TipoEjec & flag) == flag;
|
||||
}
|
||||
public static void SetFlagTipEjec(TiposEjecucion flag)
|
||||
{
|
||||
//pone el tipo de ejecución igual al flag
|
||||
OliviaGlob.TipoEjec = flag;
|
||||
}
|
||||
public static void AddFlagTipEjec(TiposEjecucion flag)
|
||||
{
|
||||
//añade el flag al tipo de ejecución
|
||||
OliviaGlob.TipoEjec = OliviaGlob.TipoEjec | flag;
|
||||
}
|
||||
public static void RemoveFlagTipEjec(TiposEjecucion flag)
|
||||
{
|
||||
//quita el flag al tipo de ejecución
|
||||
OliviaGlob.TipoEjec = OliviaGlob.TipoEjec & ~flag;
|
||||
}
|
||||
/**
|
||||
* Habilita Sh=true
|
||||
* o Deshabilita sh=false
|
||||
* el pane correspondiente
|
||||
*/
|
||||
public static void ShowHidePane(bool sh)
|
||||
{
|
||||
if (OliviaGlob.IsLimp())
|
||||
{
|
||||
if (sh)
|
||||
{
|
||||
DockpaneLimpiezaViewModel.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
DockpaneLimpiezaViewModel.Hide_();
|
||||
}
|
||||
}
|
||||
else if (OliviaGlob.IsReco())
|
||||
{
|
||||
if (sh)
|
||||
{
|
||||
DockpaneRecogidaViewModel.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
DockpaneRecogidaViewModel.Hide_();
|
||||
}
|
||||
}
|
||||
else if(OliviaGlob.IsProps())
|
||||
{
|
||||
if (sh)
|
||||
{
|
||||
DockpaneConfigViewModel.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
DockpaneConfigViewModel.Hide_();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Inicializa los nombres por defecto de las variables, para debug por si no hay instalador
|
||||
*/
|
||||
public static void IniDefault()
|
||||
{
|
||||
var c = ConfigServ.Serv.Leer();
|
||||
Paths.PathWork = c.path_work;
|
||||
Paths.PathExeOlivia = c.path_exe;
|
||||
Paths.DirData = c.path_data;
|
||||
Paths.PathTemp = c.path_temp;
|
||||
c.PathCartela = c.PathCartela;
|
||||
|
||||
HelperGlobal.create_folder(Paths.DirData);
|
||||
HelperGlobal.create_folder(Paths.PathTemp);
|
||||
|
||||
Paths.PathGdbGen = c.PathGdbGen;
|
||||
Paths.PathGdbNw = c.red_carreteras;
|
||||
Paths.PathSimbVSM = c.PathSimbVSM;
|
||||
Paths.PathSimbESRI = c.PathSimbESRI;
|
||||
Conexion.Puerto = c.Puerto;
|
||||
Conexion.Ip = c.Ip;
|
||||
Conexion.TiempoOutSocket = c.TiempoOutSocket;
|
||||
|
||||
//buff_export = c.buffer_export;
|
||||
|
||||
///////////////////////////////////////
|
||||
//Capas, consultas y filtros GENERALES
|
||||
Capas.ftclass_ejes = c.eje_via;
|
||||
Capas.ftclass_muni = c.municipios;
|
||||
|
||||
///////////////////////////////////////
|
||||
//Capas, consultas, atributos y filtros de LIMPIEZA
|
||||
LimpiezaDef.Campos.consulta_entidad = c.cons_tip_ent;
|
||||
LimpiezaDef.Campos.consulta_mecan = c.cons_mecaniz;
|
||||
LimpiezaDef.Campos.consulta_observ = c.cons_obser;
|
||||
LimpiezaDef.Campos.consulta_anch_tip = c.cons_anch_tip;
|
||||
LimpiezaDef.Campos.consulta_tipolo = c.cons_tipolo;
|
||||
LimpiezaDef.Campos.consulta_sector = c.consulta_sector;
|
||||
LimpiezaDef.Campos.consulta_secuen = c.consulta_secuen;
|
||||
|
||||
LimpiezaDef.Atributos.atr_esca = c.atr_esca;
|
||||
LimpiezaDef.Atributos.atr_fuent = c.atr_fuent;
|
||||
LimpiezaDef.Atributos.atr_infan = c.atr_infan;
|
||||
LimpiezaDef.Atributos.atr_pape = c.atr_pape;
|
||||
LimpiezaDef.Atributos.atr_paso_niv = c.atr_paso_niv;
|
||||
LimpiezaDef.Atributos.atr_pipi = c.atr_pipi;
|
||||
LimpiezaDef.Atributos.atr_sane = c.atr_sane;
|
||||
LimpiezaDef.Atributos.atr_acera = c.atr_acera;
|
||||
LimpiezaDef.Atributos.atr_aparc = c.atr_aparc;
|
||||
LimpiezaDef.Atributos.atr_bord = c.atr_bord;
|
||||
LimpiezaDef.Atributos.atr_hoja = c.atr_hoja;
|
||||
LimpiezaDef.Atributos.atr_peat = c.atr_peat;
|
||||
LimpiezaDef.Atributos.atr_terri = c.atr_terri;
|
||||
LimpiezaDef.Atributos.atr_ocio = c.atr_ocio;
|
||||
LimpiezaDef.Atributos.atr_org_ofi = c.atr_org_ofi;
|
||||
LimpiezaDef.Atributos.atr_parq = c.atr_parq;
|
||||
LimpiezaDef.Atributos.atr_park = c.atr_park;
|
||||
LimpiezaDef.Atributos.atr_play = c.atr_play;
|
||||
LimpiezaDef.Atributos.atr_polid = c.atr_polid;
|
||||
LimpiezaDef.Atributos.atr_turis = c.atr_turis;
|
||||
LimpiezaDef.Atributos.atr_solar = c.atr_solar;
|
||||
LimpiezaDef.Atributos.atr_suelo = c.atr_suelo;
|
||||
LimpiezaDef.Atributos.atr_ap_lin = c.atr_ap_lin;
|
||||
LimpiezaDef.Atributos.atr_ap_bat = c.atr_ap_bat;
|
||||
|
||||
//para el grupo PARAMETROS de LIMPIEZA
|
||||
LimpiezaDef.Parametros.t_ttoM = c.t_tratamiento_max;
|
||||
LimpiezaDef.Parametros.t_ttom = c.t_tratamiento_min;
|
||||
LimpiezaDef.Parametros.v_despM = c.v_desplaz_max;
|
||||
LimpiezaDef.Parametros.v_despm = c.v_desplaz_min;
|
||||
LimpiezaDef.Parametros.t_cardescM = c.t_carga_desc_max;
|
||||
LimpiezaDef.Parametros.t_cardescm = c.t_carga_desc_min;
|
||||
LimpiezaDef.Parametros.t_cardesc = c.t_carga_desc;
|
||||
LimpiezaDef.Parametros.t_despM = c.t_carga_desc_max;
|
||||
LimpiezaDef.Parametros.t_despm = c.t_carga_desc_min;
|
||||
LimpiezaDef.Parametros.t_desp = c.t_desplaz;
|
||||
LimpiezaDef.Parametros.t_convM = c.t_convenio_max;
|
||||
LimpiezaDef.Parametros.t_convm = c.t_convenio_min;
|
||||
LimpiezaDef.Parametros.t_conv = c.t_convenio;
|
||||
LimpiezaDef.Parametros.t_descansoM = c.t_descanso_max;
|
||||
LimpiezaDef.Parametros.t_descansom = c.t_descanso_min;
|
||||
LimpiezaDef.Parametros.t_descanso = c.t_descanso;
|
||||
LimpiezaDef.Parametros.h_inicio = c.hora_inicio;
|
||||
LimpiezaDef.Parametros.ancho_viaM = c.ancho_via_max;
|
||||
LimpiezaDef.Parametros.ancho_viam = c.ancho_via_min;
|
||||
LimpiezaDef.Parametros.ancho_via = c.ancho_via;
|
||||
LimpiezaDef.Parametros.ttoBarMan = c.t_tratamiento_BarMan;
|
||||
LimpiezaDef.Parametros.ttoBarManMant = c.t_tratamiento_BarManMant;
|
||||
LimpiezaDef.Parametros.ttoBarMMot = c.t_tratamiento_BarMMot;
|
||||
LimpiezaDef.Parametros.ttoBarMC = c.t_tratamiento_BarMC;
|
||||
LimpiezaDef.Parametros.ttoBarMAP = c.t_tratamiento_BarMAP;
|
||||
LimpiezaDef.Parametros.ttoBarMix = c.t_tratamiento_BarMix;
|
||||
LimpiezaDef.Parametros.ttoBalMan = c.t_tratamiento_BalMan;
|
||||
LimpiezaDef.Parametros.ttoBalMC = c.t_tratamiento_BalMC;
|
||||
LimpiezaDef.Parametros.ttoBalMAP = c.t_tratamiento_BalMAP;
|
||||
LimpiezaDef.Parametros.ttoBalMix = c.t_tratamiento_BalMix;
|
||||
LimpiezaDef.Parametros.ttoBL = c.t_tratamiento_BL;
|
||||
LimpiezaDef.Parametros.ttoCH = c.t_tratamiento_CH;
|
||||
LimpiezaDef.Parametros.ttoVPap = c.t_tratamiento_VPap;
|
||||
LimpiezaDef.Parametros.ttoLPap = c.t_tratamiento_LPap;
|
||||
LimpiezaDef.Parametros.ttoLC = c.t_tratamiento_LC;
|
||||
LimpiezaDef.Parametros.ttoLZI = c.t_tratamiento_LZI;
|
||||
LimpiezaDef.Parametros.ttoLPip = c.t_tratamiento_LPip;
|
||||
LimpiezaDef.Parametros.ttoLS = c.t_tratamiento_LS;
|
||||
LimpiezaDef.Parametros.vdespBarMan = c.v_desp_BarMan;
|
||||
LimpiezaDef.Parametros.vdespBarManMant = c.v_desp_BarManMant;
|
||||
LimpiezaDef.Parametros.vdespBarMMot = c.v_desp_BarMMot;
|
||||
LimpiezaDef.Parametros.vdespBarMC = c.v_desp_BarMC;
|
||||
LimpiezaDef.Parametros.vdespBarMAP = c.v_desp_BarMAP;
|
||||
LimpiezaDef.Parametros.vdespBarMix = c.v_desp_BarMix;
|
||||
LimpiezaDef.Parametros.vdespBalMan = c.v_desp_BalMan;
|
||||
LimpiezaDef.Parametros.vdespBalMC = c.v_desp_BalMC;
|
||||
LimpiezaDef.Parametros.vdespBalMAP = c.v_desp_BalMAP;
|
||||
LimpiezaDef.Parametros.vdespBalMix = c.v_desp_BalMix;
|
||||
LimpiezaDef.Parametros.vdespBL = c.v_desp_BL;
|
||||
LimpiezaDef.Parametros.vdespCH = c.v_desp_CH;
|
||||
LimpiezaDef.Parametros.vdespVPap = c.v_desp_VPap;
|
||||
LimpiezaDef.Parametros.vdespLPap = c.v_desp_LPap;
|
||||
LimpiezaDef.Parametros.vdespLC = c.v_desp_LC;
|
||||
LimpiezaDef.Parametros.vdespLZI = c.v_desp_LZI;
|
||||
LimpiezaDef.Parametros.vdespLPip = c.v_desp_LPip;
|
||||
LimpiezaDef.Parametros.vdespLS = c.v_desp_LS;
|
||||
LimpiezaDef.Parametros.umbral_reco = 80;
|
||||
|
||||
LimpiezaDef.OtrosParam.giro_max = c.Giro_max_vehiculo;
|
||||
LimpiezaDef.OtrosParam.anch_peat = c.Ancho_peat_def;
|
||||
LimpiezaDef.OtrosParam.anch_ace = c.Ancho_acera_def;
|
||||
LimpiezaDef.OtrosParam.anch_aplin = c.Ancho_ap_lin_def;
|
||||
LimpiezaDef.OtrosParam.anch_apbat = c.Ancho_ap_bat_def;
|
||||
LimpiezaDef.OtrosParam.anch_bordlib = c.Ancho_bord_lib_def;
|
||||
LimpiezaDef.OtrosParam.desv_max = c.Desv_max;
|
||||
LimpiezaDef.OtrosParam.desv_max_abs = c.Desv_max_abs;
|
||||
|
||||
|
||||
//Capas, consultas, atributos y filtros de RECOGIDA
|
||||
|
||||
RecogidaDef.campos_def.cons_id = c.id;
|
||||
RecogidaDef.campos_def.cons_nomrec = c.nomrec;
|
||||
RecogidaDef.campos_def.cons_lateral = c.lateralidad;
|
||||
RecogidaDef.campos_def.cons_fracc = c.frac;
|
||||
RecogidaDef.campos_def.cons_capac = c.capac;
|
||||
RecogidaDef.campos_def.cons_uds = c.uds;
|
||||
RecogidaDef.campos_def.cons_kgrec = c.kgrec;
|
||||
RecogidaDef.kgrec_cont = c.kgrec_val;
|
||||
|
||||
//Rellena los tipos de fracción
|
||||
RecogidaDef.tipos_fracc_str[(int)RecogidaDef.TiposFracción.Organica] = c.organica;
|
||||
RecogidaDef.tipos_fracc_str[(int)RecogidaDef.TiposFracción.Resto] = c.resto;
|
||||
RecogidaDef.tipos_fracc_str[(int)RecogidaDef.TiposFracción.Envases] = c.envase;
|
||||
RecogidaDef.tipos_fracc_str[(int)RecogidaDef.TiposFracción.Papel] = c.papel;
|
||||
RecogidaDef.tipos_fracc_str[(int)RecogidaDef.TiposFracción.Vidrio] = c.vidrio;
|
||||
//Rellena los tipos de carga
|
||||
RecogidaDef.tipos_carg_str[(int)RecogidaDef.TiposCarga.Trasera] = c.trasera;
|
||||
RecogidaDef.tipos_carg_str[(int)RecogidaDef.TiposCarga.Lateral] = c.lateral;
|
||||
RecogidaDef.tipos_carg_str[(int)RecogidaDef.TiposCarga.Superior] = c.superior;
|
||||
RecogidaDef.tipos_carg_str[(int)RecogidaDef.TiposCarga.Bilateral] = c.bilat;
|
||||
RecogidaDef.tipos_carg_str[(int)RecogidaDef.TiposCarga.BolseoPtaPta] = c.bolseo;
|
||||
RecogidaDef.tipos_carg_str[(int)RecogidaDef.TiposCarga.Lavado] = c.lavado;
|
||||
|
||||
RecogidaDef.lleno = c.is_lleno;
|
||||
RecogidaDef.kgrec_camp = c.is_campo;
|
||||
|
||||
RecogidaDef.Parametros.t_vaciM = c.t_vaciado_max;
|
||||
RecogidaDef.Parametros.t_vacim = c.t_vaciado_min;
|
||||
RecogidaDef.Parametros.t_llegsalM = c.t_llega_sale_max;
|
||||
RecogidaDef.Parametros.t_llegsalm = c.t_llega_sale_min;
|
||||
RecogidaDef.Parametros.t_llegsal = c.t_llega_sale;
|
||||
RecogidaDef.Parametros.t_descM = c.t_descarga_max;
|
||||
RecogidaDef.Parametros.t_descm = c.t_descarga_min;
|
||||
RecogidaDef.Parametros.t_desc = c.t_descarga;
|
||||
RecogidaDef.Parametros.t_convM = c.R_t_convenio_max;
|
||||
RecogidaDef.Parametros.t_convm = c.R_t_convenio_min;
|
||||
RecogidaDef.Parametros.t_conv = c.R_t_convenio;
|
||||
RecogidaDef.Parametros.t_descansoM = c.R_t_descanso_max;
|
||||
RecogidaDef.Parametros.t_descansom = c.R_t_descanso_min;
|
||||
RecogidaDef.Parametros.t_descanso = c.R_t_descanso;
|
||||
RecogidaDef.Parametros.h_inicio = c.R_hora_inicio;
|
||||
RecogidaDef.Parametros.dens_vehi_org = c.dens_vehi_org;
|
||||
RecogidaDef.Parametros.dens_vehi_res = c.dens_vehi_res;
|
||||
RecogidaDef.Parametros.dens_vehi_env = c.dens_vehi_env;
|
||||
RecogidaDef.Parametros.dens_vehi_pap = c.dens_vehi_pap;
|
||||
RecogidaDef.Parametros.dens_vehi_vid = c.dens_vehi_vid;
|
||||
RecogidaDef.Parametros.dens_vehi_otr = c.dens_vehi_otr;
|
||||
RecogidaDef.Parametros.dens_cont_org = c.dens_cont_org;
|
||||
RecogidaDef.Parametros.dens_cont_res = c.dens_cont_res;
|
||||
RecogidaDef.Parametros.dens_cont_env = c.dens_cont_env;
|
||||
RecogidaDef.Parametros.dens_cont_pap = c.dens_cont_pap;
|
||||
RecogidaDef.Parametros.dens_cont_vid = c.dens_cont_vid;
|
||||
RecogidaDef.Parametros.dens_cont_otr = c.dens_cont_otr;
|
||||
RecogidaDef.Parametros.anch_vehi_3 = c.anch_vehi_3;
|
||||
RecogidaDef.Parametros.anch_vehi_2 = c.anch_vehi_2;
|
||||
RecogidaDef.Parametros.anch_vehi_s = c.anch_vehi_s;
|
||||
RecogidaDef.Parametros.rad_giro_3 = c.radio_giro_3;
|
||||
RecogidaDef.Parametros.rad_giro_2 = c.radio_giro_2;
|
||||
RecogidaDef.Parametros.rad_giro_s = c.radio_giro_s;
|
||||
RecogidaDef.Parametros.t_vaci_tra = c.t_vaci_trasera;
|
||||
RecogidaDef.Parametros.t_vaci_lat = c.t_vaci_lateral;
|
||||
RecogidaDef.Parametros.t_vaci_sup = c.t_vaci_superior;
|
||||
RecogidaDef.Parametros.t_vaci_bi = c.t_vaci_bilateral;
|
||||
RecogidaDef.Parametros.t_vaci_bol = c.t_vaci_bolseo;
|
||||
RecogidaDef.Parametros.t_vaci_lav = c.t_vaci_lavado;
|
||||
RecogidaDef.Parametros.t_vaci_otr = c.t_vaci_otra;
|
||||
RecogidaDef.Parametros.kgmaxM = c.kgmax_max;
|
||||
RecogidaDef.Parametros.kgmaxm = c.kgmax_min;
|
||||
RecogidaDef.Parametros.carga_maxM = c.carga_max_max;
|
||||
RecogidaDef.Parametros.carga_maxm = c.carga_max_min;
|
||||
|
||||
//Atributos LATERALIDAD
|
||||
RecogidaDef.tipos_lateralidad[(int)RecogidaDef.Lateralidad.Ambos] = c.ambos;
|
||||
RecogidaDef.tipos_lateralidad[(int)RecogidaDef.Lateralidad.Dcha] = c.derecha;
|
||||
RecogidaDef.tipos_lateralidad[(int)RecogidaDef.Lateralidad.Izqda] = c.izquierda;
|
||||
|
||||
|
||||
//Campos de la red navegable que se leen
|
||||
ComunDef.CamposNW.cons_onew = c.cons_onew;
|
||||
ComunDef.CamposNW.cons_kph = c.cons_kph;
|
||||
ComunDef.CamposNW.cons_fow = c.cons_fow;
|
||||
ComunDef.CamposNW.cons_name = c.cons_name;
|
||||
//Atributos de la red navegable que se leen
|
||||
ComunDef.AtributosNW.atr_TF = c.atr_TF;
|
||||
ComunDef.AtributosNW.atr_FT = c.atr_FT;
|
||||
ComunDef.AtributosNW.atr_N = c.atr_N;
|
||||
ComunDef.AtributosNW.atr_pedes = c.atr_pedes;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -64,6 +64,14 @@ namespace OliviaAddInPro.Model
|
|||
*/
|
||||
public Coordinate2D CoordsPlanta { get; set; } = new Coordinate2D(0, 0);
|
||||
|
||||
/*
|
||||
*
|
||||
* */
|
||||
public double AnchoVehiculo
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public RecogidaServ Serv { get; set; } = null;
|
||||
public Recogida()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,371 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{10742570-CF59-42F2-BEA2-2A38002A06EE}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>OliviaAddInPro</RootNamespace>
|
||||
<AssemblyName>OliviaAddInPro</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ArcGISFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\ESRI\ArcGISPro', 'InstallDir', null, RegistryView.Registry64))</ArcGISFolder>
|
||||
<ArcGISFolder Condition="'$(ArcGISFolder)' == ''">$(registry:HKEY_CURRENT_USER\SOFTWARE\ESRI\ArcGISPro@InstallDir)</ArcGISFolder>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<StartAction>Program</StartAction>
|
||||
<StartProgram>$(ArcGISFolder)\bin\ArcGISPro.exe</StartProgram>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<StartAction>Program</StartAction>
|
||||
<StartProgram>$(ArcGISFolder)\bin\ArcGISPro.exe</StartProgram>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="WindowsBase" />
|
||||
<Reference Include="System.Xaml" />
|
||||
<Reference Include="ArcGIS.Desktop.Framework">
|
||||
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Framework.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Core">
|
||||
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Core.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Core">
|
||||
<HintPath>$(ArcGISFolder)\bin\Extensions\Core\ArcGIS.Desktop.Core.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Mapping">
|
||||
<HintPath>$(ArcGISFolder)\bin\Extensions\Mapping\ArcGIS.Desktop.Mapping.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Catalog">
|
||||
<HintPath>$(ArcGISFolder)\bin\Extensions\Catalog\ArcGIS.Desktop.Catalog.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Editing">
|
||||
<HintPath>$(ArcGISFolder)\bin\Extensions\Editing\ArcGIS.Desktop.Editing.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Extensions">
|
||||
<HintPath>$(ArcGISFolder)\bin\Extensions\DesktopExtensions\ArcGIS.Desktop.Extensions.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.GeoProcessing">
|
||||
<HintPath>$(ArcGISFolder)\bin\Extensions\GeoProcessing\ArcGIS.Desktop.GeoProcessing.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Layouts">
|
||||
<HintPath>$(ArcGISFolder)\bin\Extensions\Layout\ArcGIS.Desktop.Layouts.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Shared.Wpf">
|
||||
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Shared.Wpf.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Ribbon.Wpf">
|
||||
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Ribbon.Wpf.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.DataGrid.Contrib.Wpf">
|
||||
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.DataGrid.Contrib.Wpf.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Resources">
|
||||
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Resources.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Resources">
|
||||
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Resources.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="ESRI.ArcGIS.ItemIndex">
|
||||
<HintPath>$(ArcGISFolder)\bin\ESRI.ArcGIS.ItemIndex.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Xceed.Wpf.Toolkit">
|
||||
<HintPath>..\wpftoolkit-master\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Config.daml" />
|
||||
<AddInContent Include="Images\AddInDesktop16.png" />
|
||||
<AddInContent Include="Images\AddInDesktop32.png" />
|
||||
<AddInContent Include="DarkImages\AddInDesktop16.png" />
|
||||
<AddInContent Include="DarkImages\AddInDesktop32.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Button\ButtonConfig.cs" />
|
||||
<Compile Include="Button\ButtonLimp.cs" />
|
||||
<Compile Include="Button\ButtonMaq.cs" />
|
||||
<Compile Include="Button\ButtonRec.cs" />
|
||||
<Compile Include="Conexion\Cstr_socket.cs" />
|
||||
<Compile Include="Helper\EnabledComboBoxItem.cs" />
|
||||
<Compile Include="Helper\CheckedListItem.cs" />
|
||||
<Compile Include="Helper\HelperGdb.cs" />
|
||||
<Compile Include="Helper\HelperGlobal.cs" />
|
||||
<Compile Include="Model\ComunDef.cs" />
|
||||
<Compile Include="Model\ESRI.ArcGIS.Geometry.esriSRProjCS4Type.cs" />
|
||||
<Compile Include="Model\Recogida.cs" />
|
||||
<Compile Include="Model\RecogidaDef.cs" />
|
||||
<Compile Include="Model\Respuesta.cs" />
|
||||
<Compile Include="Model\TratamientoComun.cs" />
|
||||
<Compile Include="Model\Limpieza.cs" />
|
||||
<Compile Include="Model\LimpiezaDef.cs" />
|
||||
<Compile Include="Services\EjecServ.cs" />
|
||||
<Compile Include="Model\OliviaConf.cs" />
|
||||
<Compile Include="Model\OliviaDef.cs" />
|
||||
<Compile Include="Services\ConfigServ.cs" />
|
||||
<<<<<<< HEAD
|
||||
<Compile Include="Services\LanzaSrv\LanzaLimpSrv.cs" />
|
||||
<Compile Include="Services\LanzaSrv\LanzaOlvServ.cs" />
|
||||
<Compile Include="Services\LanzaSrv\LanzaRecoSrv.cs" />
|
||||
=======
|
||||
<Compile Include="Services\ImportaResServ.cs" />
|
||||
>>>>>>> Elena/reco
|
||||
<Compile Include="Services\LimpiezaServ.cs" />
|
||||
<Compile Include="Services\RecogidaServ.cs" />
|
||||
<Compile Include="ViewModel\Configuracion\DockpaneConfigViewModel.cs" />
|
||||
<Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
|
||||
<Compile Include="ViewModel\OptionsMenuItem.cs" />
|
||||
<Compile Include="ViewModel\PaneEjecutarViewModel.cs" />
|
||||
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub4ViewModel.cs" />
|
||||
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub3ViewModel.cs" />
|
||||
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub2ViewModel.cs" />
|
||||
<Compile Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs" />
|
||||
<Compile Include="ViewModel\PanelViewModelBase.cs" />
|
||||
<Compile Include="ViewModel\Recogida\PaneRecogidaSub1ViewModel.cs" />
|
||||
<Compile Include="View\Recogida\PaneRecogidaSub1.xaml.cs">
|
||||
<DependentUpon>PaneRecogidaSub1.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Recogida\PaneRecogida.xaml.cs">
|
||||
<DependentUpon>PaneRecogida.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ViewModel\Recogida\PaneRecogidaViewModel.cs" />
|
||||
<Compile Include="View\Configuracion\DockPaneConfig.xaml.cs">
|
||||
<DependentUpon>DockPaneConfig.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Configuracion\PaneConfigView.xaml.cs">
|
||||
<DependentUpon>PaneConfigView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\PaneEjecutar.xaml.cs">
|
||||
<DependentUpon>PaneEjecutar.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Limpieza\PaneLimpiezaSub4.xaml.cs">
|
||||
<DependentUpon>PaneLimpiezaSub4.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Limpieza\PaneLimpiezaSub3.xaml.cs">
|
||||
<DependentUpon>PaneLimpiezaSub3.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Limpieza\PaneLimpiezaSub2.xaml.cs">
|
||||
<DependentUpon>PaneLimpiezaSub2.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Limpieza\PaneLimpiezaSub1.xaml.cs">
|
||||
<DependentUpon>PaneLimpiezaSub1.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub1ViewModel.cs" />
|
||||
<Compile Include="View\Limpieza\PaneLimpieza.xaml.cs">
|
||||
<DependentUpon>PaneLimpieza.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\Limpieza\DockpaneLimpieza.xaml.cs">
|
||||
<DependentUpon>DockpaneLimpieza.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ViewModel\Limpieza\DockpaneLimpiezaViewModel.cs" />
|
||||
<Compile Include="View\Recogida\DockpaneRecogida.xaml.cs">
|
||||
<DependentUpon>DockpaneRecogida.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ViewModel\Recogida\DockpaneRecogidaViewModel.cs" />
|
||||
<Compile Include="Module1.cs" />
|
||||
<Compile Include="Model\OliviaGlob.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Resource1.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Resource1.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="View\ProWndSelectFields.xaml.cs">
|
||||
<DependentUpon>ProWndSelectFields.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ViewModel\ShowProWndSelectFields.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="DarkImages\GenericButtonBlue16.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="DarkImages\GenericButtonBlue32.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\OliviaIconPro16.png" />
|
||||
<AddInContent Include="Images\OliviaIconPro32.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="OliviaIconPro.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="View\Recogida\PaneRecogidaSub1.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\Recogida\PaneRecogida.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\Configuracion\DockPaneConfig.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\Configuracion\PaneConfigView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\PaneEjecutar.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\Limpieza\PaneLimpiezaSub4.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\Limpieza\PaneLimpiezaSub3.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\Limpieza\PaneLimpiezaSub2.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="View\Limpieza\PaneLimpiezaSub1.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\Limpieza\PaneLimpieza.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\Limpieza\DockpaneLimpieza.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\Recogida\DockpaneRecogida.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="View\ProWndSelectFields.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="DarkImages\GenericButtonPurple16.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="DarkImages\GenericButtonPurple32.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resource1.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resource1.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\config.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="DarkImages\GenericButtonGreen16.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="DarkImages\GenericButtonGreen32.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="View\OliviaIconPro16.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="View\OliviaIconPro.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\inicio.png" />
|
||||
<Resource Include="Resources\ptosctrl.png" />
|
||||
<Resource Include="Resources\time.png" />
|
||||
<Resource Include="Resources\zonas.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Images\openfolder.png" />
|
||||
</ItemGroup>
|
||||
<<<<<<< HEAD
|
||||
<ItemGroup />
|
||||
=======
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\config2.png" />
|
||||
<AddInContent Include="Images\reco2.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\carrito2.png" />
|
||||
</ItemGroup>
|
||||
>>>>>>> Elena/reco
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!--
|
||||
PackageAction can be:
|
||||
BuildDefault: ArcGIS Pro is required. An esriAddinX package is created and copied to ArcGIS Pro add-in folder.
|
||||
BuildZipPostProcess: ArcGIS Pro install is NOT required to build the add-in. An esriAddinX package is created in your output folder.
|
||||
BuildNoPostProcess: ArcGIS Pro install is NOT required to build the add-in. An esriAddinX package is NOT created.
|
||||
-->
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PackageAction>BuildDefault</PackageAction>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PackageAction>BuildDefault</PackageAction>
|
||||
</PropertyGroup>
|
||||
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.PackageAddIn" />
|
||||
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.CleanAddIn" />
|
||||
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.ConvertToRelativePath" />
|
||||
<!--<Import Project="Esri.ArcGISPro.Extensions.targets" Condition="Exists('Esri.ArcGISPro.Extensions.targets')" />-->
|
||||
<Import Project="$(ArcGISFolder)\bin\Esri.ProApp.SDK.Desktop.targets" Condition="Exists('$(ArcGISFolder)\bin\Esri.ProApp.SDK.Desktop.targets') AND !Exists('Esri.ArcGISPro.Extensions.targets')" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<!--<Target Name="BeforeBuild">
|
||||
<Error Text="C:\Users\Elena\AppData\Local\Programs\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets not found." Condition="!Exists('C:\Users\Elena\AppData\Local\Programs\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets') AND !Exists('Esri.ArcGISPro.Extensions.targets')" />
|
||||
</Target>-->
|
||||
</Project>
|
||||
|
|
@ -16,7 +16,7 @@ namespace OliviaAddInPro.Services.LanzaSrv
|
|||
* Comienza las funciones de ejecución
|
||||
* modo 0 la primera vez, va a sectorizar, modo 1 la segunda vez, planifica
|
||||
*/
|
||||
public Respuesta<bool> ejec(Recogida reco, int modo)
|
||||
public Respuesta<bool> ejec(Recogida reco, int modo, string NombreTratamiento)
|
||||
{
|
||||
var res = new Respuesta<bool>();
|
||||
res.Value = false;
|
||||
|
|
@ -41,10 +41,10 @@ namespace OliviaAddInPro.Services.LanzaSrv
|
|||
return res;
|
||||
}
|
||||
|
||||
this.reco = reco;
|
||||
//this.reco = reco;
|
||||
|
||||
//Llama al ejecuta del padre
|
||||
return base.ejec();
|
||||
return base.ejec(NombreTratamiento);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -62,38 +62,38 @@ namespace OliviaAddInPro.Services.LanzaSrv
|
|||
modo_str = GeneralDef.SockConfPlan;
|
||||
else if (modo == (int)ModosEjec.SoloPlanif)
|
||||
modo_str = GeneralDef.SockConfTodo;
|
||||
|
||||
var conf = ConfigServ.Serv.Leer();
|
||||
//van ParamLimpN parámetros, sin incluir "CONFIGURACION", si se añaden, incrementar ParamLimpN
|
||||
str = GeneralDef.EjecGeoParamSep + modo_str + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_camp_cap + GeneralDef.EjecGeoParamIgual + reco.rec_capac + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_kgM + GeneralDef.EjecGeoParamIgual + reco.carg_max_vehic + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_camp_kgrec + GeneralDef.EjecGeoParamIgual + reco.rec_kg + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_camp_uds + GeneralDef.EjecGeoParamIgual + reco.rec_uds + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_kgrecog + GeneralDef.EjecGeoParamIgual + reco.rec_kgrec_cont + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_carga_cont + GeneralDef.EjecGeoParamIgual + reco.carga_max + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_dens + GeneralDef.EjecGeoParamIgual + reco.dens_cont + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_camp_cap + GeneralDef.EjecGeoParamIgual + conf.capac + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_kgM + GeneralDef.EjecGeoParamIgual + reco.KgMaxVehic + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_camp_kgrec + GeneralDef.EjecGeoParamIgual + conf.kgrec + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_camp_uds + GeneralDef.EjecGeoParamIgual + conf.uds + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_kgrecog + GeneralDef.EjecGeoParamIgual + conf.kgrec_val + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_carga_cont + GeneralDef.EjecGeoParamIgual + 0 + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_dens + GeneralDef.EjecGeoParamIgual + reco.DensCont + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_tco + GeneralDef.EjecGeoParamIgual + reco.TConv + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_tdc + GeneralDef.EjecGeoParamIgual + reco.TDescan + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_tvc + GeneralDef.EjecGeoParamIgual + reco.t_vaci + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_tvc + GeneralDef.EjecGeoParamIgual + reco.TVaciCont + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_tdca + GeneralDef.EjecGeoParamIgual + reco.TDescarg + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_tsal + GeneralDef.EjecGeoParamIgual + reco.t_despl_insta + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_tsal + GeneralDef.EjecGeoParamIgual + reco.TDesplIniFin + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_hini + GeneralDef.EjecGeoParamIgual + reco.HIni + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_trafic + GeneralDef.EjecGeoParamIgual + reco.trafico + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_trafic + GeneralDef.EjecGeoParamIgual + reco.Trafico + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_npt + GeneralDef.EjecGeoParamIgual + reco.NPtosCtrl + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_sec + GeneralDef.EjecGeoParamIgual + reco.NSect + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_anc + GeneralDef.EjecGeoParamIgual + reco.anch_vehic + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_gir + GeneralDef.EjecGeoParamIgual + reco.giro_vehic + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_anc + GeneralDef.EjecGeoParamIgual + reco.AnchoVehiculo + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_gir + GeneralDef.EjecGeoParamIgual + reco.GiroVehic + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_coox + GeneralDef.EjecGeoParamIgual + reco.CoordsInstal.X + " " +//coordenadas
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GG_cooy + GeneralDef.EjecGeoParamIgual + reco.CoordsInstal.Y + " " +//coordenadas
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_descx + GeneralDef.EjecGeoParamIgual + reco.coords_descarg[0] + " " +//coordenadas
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_descy + GeneralDef.EjecGeoParamIgual + reco.coords_descarg[1] + " " +//coordenadas
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_id + GeneralDef.EjecGeoParamIgual + reco.id_sens + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_url + GeneralDef.EjecGeoParamIgual + reco.url_sens + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_fecha + GeneralDef.EjecGeoParamIgual + reco.fecha_sens + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_fechaf + GeneralDef.EjecGeoParamIgual + reco.fechaf_sens + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_modo + GeneralDef.EjecGeoParamIgual + reco.media + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_descx + GeneralDef.EjecGeoParamIgual + reco.CoordsPlanta.X + " " +//coordenadas
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_descy + GeneralDef.EjecGeoParamIgual + reco.CoordsPlanta.Y + " " +//coordenadas
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_id + GeneralDef.EjecGeoParamIgual + 0 + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_url + GeneralDef.EjecGeoParamIgual + 0 + " " +
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_fecha + GeneralDef.EjecGeoParamIgual + 0 + " " +
|
||||
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.lateralidad + " ";
|
||||
GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.TipoLate + " ";
|
||||
|
||||
base.str_cfg = str;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,182 @@
|
|||
using OliviaAddInPro.Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Media.Imaging;
|
||||
using OliviaAddInPro.Helper;
|
||||
using static OliviaAddInPro.Model.ComunDef;
|
||||
using ArcGIS.Desktop.Framework.Threading.Tasks;
|
||||
using ArcGIS.Desktop.Framework.Contracts;
|
||||
namespace OliviaAddInPro
|
||||
{
|
||||
class PaneLimpiezaViewModel : PanelViewModelBase
|
||||
{
|
||||
private PaneLimpiezaSub1ViewModel _subPanel1ViewModel;
|
||||
|
||||
public PaneLimpiezaViewModel()
|
||||
{
|
||||
_subPanel1ViewModel = new PaneLimpiezaSub1ViewModel();
|
||||
_subPanel2ViewModel = new PaneLimpiezaSub2ViewModel();
|
||||
_subPanel3ViewModel = new PaneLimpiezaSub3ViewModel();
|
||||
_subPanel4ViewModel = new PaneLimpiezaSub4ViewModel();
|
||||
|
||||
OptionsMenu = new ObservableCollection<OptionsMenuItem>
|
||||
{
|
||||
new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/inicio.png")), Resource1.String_tto, _subPanel1ViewModel),
|
||||
new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/zonas.png")), Resource1.String_zonif, _subPanel2ViewModel),
|
||||
new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/ptosctrl.png")), Resource1.String_ctrol, _subPanel3ViewModel),
|
||||
new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/time.png")), Resource1.String_tiempos, _subPanel4ViewModel)
|
||||
};
|
||||
SelectedOption = OptionsMenu[0];
|
||||
// OliviaGlob.limp = OliviaGlob.Limp;
|
||||
}
|
||||
public override string DisplayName
|
||||
{
|
||||
get { return Resource1.String_header_limpieza; }
|
||||
}
|
||||
private ObservableCollection<OptionsMenuItem> _optionsMenu = new ObservableCollection<OptionsMenuItem>();
|
||||
public ObservableCollection<OptionsMenuItem> OptionsMenu
|
||||
{
|
||||
get { return _optionsMenu; }
|
||||
set { SetProperty(ref _optionsMenu, value, () => OptionsMenu); }
|
||||
}
|
||||
|
||||
private PanelViewModelBase _currentSubPanelPage;
|
||||
public PanelViewModelBase CurrentSubPanelPage
|
||||
{
|
||||
get { return _currentSubPanelPage; }
|
||||
set { SetProperty(ref _currentSubPanelPage, value, () => CurrentSubPanelPage); }
|
||||
}
|
||||
|
||||
private OptionsMenuItem _selectionOption;
|
||||
public OptionsMenuItem SelectedOption
|
||||
{
|
||||
get { return _selectionOption; }
|
||||
set {
|
||||
SetProperty(ref _selectionOption, value, () => SelectedOption);
|
||||
CurrentSubPanelPage = value.SubPanelViewModel;
|
||||
}
|
||||
}
|
||||
public PaneLimpiezaSub1ViewModel PaneSub1
|
||||
{
|
||||
get { return _subPanel1ViewModel; }
|
||||
}
|
||||
|
||||
public bool Lee(out string err_str)
|
||||
{
|
||||
err_str = "";
|
||||
try
|
||||
{
|
||||
////////////////////////////////////////////////////////////
|
||||
///Lee el panel 1
|
||||
if(!_subPanel1ViewModel.CapaAbierta || string.IsNullOrEmpty(_subPanel1ViewModel.CapaElems))
|
||||
{
|
||||
err_str = "No se ha seleccionado ninguna Capa de Limpieza";
|
||||
return false;
|
||||
}
|
||||
OliviaGlob.limp.CapaElems = _subPanel1ViewModel.CapaElems;
|
||||
|
||||
//lee el tipo tto
|
||||
if (_subPanel1ViewModel.TipoTto == (int)LimpiezaDef.TiposTto.TtoNoDef)
|
||||
{
|
||||
err_str = "No se ha seleccionado ningún Tipo de Tratamiento";
|
||||
return false;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
OliviaGlob.limp.TipoTto = _subPanel1ViewModel.TipoTto;
|
||||
|
||||
=======
|
||||
limp.TipoTto = _subPanel1ViewModel.TipoTto;
|
||||
limp.TipoTtoStr = LimpiezaDef.tto_gdb[_subPanel1ViewModel.TipoTto];
|
||||
>>>>>>> Elena/reco
|
||||
//lee el/los ámbito seleccionado
|
||||
if (!_subPanel1ViewModel.lee_ambitos())
|
||||
{
|
||||
err_str = "No se ha seleccionado ningún Ámbito de trabajo";
|
||||
return false;
|
||||
}
|
||||
OliviaGlob.limp.AmbitosSel = _subPanel1ViewModel.AmbitosSel;
|
||||
int i = 0;
|
||||
for (i = 0; i < OliviaGlob.limp.AmbitosSel.Length; i++)
|
||||
if (OliviaGlob.limp.AmbitosSel[i])
|
||||
break;
|
||||
if(i>= OliviaGlob.limp.AmbitosSel.Length)
|
||||
{
|
||||
err_str = "No se ha seleccionado ningún Ámbito de trabajo";
|
||||
return false;
|
||||
}
|
||||
//lee si respeta circulacion
|
||||
OliviaGlob.limp.RespCirc = _subPanel1ViewModel.RespCirc;
|
||||
|
||||
//lee velo de desplazamiento
|
||||
int vv = -1;
|
||||
if((!HelperGlobal.Str2Int(_subPanel1ViewModel.TextVeloDespl, out vv)) && (_subPanel1ViewModel.TextVeloDespl!=Resource1.String_velo_nodef))
|
||||
{
|
||||
err_str = "Error al leer la velocidad de desplazamiento";
|
||||
return false;
|
||||
}
|
||||
if ((vv == 0) || (vv > LimpiezaDef.Parametros.v_despM) || (vv < LimpiezaDef.Parametros.v_despm))
|
||||
{
|
||||
err_str = "La velocidad de desplazamiento no está dentro de los límites configurados";
|
||||
return false;
|
||||
}
|
||||
OliviaGlob.limp.VDespl = vv;
|
||||
|
||||
//lee tiempo de tto
|
||||
if ((_subPanel1ViewModel.TimeTto == 0) ||
|
||||
(_subPanel1ViewModel.TimeTto > LimpiezaDef.Parametros.t_ttoM) || (_subPanel1ViewModel.TimeTto < LimpiezaDef.Parametros.t_ttom))
|
||||
{
|
||||
err_str = "El tiempo de tratamiento no está dentro de los límites configurados";
|
||||
return false;
|
||||
}
|
||||
OliviaGlob.limp.Ttto = _subPanel1ViewModel.TimeTto;
|
||||
OliviaGlob.limp.UdsTTto = _subPanel1ViewModel.UdsTTto;
|
||||
|
||||
//lee las propiedades comunes a recogida
|
||||
if (!LeeComun(OliviaGlob.limp,out err_str))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Acciones para comenzar ejecución
|
||||
*/
|
||||
public void Ejecuta(OliviaAddInPro.Services.ModosEjec modo)
|
||||
{
|
||||
string err = "";
|
||||
|
||||
|
||||
OliviaGlob.progrDialog.Show();
|
||||
var progSrc = new CancelableProgressorSource(OliviaGlob.progrDialog);
|
||||
|
||||
|
||||
if (!Lee(out err))
|
||||
{
|
||||
HelperGlobal.ponMsg(err);
|
||||
return;
|
||||
}
|
||||
|
||||
Action<TareaRes> ac = finEjecuta;
|
||||
OliviaGlob.Limp.EjecutaAsync(modo, progSrc, ac);
|
||||
}
|
||||
public void finEjecuta(TareaRes res)
|
||||
{
|
||||
OliviaGlob.progrDialog.Hide();
|
||||
if (res.Errores)
|
||||
{
|
||||
HelperGlobal.ponMsg(res.msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue