Narvaling
/
OliviaAddIn
mirror of http://desa.narvaling.com/Bonobo.Git.Server/OliviaAddIn.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corregida una cosa al exportar lateralidad 

Elegir el dataset de salida, comprobando si está en otra proyección
Mejorada posición de las ventanas, se guarda
master
Elena 2019-05-31 13:21:30 +02:00
parent 37a7b742e9
commit c941a8e29e
42 changed files with 877 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OliviaAddIn/ClassDiagram2.cd Normal file
View File

@ -0,0 +1 @@

3
OliviaAddIn/Comun.cs
View File

@ -95,8 +95,9 @@ namespace OliviaAddIn
*/ */
public string text_restr = ""; public string text_restr = "";
/** /**
* Path de la clase de los ámbitos * String con el tipo de tratamiento
*/ */
public string tipo_tto = "";
//************************************************************************************* //*************************************************************************************
//Funciones //Funciones

33
OliviaAddIn/ComunDef.cs Normal file
View File

@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OliviaAddIn
{
public static class ComunDef
{
//*************************************************************************************
//Enums y structs generales
/**
* Nombre de los campos de la cartografía de la red navegable que se consultan para la exportación
*/
public struct CamposNW
{
public static string cons_onew; //<Campo que indica el sentido
public static string cons_kph; //<Campo que indica la velocidad en kph
public static string cons_name; //<Campo que indica el nombre de la calle
public static string cons_fow; //Campo que indica el tipo de vial, si es peatonal o no
};
/**
* Nombre de los Atributos de la cartografía de la red navegable que se consultan para la exportación
*/
public struct AtributosNW
{
public static string atr_TF; //<Atributo del campo Oneway que indica TO FROM
public static string atr_FT; //<Atributo del campo Oneway que indica FROM TO
public static string atr_N; //<Atributo del campo Oneway que indica NONE
public static string atr_pedes; //<Atributo del campo FOW que indica peatonal
};
}
}

1
OliviaAddIn/DatosCsv.Designer.cs generated
View File

@ -212,7 +212,6 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "DatosCsv"; this.Name = "DatosCsv";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "DatosCsv"; this.Text = "DatosCsv";
this.TopMost = true; this.TopMost = true;
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.DatosCsv_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.DatosCsv_FormClosed);

40
OliviaAddIn/DatosGDB.cs
View File

@ -56,7 +56,7 @@ namespace OliviaAddIn
public string giros = "giro"; public string giros = "giro";
public string relaciones = "relacion"; public string relaciones = "relacion";
public string interseccion = "intersec"; public string interseccion = "intersec";
public string sector = "SECTOR"; public string sector = OliviaDef.GeneralDef.NombColSector; //SECTOR
public string secuencia = "SECUENCIA"; public string secuencia = "SECUENCIA";
public string tipo_cont = "FRACCION"; public string tipo_cont = "FRACCION";
public string tipo_recog = "NOMB_TIP_R"; public string tipo_recog = "NOMB_TIP_R";
@ -2001,25 +2001,47 @@ namespace OliviaAddIn
//crea el dataset si no existe //crea el dataset si no existe
ISpatialReferenceFactory3 spatialReferenceFactory = (ISpatialReferenceFactory3)new SpatialReferenceEnvironment(); ISpatialReferenceFactory3 spatialReferenceFactory = (ISpatialReferenceFactory3)new SpatialReferenceEnvironment();
ISpatialReference spref = (ISpatialReference)spatialReferenceFactory.CreateProjectedCoordinateSystem(OliviaGlob.coorsys_in); ISpatialReference spref = (ISpatialReference)spatialReferenceFactory.CreateProjectedCoordinateSystem(OliviaGlob.coorsys_in);
if(! FunGDB.crea_ftdataset(path_gdb, tratamiento, spref)) int ii=FunGDB.crea_ftdataset(path_gdb, tratamiento, spref);
string err_spatref = "Atención, no coincide la proyección de las FeatureClass del Dataset con la del FeatureClass a importar";
if(ii!=0)
{
if (ii == 1)
{ {
err_st = "Error al crear el Dataset " + tratamiento; err_st = "Error al crear el Dataset " + tratamiento;
return false; return false;
} }
else
{
//avisa
MessageBox.Show(err_spatref, "Olivia", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}
///////////////////////////////////////// /////////////////////////////////////////
//pregunta a ver si se quiere ese nombre u otro //pregunta a ver si se quiere ese nombre u otro
bool replace = false; bool replace = false;
string dataset = tratamiento;
string ambitos_aux = FunGDB.save_ftcls("Guardar Feature Class como...",OliviaGlob.inidlg.Handle.ToInt32(), string ambitos_aux = FunGDB.save_ftcls("Guardar Feature Class como...",OliviaGlob.inidlg.Handle.ToInt32(),
path_gdb + "\\" + tratamiento + "\\" + ambitos, out replace); path_gdb + "\\" + tratamiento + "\\" + ambitos, out replace, out dataset);
if(ambitos_aux!=null) if(ambitos_aux!=null)
ambitos=System.IO.Path.GetFileNameWithoutExtension(ambitos_aux); ambitos=System.IO.Path.GetFileNameWithoutExtension(ambitos_aux);
//comprueba si la proyección es la misma la del dataset que la que llega
if (!dataset.Equals(tratamiento))
{
//comprueba las proyecciones
if (!FunGDB.same_spatref_dataset(FunGDB.abre_ftws(path_gdb).OpenFeatureDataset(dataset), spref))
{
//avisa
MessageBox.Show(err_spatref, "Olivia", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}
///////////////////////////////////////// /////////////////////////////////////////
//todo ok, se pone a importar //todo ok, se pone a importar
name = ambitos; name = ambitos;
path_import = path_gdb + "\\" + tratamiento + "\\" + ambitos; path_import = path_gdb + "\\" + dataset + "\\" + ambitos;
ii = 0;
if(modo==(int)ModsImport.ImportSec1) //sectoriza if(modo==(int)ModsImport.ImportSec1) //sectoriza
{ {
NIMPORT=2; NIMPORT=2;
@ -2037,7 +2059,7 @@ namespace OliviaAddIn
else else
NIMPORT=5; NIMPORT=5;
if (reco_tramos) if (reco_tramos)
NIMPORT = 7; NIMPORT++;
noms_shp = new string[NIMPORT]; noms_shp = new string[NIMPORT];
noms_gdb = new string[NIMPORT]; noms_gdb = new string[NIMPORT];
noms_shp[0]=shapefile; noms_shp[0]=shapefile;
@ -2050,15 +2072,17 @@ namespace OliviaAddIn
noms_gdb[3] = ambitos + name_ruta_out; noms_gdb[3] = ambitos + name_ruta_out;
noms_shp[4] = shapefile + name_ruta_aux; noms_shp[4] = shapefile + name_ruta_aux;
noms_gdb[4] = ambitos + name_ruta_out + name_aux; noms_gdb[4] = ambitos + name_ruta_out + name_aux;
ii=5;
if (reco_o_limp_con_instala) if (reco_o_limp_con_instala)
{ {
noms_shp[5] = shapefile + name_instal; noms_shp[5] = shapefile + name_instal;
noms_gdb[5] = ambitos + name_inst_out; noms_gdb[5] = ambitos + name_inst_out;
ii++;
} }
if (reco_tramos) if (reco_tramos)
{ {
noms_shp[6] = shapefile + name_ruta2; noms_shp[ii] = shapefile + name_ruta2;
noms_gdb[6] = ambitos + name_ruta2_out; noms_gdb[ii] = ambitos + name_ruta2_out;
} }
} }
else else
@ -2136,7 +2160,7 @@ namespace OliviaAddIn
fdn_gdb = new FeatureDatasetNameClass(); fdn_gdb = new FeatureDatasetNameClass();
dname_gdb = (IDatasetName)fdn_gdb; dname_gdb = (IDatasetName)fdn_gdb;
dname_gdb.WorkspaceName = wsn_gdb; dname_gdb.WorkspaceName = wsn_gdb;
dname_gdb.Name = tratamiento; dname_gdb.Name = dataset;
try try
{ {

3
OliviaAddIn/DatosGDBLimp.cs
View File

@ -416,6 +416,9 @@ namespace OliviaAddIn
//guarda los nombres del shape //guarda los nombres del shape
OliviaGlob.Paths.PathNW = OliviaGlob.Paths.DirData + datasetn.Name; OliviaGlob.Paths.PathNW = OliviaGlob.Paths.DirData + datasetn.Name;
//Guarda el nombre que lo escribirá en el shp resultado
OliviaGlob.nomb_tto = LimpiezaDef.tto_gdb[limp.tipo_tto];
return true; return true;
} }

3
OliviaAddIn/DatosGDBReco.cs
View File

@ -504,6 +504,9 @@ namespace OliviaAddIn
//guarda los nombres del shape //guarda los nombres del shape
OliviaGlob.Paths.PathNW = OliviaGlob.Paths.DirData + datasetn.Name; OliviaGlob.Paths.PathNW = OliviaGlob.Paths.DirData + datasetn.Name;
//Guarda el nombre que lo escribirá en el shp resultado
OliviaGlob.nomb_tto = RecogidaDef.tipos_fracc_str[rec.tipo_frac];
return true; return true;
} }

3
OliviaAddIn/EditTxtPlant.Designer.cs generated
View File

@ -59,7 +59,10 @@
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.propertyGrid_txtplant); this.Controls.Add(this.propertyGrid_txtplant);
this.Name = "EditTxtPlant"; this.Name = "EditTxtPlant";
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "Editor de Textos para la Plantilla"; this.Text = "Editor de Textos para la Plantilla";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.EditTxtPlant_FormClosing);
this.Load += new System.EventHandler(this.EditTxtPlant_Load);
this.Resize += new System.EventHandler(this.EditTxtPlant_Resize); this.Resize += new System.EventHandler(this.EditTxtPlant_Resize);
this.ResumeLayout(false); this.ResumeLayout(false);

15
OliviaAddIn/EditTxtPlant.cs
View File

@ -46,6 +46,21 @@ namespace OliviaAddIn
button1.Top = ClientSize.Height - top_buttons; button1.Top = ClientSize.Height - top_buttons;
propertyGrid_txtplant.Size = new Size(ClientSize.Width - right_props, ClientSize.Height - bottom_props); propertyGrid_txtplant.Size = new Size(ClientSize.Width - right_props, ClientSize.Height - bottom_props);
} }
private void EditTxtPlant_FormClosing(object sender, FormClosingEventArgs e)
{
if(this.WindowState==FormWindowState.Normal)
Properties.Settings.Default.EditTxtPlant_Loc = this.Location;
else
Properties.Settings.Default.EditTxtPlant_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
private void EditTxtPlant_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.EditTxtPlant_Loc;
}
} }
/* /*

24
OliviaAddIn/Ejecuta.cs
View File

@ -69,6 +69,8 @@ namespace OliviaAddIn
*/ */
public bool ejec() public bool ejec()
{ {
add_cfg_comun();
//lanza ventana marchando que lanza proceso en bucle para actualizar barra progreso //lanza ventana marchando que lanza proceso en bucle para actualizar barra progreso
OliviaGlob.progr_eje = new ProgresoEjec(); OliviaGlob.progr_eje = new ProgresoEjec();
@ -84,6 +86,28 @@ namespace OliviaAddIn
return true; return true;
} }
/**
* Añade al str de cfg los parametros de configuración comunes a limpieza y recogida
*/
private void add_cfg_comun()
{
str_cfg = str_cfg +
//campos de la red navegable
GeneralDef.EjecGeoParamSep + GeneralDef.GTC_onew + GeneralDef.EjecGeoParamIgual + ComunDef.CamposNW.cons_onew + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTC_kph + GeneralDef.EjecGeoParamIgual + ComunDef.CamposNW.cons_kph + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTC_fow + GeneralDef.EjecGeoParamIgual + ComunDef.CamposNW.cons_fow + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTC_name + GeneralDef.EjecGeoParamIgual + ComunDef.CamposNW.cons_name + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTA_TF + GeneralDef.EjecGeoParamIgual + ComunDef.AtributosNW.atr_TF + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTA_FT + GeneralDef.EjecGeoParamIgual + ComunDef.AtributosNW.atr_FT + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTA_N + GeneralDef.EjecGeoParamIgual + ComunDef.AtributosNW.atr_N + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTA_pedes + GeneralDef.EjecGeoParamIgual + ComunDef.AtributosNW.atr_pedes + " " +
//nombre del tratamiento
GeneralDef.EjecGeoParamSep + GeneralDef.GG_strtto + GeneralDef.EjecGeoParamIgual + OliviaGlob.nomb_tto + " " +
//paths de archivos
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pd + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathData + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pn + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathNW + " ";
}
/** /**
* Arranca el proceso geofoto con los parámetros correspondientes * Arranca el proceso geofoto con los parámetros correspondientes
*/ */

14
OliviaAddIn/EjecutaLimp.cs
View File

@ -99,8 +99,18 @@ namespace OliviaAddIn
GeneralDef.EjecGeoParamSep + GeneralDef.GG_coox + GeneralDef.EjecGeoParamIgual + limp.coords_instala[0] + " " +//coordenadas GeneralDef.EjecGeoParamSep + GeneralDef.GG_coox + GeneralDef.EjecGeoParamIgual + limp.coords_instala[0] + " " +//coordenadas
GeneralDef.EjecGeoParamSep + GeneralDef.GG_cooy + GeneralDef.EjecGeoParamIgual + limp.coords_instala[1] + " " +//coordenadas GeneralDef.EjecGeoParamSep + GeneralDef.GG_cooy + GeneralDef.EjecGeoParamIgual + limp.coords_instala[1] + " " +//coordenadas
GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + limp.aislados + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + limp.aislados + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pd + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathData + " " + //campos del dbf de limpieza para leer
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pn + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathNW + " "; GeneralDef.EjecGeoParamSep + GeneralDef.GAA_obser + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Campos.consulta_observ + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAA_anch_tip + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Campos.consulta_anch_tip + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAA_tipolo + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Campos.consulta_tipolo + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAA_entid + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Campos.consulta_entidad + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAL_aparc + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Atributos.atr_aparc + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAL_bord + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Atributos.atr_bord + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAL_acera + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Atributos.atr_acera + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAL_peat + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Atributos.atr_peat + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAL_ap_lin + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Atributos.atr_ap_lin + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GAL_ap_bat + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Atributos.atr_ap_bat + " ";
base.str_cfg = str; base.str_cfg = str;

4
OliviaAddIn/EjecutaReco.cs
View File

@ -97,9 +97,7 @@ namespace OliviaAddIn
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_fechaf + GeneralDef.EjecGeoParamIgual + reco.fechaf_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_sens_modo + GeneralDef.EjecGeoParamIgual + reco.media + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + reco.aislados + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + reco.aislados + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.lateralidad + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.lateralidad + " ";
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pd + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathData + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pn + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathNW + " ";
base.str_cfg = str; base.str_cfg = str;

1
OliviaAddIn/FormCampos.Designer.cs generated
View File

@ -90,7 +90,6 @@
this.Controls.Add(this.propertyGrid); this.Controls.Add(this.propertyGrid);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FormCampos"; this.Name = "FormCampos";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Campos a leer"; this.Text = "Campos a leer";
this.TopMost = true; this.TopMost = true;
this.Resize += new System.EventHandler(this.FormCampos_Resize); this.Resize += new System.EventHandler(this.FormCampos_Resize);

81
OliviaAddIn/FunGDB.cs
View File

@ -79,7 +79,7 @@ namespace OliviaAddIn
* Lanza browser tipo catalog para guardar feature class * Lanza browser tipo catalog para guardar feature class
* Devuelve el path completo * Devuelve el path completo
*/ */
public static string save_ftcls(string title, int parentWnd, string name_ini, out bool replacing) public static string save_ftcls(string title, int parentWnd, string name_ini, out bool replacing, out string final_loc)
{ {
string path = null; string path = null;
IGxDialog gxdlg; IGxDialog gxdlg;
@ -102,9 +102,11 @@ namespace OliviaAddIn
path = null; path = null;
} }
replacing = gxdlg.ReplacingObject; replacing = gxdlg.ReplacingObject;
final_loc = gxdlg.InternalCatalog.SelectedObject.Name;
gxdlg.InternalCatalog.Close(); gxdlg.InternalCatalog.Close();
libera(gxdlg); libera(gxdlg);
return path; return path;
} }
@ -729,6 +731,42 @@ namespace OliviaAddIn
} }
/*
* Devuelve la geometría de modificando las coordendas de geograficas a proyectadas WGS84 UTM 30
* reutilizar en el siguiente método? es copia lo que sale?
*/
public static ISpatialReference dame_spatialref(IFeatureClass fc)
{
int ind;
IFields campos;
String shapeFieldName;
IField shapeField;
IGeometryDef geom_def, dest_geom;
IClone geom_clon, dest_clon;
IGeometryDefEdit geom_edit;
try
{
campos = fc.Fields;
//se consigue la forma (shape) de la featureclass de interés
shapeFieldName = fc.ShapeFieldName;
ind = fc.FindField(shapeFieldName);
shapeField = campos.get_Field(ind);
//conseguir la geometria definida por el campo shape
geom_def = shapeField.GeometryDef;
geom_clon = (IClone)geom_def;
dest_clon = geom_clon.Clone();
dest_geom = (IGeometryDef)dest_clon;
geom_edit = (IGeometryDefEdit)dest_geom;
return geom_edit.SpatialReference;
}
catch (Exception)
{
return null;
}
}
/* /*
* Devuelve la geometría de modificando las coordendas de geograficas a proyectadas WGS84 UTM 30 * Devuelve la geometría de modificando las coordendas de geograficas a proyectadas WGS84 UTM 30
*/ */
@ -1385,7 +1423,7 @@ namespace OliviaAddIn
/** /**
*Crea el feature dataset *Crea el feature dataset
*/ */
public static bool crea_ftdataset(string path_gdb, string dataset_nomb, ISpatialReference spref) public static int crea_ftdataset(string path_gdb, string dataset_nomb, ISpatialReference spref)
{ {
IWorkspace2 ws_gdb_; IWorkspace2 ws_gdb_;
IFeatureWorkspace fws; IFeatureWorkspace fws;
@ -1396,25 +1434,54 @@ namespace OliviaAddIn
ws_gdb_ = (IWorkspace2)FunGDB.abre_ws(path_gdb); ws_gdb_ = (IWorkspace2)FunGDB.abre_ws(path_gdb);
if (ws_gdb_ == null) if (ws_gdb_ == null)
return false; return 1;
fws = (IFeatureWorkspace)ws_gdb_; fws = (IFeatureWorkspace)ws_gdb_;
if (ws_gdb_.get_NameExists(esriDatasetType.esriDTFeatureDataset, dataset_nomb)) if (ws_gdb_.get_NameExists(esriDatasetType.esriDTFeatureDataset, dataset_nomb))
return true;//existe, no hay nada que crear {
if (!same_spatref_dataset(fws.OpenFeatureDataset(dataset_nomb), spref))
{
//avisa
return 2;
}
return 0;//existe, no hay nada que crear
}
ft_dataset = fws.CreateFeatureDataset(dataset_nomb, spref); ft_dataset = fws.CreateFeatureDataset(dataset_nomb, spref);
if (ft_dataset == null) if (ft_dataset == null)
{ {
return false; return 1;
} }
return true; return 0;
} }
catch catch
{ {
return false; return 1;
} }
} }
/**
* Comprueba si el dataset de nombre dado tiene la misma spatialref que la dada
*/
public static bool same_spatref_dataset(IFeatureDataset ft_dataset, ISpatialReference spref)
{
IFeatureClass ftc;
IEnumDataset enumDS = ft_dataset.Subsets;
IDataset ds = enumDS.Next();
while (ds != null)
{
if (ds is IFeatureClass)
{
ftc = ds as IFeatureClass;
if (dame_spatialref(ftc).FactoryCode!=spref.FactoryCode)
return false;
else
return true;
}
}
return true;//esta vacío
}
/** /**
* Indica si la capa contiene puntuales * Indica si la capa contiene puntuales
*/ */

4
OliviaAddIn/InicioDlg.Designer.cs generated
View File

@ -137,10 +137,12 @@
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "InicioDlg"; this.Name = "InicioDlg";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "OLIVIA | Inicio"; this.Text = "OLIVIA | Inicio";
this.TopMost = true; this.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.InicioDlg_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.InicioDlg_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.InicioDlg_FormClosed);
this.Load += new System.EventHandler(this.InicioDlg_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

15
OliviaAddIn/InicioDlg.cs
View File

@ -308,5 +308,20 @@ namespace OliviaAddIn
if (button_gdb.Text != text_selec_gdb) if (button_gdb.Text != text_selec_gdb)
enable_buttons(true); enable_buttons(true);
} }
private void InicioDlg_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.InicioDlg_Loc;
}
private void InicioDlg_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.InicioDlg_Loc = this.Location;
else
Properties.Settings.Default.InicioDlg_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
} }
} }

68
OliviaAddIn/LimpCampos.cs
View File

@ -45,6 +45,30 @@ namespace OliviaAddIn
get { return LimpiezaDef.Campos.consulta_mecan; } get { return LimpiezaDef.Campos.consulta_mecan; }
set { LimpiezaDef.Campos.consulta_mecan = value; } set { LimpiezaDef.Campos.consulta_mecan = value; }
} }
[DisplayNameAttribute("Observaciones")]
[DescriptionAttribute("Campo donde leer las observaciones de la entidad.")]
[Category("Campos")]
public string camp_observ
{
get { return LimpiezaDef.Campos.consulta_observ; }
set { LimpiezaDef.Campos.consulta_observ = value; }
}
[DisplayNameAttribute("Ancho Tipo")]
[DescriptionAttribute("Campo donde leer el ancho tipo de la entidad.")]
[Category("Campos")]
public string camp_anch_tip
{
get { return LimpiezaDef.Campos.consulta_anch_tip; }
set { LimpiezaDef.Campos.consulta_anch_tip = value; }
}
[DisplayNameAttribute("Tipología")]
[DescriptionAttribute("Campo donde leer la topología de la entidad.")]
[Category("Campos")]
public string camp_tipolo
{
get { return LimpiezaDef.Campos.consulta_tipolo; }
set { LimpiezaDef.Campos.consulta_tipolo = value; }
}
//////////////////////////////////////////// ////////////////////////////////////////////
//Atributos //Atributos
[DisplayNameAttribute("Bordillos libres")] [DisplayNameAttribute("Bordillos libres")]
@ -79,6 +103,22 @@ namespace OliviaAddIn
get { return LimpiezaDef.Atributos.atr_peat; } get { return LimpiezaDef.Atributos.atr_peat; }
set { LimpiezaDef.Atributos.atr_peat = value; } set { LimpiezaDef.Atributos.atr_peat = value; }
} }
[DisplayNameAttribute("Aparcamiento en línea")]
[DescriptionAttribute("Atributo a consultar para las bandas de aparcamiento en línea.")]
[Category("Atributos")]
public string atr_ap_lin
{
get { return LimpiezaDef.Atributos.atr_ap_lin; }
set { LimpiezaDef.Atributos.atr_ap_lin = value; }
}
[DisplayNameAttribute("Aparcamiento en batería")]
[DescriptionAttribute("Atributo a consultar para las bandas de aparcamiento en batería.")]
[Category("Atributos")]
public string atr_ap_bat
{
get { return LimpiezaDef.Atributos.atr_ap_bat; }
set { LimpiezaDef.Atributos.atr_ap_bat = value; }
}
[DisplayNameAttribute("Caida de Hoja")] [DisplayNameAttribute("Caida de Hoja")]
[DescriptionAttribute("Atributo a consultar para la Caida de Hoja.")] [DescriptionAttribute("Atributo a consultar para la Caida de Hoja.")]
[Category("Atributos")] [Category("Atributos")]
@ -135,6 +175,9 @@ namespace OliviaAddIn
{ {
props.camp_nom_tipo_ent = LimpiezaDef.Campos.consulta_entidad; props.camp_nom_tipo_ent = LimpiezaDef.Campos.consulta_entidad;
props.camp_mecaniz = LimpiezaDef.Campos.consulta_mecan; props.camp_mecaniz = LimpiezaDef.Campos.consulta_mecan;
props.camp_observ = LimpiezaDef.Campos.consulta_observ;
props.camp_anch_tip = LimpiezaDef.Campos.consulta_anch_tip;
props.camp_tipolo = LimpiezaDef.Campos.consulta_tipolo;
props.atr_bord = LimpiezaDef.Atributos.atr_bord; props.atr_bord = LimpiezaDef.Atributos.atr_bord;
props.atr_aparc = LimpiezaDef.Atributos.atr_aparc; props.atr_aparc = LimpiezaDef.Atributos.atr_aparc;
@ -145,6 +188,8 @@ namespace OliviaAddIn
props.atr_pape = LimpiezaDef.Atributos.atr_pape; props.atr_pape = LimpiezaDef.Atributos.atr_pape;
props.atr_pipi = LimpiezaDef.Atributos.atr_pipi; props.atr_pipi = LimpiezaDef.Atributos.atr_pipi;
props.atr_sane = LimpiezaDef.Atributos.atr_sane; props.atr_sane = LimpiezaDef.Atributos.atr_sane;
props.atr_ap_lin = LimpiezaDef.Atributos.atr_ap_lin;
props.atr_ap_bat = LimpiezaDef.Atributos.atr_ap_bat;
} }
protected override void button_reset_Click(object sender, EventArgs e) protected override void button_reset_Click(object sender, EventArgs e)
@ -160,6 +205,9 @@ namespace OliviaAddIn
{ {
LimpiezaDef.Campos.consulta_entidad = props.camp_nom_tipo_ent; LimpiezaDef.Campos.consulta_entidad = props.camp_nom_tipo_ent;
LimpiezaDef.Campos.consulta_mecan = props.camp_mecaniz; LimpiezaDef.Campos.consulta_mecan = props.camp_mecaniz;
LimpiezaDef.Campos.consulta_observ = props.camp_observ;
LimpiezaDef.Campos.consulta_anch_tip = props.camp_anch_tip;
LimpiezaDef.Campos.consulta_tipolo = props.camp_tipolo;
LimpiezaDef.Atributos.atr_bord = props.atr_bord; LimpiezaDef.Atributos.atr_bord = props.atr_bord;
LimpiezaDef.Atributos.atr_aparc = props.atr_aparc; LimpiezaDef.Atributos.atr_aparc = props.atr_aparc;
@ -170,6 +218,8 @@ namespace OliviaAddIn
LimpiezaDef.Atributos.atr_pape = props.atr_pape; LimpiezaDef.Atributos.atr_pape = props.atr_pape;
LimpiezaDef.Atributos.atr_pipi = props.atr_pipi; LimpiezaDef.Atributos.atr_pipi = props.atr_pipi;
LimpiezaDef.Atributos.atr_sane = props.atr_sane; LimpiezaDef.Atributos.atr_sane = props.atr_sane;
LimpiezaDef.Atributos.atr_ap_lin = props.atr_ap_lin;
LimpiezaDef.Atributos.atr_ap_bat = props.atr_ap_bat;
OliviaGlob.forma_filtros_limp(); OliviaGlob.forma_filtros_limp();
@ -187,6 +237,9 @@ namespace OliviaAddIn
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.ClientSize = new System.Drawing.Size(292, 309); this.ClientSize = new System.Drawing.Size(292, 309);
this.Name = "LimpCampos"; this.Name = "LimpCampos";
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LimpCampos_FormClosing);
this.Load += new System.EventHandler(this.LimpCampos_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@ -196,5 +249,20 @@ namespace OliviaAddIn
OliviaGlob.forma_filtros_limp(); OliviaGlob.forma_filtros_limp();
base.button_guardar_Click(sender, e); base.button_guardar_Click(sender, e);
} }
private void LimpCampos_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.LimpCampos_Loc;
}
private void LimpCampos_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.LimpCampos_Loc = this.Location;
else
Properties.Settings.Default.LimpCampos_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
} }
} }

12
OliviaAddIn/Limpieza.cs
View File

@ -73,7 +73,7 @@ namespace OliviaAddIn
*/ */
public bool[] t_carg_desc; public bool[] t_carg_desc;
/** /**
* Indica si se ha marcado el checkbox para que se recojan únicamente aquellos contendores que superan un umbral de carga. * Indica si se ha marcado el checkbox para que se recojan únicamente aquellas papeleras que superan un umbral de carga.
*/ */
public bool umbral_reco_conten = false; public bool umbral_reco_conten = false;
/** /**
@ -96,6 +96,16 @@ namespace OliviaAddIn
* Matriz que da los ámbitos correspondientes a los tipos de tratamiento * Matriz que da los ámbitos correspondientes a los tipos de tratamiento
*/ */
public AmbsVal[] ambs_val; public AmbsVal[] ambs_val;
/**
* Anchos por defecto para el cálculo de rendimientos de los tratamientos
* De momento los lee olivia del cfg_geo.ini, habría que pasarlos por socket?
*/
public double ancho_peat_def = 6;
public double ancho_acera_def = 1.5;
public double ancho_ap_lin_def = 2;
public double ancho_ap_bat_def = 4;
public double ancho_bord_lib_def = 1.5;
//************************************************************************************* //*************************************************************************************
//Métodos //Métodos
public Limpieza() public Limpieza()

6
OliviaAddIn/LimpiezaDef.cs
View File

@ -34,6 +34,9 @@ namespace OliviaAddIn
{ {
public static string consulta_entidad; //<Campo a consultar de la capa de limpieza el tipo de entidad (ámbito) public static string consulta_entidad; //<Campo a consultar de la capa de limpieza el tipo de entidad (ámbito)
public static string consulta_mecan; //<Campo a consultar de la capa de limpieza si es mecanizable o no public static string consulta_mecan; //<Campo a consultar de la capa de limpieza si es mecanizable o no
public static string consulta_observ; //<Campo a consultar de la capa de limpieza, observaciones
public static string consulta_anch_tip; //<Campo a consultar de la capa de limpieza, ancho tipo
public static string consulta_tipolo; //<Campo a consultar de la capa de limpieza, tipología
}; };
/** /**
* Nombre de los atributos (de las capas) sobre los que se realizarán consultas para la limpieza * Nombre de los atributos (de las capas) sobre los que se realizarán consultas para la limpieza
@ -62,6 +65,9 @@ namespace OliviaAddIn
public static string atr_turis; //<Atributo a consultar para los Puntos de Interés Turístico public static string atr_turis; //<Atributo a consultar para los Puntos de Interés Turístico
public static string atr_solar; //<Atributo a consultar para los Solares public static string atr_solar; //<Atributo a consultar para los Solares
public static string atr_suelo; //<Atributo a consultar para los Usos del Suelo public static string atr_suelo; //<Atributo a consultar para los Usos del Suelo
public static string atr_ap_lin; //<Atributo a consultar para el aparcamiento en Linea
public static string atr_ap_bat; //<Atributo a consultar para el aparcamiento en Bateria
}; };
/** /**
* Nombre de los parámetros que intervienen en el cálculo para la limpieza * Nombre de los parámetros que intervienen en el cálculo para la limpieza

60
OliviaAddIn/LimpiezaDlg.Designer.cs generated
View File

@ -52,6 +52,9 @@
this.comboBox_tto = new System.Windows.Forms.ComboBox(); this.comboBox_tto = new System.Windows.Forms.ComboBox();
this.label_restric = new System.Windows.Forms.Label(); this.label_restric = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.textBox_buff = new System.Windows.Forms.TextBox();
this.label23 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label(); this.label22 = new System.Windows.Forms.Label();
this.label21 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label();
@ -104,9 +107,6 @@
this.groupBox_edits = new System.Windows.Forms.GroupBox(); this.groupBox_edits = new System.Windows.Forms.GroupBox();
this.checkBox_aislados = new System.Windows.Forms.CheckBox(); this.checkBox_aislados = new System.Windows.Forms.CheckBox();
this.btn_help = new System.Windows.Forms.Button(); this.btn_help = new System.Windows.Forms.Button();
this.textBox_buff = new System.Windows.Forms.TextBox();
this.label23 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
@ -373,6 +373,31 @@
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "Zonificación"; this.groupBox2.Text = "Zonificación";
// //
// textBox_buff
//
this.textBox_buff.Location = new System.Drawing.Point(534, 73);
this.textBox_buff.Name = "textBox_buff";
this.textBox_buff.Size = new System.Drawing.Size(83, 20);
this.textBox_buff.TabIndex = 29;
//
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(455, 77);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(73, 13);
this.label23.TabIndex = 28;
this.label23.Text = "Buffer de exp.";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(630, 77);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(15, 13);
this.label24.TabIndex = 27;
this.label24.Text = "m";
//
// label22 // label22
// //
this.label22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -961,31 +986,6 @@
this.btn_help.UseVisualStyleBackColor = true; this.btn_help.UseVisualStyleBackColor = true;
this.btn_help.Click += new System.EventHandler(this.btn_help_Click); this.btn_help.Click += new System.EventHandler(this.btn_help_Click);
// //
// textBox_buff
//
this.textBox_buff.Location = new System.Drawing.Point(534, 73);
this.textBox_buff.Name = "textBox_buff";
this.textBox_buff.Size = new System.Drawing.Size(83, 20);
this.textBox_buff.TabIndex = 29;
//
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(455, 77);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(73, 13);
this.label23.TabIndex = 28;
this.label23.Text = "Buffer de exp.";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(630, 77);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(15, 13);
this.label24.TabIndex = 27;
this.label24.Text = "m";
//
// LimpiezaDlg // LimpiezaDlg
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1004,10 +1004,12 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "LimpiezaDlg"; this.Name = "LimpiezaDlg";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "OLIVIA | Limpieza Viaria"; this.Text = "OLIVIA | Limpieza Viaria";
this.TopMost = true; this.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LimpiezaDlg_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.LimpiezaDlg_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.LimpiezaDlg_FormClosed);
this.Load += new System.EventHandler(this.LimpiezaDlg_Load);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();

15
OliviaAddIn/LimpiezaDlg.cs
View File

@ -1182,5 +1182,20 @@ namespace OliviaAddIn
return; return;
} }
} }
private void LimpiezaDlg_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.LimpDlg_Loc = this.Location;
else
Properties.Settings.Default.LimpDlg_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
private void LimpiezaDlg_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.LimpDlg_Loc;
}
} }
} }

63
OliviaAddIn/LimpiezaDlg.resx
View File

@ -123,47 +123,44 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bt_restric_circ.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="bt_restric_circ.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2 H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
AAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="bt_zonas.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="bt_zonas.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2 H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
AAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="bt_niveles.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="bt_niveles.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2 H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
AAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

3
OliviaAddIn/ListCapasMaqueta.Designer.cs generated
View File

@ -73,10 +73,11 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "ListCapasMaqueta"; this.Name = "ListCapasMaqueta";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "Capas para maquetar"; this.Text = "Capas para maquetar";
this.TopMost = true; this.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ListCapasMaqueta_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ListCapasMaqueta_FormClosing);
this.Load += new System.EventHandler(this.ListCapasMaqueta_Load);
this.Shown += new System.EventHandler(this.ListCapasMaqueta_Shown); this.Shown += new System.EventHandler(this.ListCapasMaqueta_Shown);
this.ResumeLayout(false); this.ResumeLayout(false);

12
OliviaAddIn/ListCapasMaqueta.cs
View File

@ -146,6 +146,18 @@ namespace OliviaAddIn
{ {
if (aceptar == false) if (aceptar == false)
capas_maquetar = null; capas_maquetar = null;
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.ListMaq_Loc = this.Location;
else
Properties.Settings.Default.ListMaq_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
private void ListCapasMaqueta_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.ListMaq_Loc;
} }
} }

4
OliviaAddIn/ListForm.Designer.cs generated
View File

@ -62,8 +62,10 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "ListForm"; this.Name = "ListForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ListForm_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ListForm_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ListForm_FormClosed);
this.Load += new System.EventHandler(this.ListForm_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
} }

15
OliviaAddIn/ListForm.cs
View File

@ -74,5 +74,20 @@ namespace OliviaAddIn
Close(); Close();
} }
} }
private void ListForm_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.ListForm_Loc = this.Location;
else
Properties.Settings.Default.ListForm_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
private void ListForm_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.ListForm_Loc;
}
} }
} }

13
OliviaAddIn/OliviaAddIn.csproj
View File

@ -148,6 +148,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="ButtonInicio.cs" /> <Compile Include="ButtonInicio.cs" />
<Compile Include="Comun.cs" /> <Compile Include="Comun.cs" />
<Compile Include="ComunDef.cs" />
<Compile Include="Config.Designer.cs"> <Compile Include="Config.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Config.esriaddinx</DependentUpon> <DependentUpon>Config.esriaddinx</DependentUpon>
@ -229,6 +230,11 @@
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="RecoCampos.cs"> <Compile Include="RecoCampos.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -246,6 +252,7 @@
<Compile Include="SensCampos.Designer.cs"> <Compile Include="SensCampos.Designer.cs">
<DependentUpon>SensCampos.cs</DependentUpon> <DependentUpon>SensCampos.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Settings.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AddInContent Include="Config.esriaddinx"> <AddInContent Include="Config.esriaddinx">
@ -331,8 +338,14 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="ClassDiagram1.cd" /> <None Include="ClassDiagram1.cd" />
<None Include="ClassDiagram2.cd" />
<None Include="Images\carrito.png" /> <None Include="Images\carrito.png" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Images\contenedor.png" /> <None Include="Images\contenedor.png" />

53
OliviaAddIn/OliviaGlob.cs
View File

@ -155,6 +155,10 @@ namespace OliviaAddIn
* Nombre del manual que se abrirá cuand ose pincha en el botón de ayuda disponible en las distintas ventanas. * Nombre del manual que se abrirá cuand ose pincha en el botón de ayuda disponible en las distintas ventanas.
*/ */
public static string manual = "Manual_Olivia"; public static string manual = "Manual_Olivia";
/**
* Nombre del tratamiento que se guarda en la tabla de los viajes
*/
public static string nomb_tto = "";
/** /**
* El Buffer de exportación de la red, en m * El Buffer de exportación de la red, en m
* (zona de influencia) a aplicar a los polígonos de ámbitos de trabajo, para extraer la red navegable correspondiente a cada ámbito. * (zona de influencia) a aplicar a los polígonos de ámbitos de trabajo, para extraer la red navegable correspondiente a cada ámbito.
@ -218,6 +222,9 @@ namespace OliviaAddIn
//para el grupo CAMPOS de LIMPIEZA //para el grupo CAMPOS de LIMPIEZA
ini.SetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_entid, LimpiezaDef.Campos.consulta_entidad); ini.SetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_entid, LimpiezaDef.Campos.consulta_entidad);
ini.SetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_mecan, LimpiezaDef.Campos.consulta_mecan); ini.SetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_mecan, LimpiezaDef.Campos.consulta_mecan);
ini.SetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_obser, LimpiezaDef.Campos.consulta_observ);
ini.SetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_anch_tip, LimpiezaDef.Campos.consulta_anch_tip);
ini.SetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_tipolo, LimpiezaDef.Campos.consulta_tipolo);
//para el grupo de ATRIBUTOS de LIMPIEZA //para el grupo de ATRIBUTOS de LIMPIEZA
ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_esc, LimpiezaDef.Atributos.atr_esca); ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_esc, LimpiezaDef.Atributos.atr_esca);
@ -242,6 +249,8 @@ namespace OliviaAddIn
ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_turis, LimpiezaDef.Atributos.atr_turis); ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_turis, LimpiezaDef.Atributos.atr_turis);
ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_solar, LimpiezaDef.Atributos.atr_solar); ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_solar, LimpiezaDef.Atributos.atr_solar);
ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_suelo, LimpiezaDef.Atributos.atr_suelo); ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_suelo, LimpiezaDef.Atributos.atr_suelo);
ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_ap_lin, LimpiezaDef.Atributos.atr_ap_lin);
ini.SetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_ap_bat, LimpiezaDef.Atributos.atr_ap_bat);
//para el grupo FILTROS de LIMPIEZA //para el grupo FILTROS de LIMPIEZA
ini.SetValue(GeneralDef.GrupoFiltLimp, GeneralDef.GFA_eje, LimpiezaDef.filtro_str[(int)LimpiezaDef.AmbitsTra.AmbEjeCalle]); ini.SetValue(GeneralDef.GrupoFiltLimp, GeneralDef.GFA_eje, LimpiezaDef.filtro_str[(int)LimpiezaDef.AmbitsTra.AmbEjeCalle]);
@ -455,6 +464,17 @@ namespace OliviaAddIn
ini.SetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sol, LimpiezaDef.nombre_simblimp_vsm[20]); ini.SetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sol, LimpiezaDef.nombre_simblimp_vsm[20]);
ini.SetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sue, LimpiezaDef.nombre_simblimp_vsm[21]); ini.SetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sue, LimpiezaDef.nombre_simblimp_vsm[21]);
//Campos de la red navegable que se leen
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_onew, ComunDef.CamposNW.cons_onew);
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_kph, ComunDef.CamposNW.cons_kph);
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_fow, ComunDef.CamposNW.cons_fow);
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_name, ComunDef.CamposNW.cons_name);
//Atributos de la red navegable que se leen
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_TF, ComunDef.AtributosNW.atr_TF);
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_FT, ComunDef.AtributosNW.atr_FT);
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_N, ComunDef.AtributosNW.atr_N);
ini.SetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_pedes, ComunDef.AtributosNW.atr_pedes);
ini.salvar(); ini.salvar();
return true; return true;
@ -542,6 +562,9 @@ namespace OliviaAddIn
//para el grupo CAMPOS de LIMPIEZA //para el grupo CAMPOS de LIMPIEZA
LimpiezaDef.Campos.consulta_entidad = ini.GetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_entid, LimpiezaDef.Campos.consulta_entidad); LimpiezaDef.Campos.consulta_entidad = ini.GetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_entid, LimpiezaDef.Campos.consulta_entidad);
LimpiezaDef.Campos.consulta_mecan = ini.GetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_mecan, LimpiezaDef.Campos.consulta_mecan); LimpiezaDef.Campos.consulta_mecan = ini.GetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_mecan, LimpiezaDef.Campos.consulta_mecan);
LimpiezaDef.Campos.consulta_observ = ini.GetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_obser, LimpiezaDef.Campos.consulta_observ);
LimpiezaDef.Campos.consulta_anch_tip = ini.GetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_anch_tip, LimpiezaDef.Campos.consulta_anch_tip);
LimpiezaDef.Campos.consulta_tipolo = ini.GetValue(GeneralDef.GrupoCampoLimp, GeneralDef.GAA_tipolo, LimpiezaDef.Campos.consulta_tipolo);
//para el grupo de ATRIBUTOS de LIMPIEZA //para el grupo de ATRIBUTOS de LIMPIEZA
LimpiezaDef.Atributos.atr_esca = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_esc, LimpiezaDef.Atributos.atr_esca); LimpiezaDef.Atributos.atr_esca = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_esc, LimpiezaDef.Atributos.atr_esca);
@ -566,6 +589,8 @@ namespace OliviaAddIn
LimpiezaDef.Atributos.atr_turis = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_turis, LimpiezaDef.Atributos.atr_turis); LimpiezaDef.Atributos.atr_turis = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_turis, LimpiezaDef.Atributos.atr_turis);
LimpiezaDef.Atributos.atr_solar = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_solar, LimpiezaDef.Atributos.atr_solar); LimpiezaDef.Atributos.atr_solar = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_solar, LimpiezaDef.Atributos.atr_solar);
LimpiezaDef.Atributos.atr_suelo = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_suelo, LimpiezaDef.Atributos.atr_suelo); LimpiezaDef.Atributos.atr_suelo = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_suelo, LimpiezaDef.Atributos.atr_suelo);
LimpiezaDef.Atributos.atr_ap_lin = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_ap_lin, LimpiezaDef.Atributos.atr_ap_lin);
LimpiezaDef.Atributos.atr_ap_bat = ini.GetValue(GeneralDef.GrupoAtribLimp, GeneralDef.GAL_ap_bat, LimpiezaDef.Atributos.atr_ap_bat);
//para el grupo FILTROS de LIMPIEZA //para el grupo FILTROS de LIMPIEZA
LimpiezaDef.filtro_str[(int)LimpiezaDef.AmbitsTra.AmbEjeCalle] = LimpiezaDef.filtro_str[(int)LimpiezaDef.AmbitsTra.AmbEjeCalle] =
@ -795,6 +820,18 @@ namespace OliviaAddIn
LimpiezaDef.nombre_simblimp_vsm[20] = ini.GetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sol, LimpiezaDef.nombre_simblimp_vsm[20]); LimpiezaDef.nombre_simblimp_vsm[20] = ini.GetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sol, LimpiezaDef.nombre_simblimp_vsm[20]);
LimpiezaDef.nombre_simblimp_vsm[21] = ini.GetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sue, LimpiezaDef.nombre_simblimp_vsm[21]); LimpiezaDef.nombre_simblimp_vsm[21] = ini.GetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_sue, LimpiezaDef.nombre_simblimp_vsm[21]);
//Campos de la red navegable que se leen
ComunDef.CamposNW.cons_onew = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_onew, ComunDef.CamposNW.cons_onew);
ComunDef.CamposNW.cons_kph = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_kph, ComunDef.CamposNW.cons_kph);
ComunDef.CamposNW.cons_fow = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_fow, ComunDef.CamposNW.cons_fow);
ComunDef.CamposNW.cons_name = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTC_name, ComunDef.CamposNW.cons_name);
//Atributos de la red navegable que se leen
ComunDef.AtributosNW.atr_TF = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_TF, ComunDef.AtributosNW.atr_TF);
ComunDef.AtributosNW.atr_FT = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_FT, ComunDef.AtributosNW.atr_FT);
ComunDef.AtributosNW.atr_N = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_N, ComunDef.AtributosNW.atr_N);
ComunDef.AtributosNW.atr_pedes = ini.GetValue(GeneralDef.GrupoCampoNW, GeneralDef.GTA_pedes, ComunDef.AtributosNW.atr_pedes);
//se inicializa aqui gdb_limp porque si se hace en el constructor iniciliza tambien la clase DatosGDBLimp. //se inicializa aqui gdb_limp porque si se hace en el constructor iniciliza tambien la clase DatosGDBLimp.
//En el constructor de DatosGDBLimp hay una función (rellena_ftclass()) que depende de esta (lee_ini_gen()). //En el constructor de DatosGDBLimp hay una función (rellena_ftclass()) que depende de esta (lee_ini_gen()).
//se accederia antes a rellena_ftclass() que a esta funcion (lee_ini_gen()) y habría errores. //se accederia antes a rellena_ftclass() que a esta funcion (lee_ini_gen()) y habría errores.
@ -844,6 +881,9 @@ namespace OliviaAddIn
LimpiezaDef.Campos.consulta_entidad = "NOM_TIPO_ENTIDAD"; LimpiezaDef.Campos.consulta_entidad = "NOM_TIPO_ENTIDAD";
LimpiezaDef.Campos.consulta_mecan = "MECANIZABLE"; LimpiezaDef.Campos.consulta_mecan = "MECANIZABLE";
LimpiezaDef.Campos.consulta_observ = "OBSERVACIONES";
LimpiezaDef.Campos.consulta_anch_tip = "ANCHO_TIPO";
LimpiezaDef.Campos.consulta_tipolo = "TIPOLOGIA";
LimpiezaDef.Atributos.atr_esca = "Escaleras"; LimpiezaDef.Atributos.atr_esca = "Escaleras";
LimpiezaDef.Atributos.atr_fuent = "Fuentes"; LimpiezaDef.Atributos.atr_fuent = "Fuentes";
@ -867,6 +907,8 @@ namespace OliviaAddIn
LimpiezaDef.Atributos.atr_turis = "Puntos_Interes_Turistico"; LimpiezaDef.Atributos.atr_turis = "Puntos_Interes_Turistico";
LimpiezaDef.Atributos.atr_solar = "Solares"; LimpiezaDef.Atributos.atr_solar = "Solares";
LimpiezaDef.Atributos.atr_suelo = "Uso_Suelos"; LimpiezaDef.Atributos.atr_suelo = "Uso_Suelos";
LimpiezaDef.Atributos.atr_ap_lin = "Linea";
LimpiezaDef.Atributos.atr_ap_bat = "Bateria";
forma_filtros_limp(); forma_filtros_limp();
@ -1018,6 +1060,17 @@ namespace OliviaAddIn
RecogidaDef.campos_def.cons_fechai_csv = RecogidaDef.campos.cons_fechai_csv = "01/01/2000 0:01"; RecogidaDef.campos_def.cons_fechai_csv = RecogidaDef.campos.cons_fechai_csv = "01/01/2000 0:01";
RecogidaDef.campos_def.cons_fechaf_csv = RecogidaDef.campos.cons_fechaf_csv = "01/01/2049 0:00"; RecogidaDef.campos_def.cons_fechaf_csv = RecogidaDef.campos.cons_fechaf_csv = "01/01/2049 0:00";
//Campos de la red navegable que se leen
ComunDef.CamposNW.cons_onew = "ONEWAY";
ComunDef.CamposNW.cons_kph = "KPH";
ComunDef.CamposNW.cons_fow = "FOW";
ComunDef.CamposNW.cons_name = "NAME";
//Atributos de la red navegable que se leen
ComunDef.AtributosNW.atr_TF = "TF";
ComunDef.AtributosNW.atr_FT = "FT";
ComunDef.AtributosNW.atr_N = "N";
ComunDef.AtributosNW.atr_pedes = "14";
//Nombre de simbolos VSM //Nombre de simbolos VSM
RecogidaDef.rellena_simbrec_vsm(); RecogidaDef.rellena_simbrec_vsm();
LimpiezaDef.rellena_simblimp_vsm(); LimpiezaDef.rellena_simblimp_vsm();

3
OliviaAddIn/ProgresoEjec.Designer.cs generated
View File

@ -76,11 +76,12 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "ProgresoEjec"; this.Name = "ProgresoEjec";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "OLIVIA | Progreso de la Ejecución"; this.Text = "OLIVIA | Progreso de la Ejecución";
this.TopMost = true; this.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ProgresoEjec_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ProgresoEjec_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ProgresoEjec_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ProgresoEjec_FormClosed);
this.Load += new System.EventHandler(this.ProgresoEjec_Load);
this.Resize += new System.EventHandler(this.ProgresoEjec_Resize); this.Resize += new System.EventHandler(this.ProgresoEjec_Resize);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

14
OliviaAddIn/ProgresoEjec.cs
View File

@ -699,6 +699,14 @@ namespace OliviaAddIn
} }
espera_process(OliviaDef.GeneralDef.NombOlvTasks); espera_process(OliviaDef.GeneralDef.NombOlvTasks);
e.Cancel = false; e.Cancel = false;
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.ProgrEje_Loc = this.Location;
else
Properties.Settings.Default.ProgrEje_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
Hide(); Hide();
} }
else if (cancela) else if (cancela)
@ -723,6 +731,11 @@ namespace OliviaAddIn
} }
} }
private void ProgresoEjec_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.ProgrEje_Loc;
}
private void button_canc_Click(object sender, EventArgs e) private void button_canc_Click(object sender, EventArgs e)
{ {
cancela = true; cancela = true;
@ -756,5 +769,6 @@ namespace OliviaAddIn
rb.Location = p; rb.Location = p;
button_canc.Location = p; button_canc.Location = p;
} }
} }
} }

4
OliviaAddIn/ProgresoInic.Designer.cs generated
View File

@ -62,9 +62,11 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "ProgresoInic"; this.Name = "ProgresoInic";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "OLIVIA"; this.Text = "OLIVIA";
this.TopMost = true; this.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ProgresoInic_FormClosing);
this.Load += new System.EventHandler(this.ProgresoInic_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

15
OliviaAddIn/ProgresoInic.cs
View File

@ -15,5 +15,20 @@ namespace OliviaAddIn
{ {
InitializeComponent(); InitializeComponent();
} }
private void ProgresoInic_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.ProgrIni_Loc;
}
private void ProgresoInic_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.ProgrIni_Loc = this.Location;
else
Properties.Settings.Default.ProgrIni_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
} }
} }

146
OliviaAddIn/Properties/Settings.Designer.cs generated Normal file
View File

@ -0,0 +1,146 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace OliviaAddIn.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point EditTxtPlant_Loc {
get {
return ((global::System.Drawing.Point)(this["EditTxtPlant_Loc"]));
}
set {
this["EditTxtPlant_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point InicioDlg_Loc {
get {
return ((global::System.Drawing.Point)(this["InicioDlg_Loc"]));
}
set {
this["InicioDlg_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point LimpCampos_Loc {
get {
return ((global::System.Drawing.Point)(this["LimpCampos_Loc"]));
}
set {
this["LimpCampos_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point LimpDlg_Loc {
get {
return ((global::System.Drawing.Point)(this["LimpDlg_Loc"]));
}
set {
this["LimpDlg_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point ListMaq_Loc {
get {
return ((global::System.Drawing.Point)(this["ListMaq_Loc"]));
}
set {
this["ListMaq_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point ListForm_Loc {
get {
return ((global::System.Drawing.Point)(this["ListForm_Loc"]));
}
set {
this["ListForm_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point ProgrEje_Loc {
get {
return ((global::System.Drawing.Point)(this["ProgrEje_Loc"]));
}
set {
this["ProgrEje_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point ProgrIni_Loc {
get {
return ((global::System.Drawing.Point)(this["ProgrIni_Loc"]));
}
set {
this["ProgrIni_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point RecoCampos_Loc {
get {
return ((global::System.Drawing.Point)(this["RecoCampos_Loc"]));
}
set {
this["RecoCampos_Loc"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point RecoDlg_Loc {
get {
return ((global::System.Drawing.Point)(this["RecoDlg_Loc"]));
}
set {
this["RecoDlg_Loc"] = value;
}
}
}
}

36
OliviaAddIn/Properties/Settings.settings Normal file
View File

@ -0,0 +1,36 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="OliviaAddIn.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="EditTxtPlant_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="InicioDlg_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="LimpCampos_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="LimpDlg_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="ListMaq_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="ListForm_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="ProgrEje_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="ProgrIni_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="RecoCampos_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="RecoDlg_Loc" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>
</Setting>
</Settings>
</SettingsFile>

19
OliviaAddIn/RecoCampos.cs
View File

@ -410,6 +410,9 @@ namespace OliviaAddIn
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.ClientSize = new System.Drawing.Size(292, 309); this.ClientSize = new System.Drawing.Size(292, 309);
this.Name = "RecoCampos"; this.Name = "RecoCampos";
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RecoCampos_FormClosing);
this.Load += new System.EventHandler(this.RecoCampos_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@ -419,6 +422,22 @@ namespace OliviaAddIn
base.button_guardar_Click(sender, e); base.button_guardar_Click(sender, e);
} }
private void RecoCampos_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.RecoCampos_Loc = this.Location;
else
Properties.Settings.Default.RecoCampos_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
private void RecoCampos_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.RecoCampos_Loc;
}
} }
} }

60
OliviaAddIn/RecogidaDlg.Designer.cs generated
View File

@ -62,6 +62,9 @@
this.textBox_url = new System.Windows.Forms.TextBox(); this.textBox_url = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.textBox_buff = new System.Windows.Forms.TextBox();
this.label26 = new System.Windows.Forms.Label();
this.label29 = new System.Windows.Forms.Label();
this.label28 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label();
this.label27 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label();
this.label25 = new System.Windows.Forms.Label(); this.label25 = new System.Windows.Forms.Label();
@ -116,9 +119,6 @@
this.bt_planifica = new System.Windows.Forms.Button(); this.bt_planifica = new System.Windows.Forms.Button();
this.groupBox_edits = new System.Windows.Forms.GroupBox(); this.groupBox_edits = new System.Windows.Forms.GroupBox();
this.button_eje = new System.Windows.Forms.Button(); this.button_eje = new System.Windows.Forms.Button();
this.textBox_buff = new System.Windows.Forms.TextBox();
this.label26 = new System.Windows.Forms.Label();
this.label29 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox_tiporeco.SuspendLayout(); this.groupBox_tiporeco.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@ -489,6 +489,31 @@
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "Zonificación"; this.groupBox3.Text = "Zonificación";
// //
// textBox_buff
//
this.textBox_buff.Location = new System.Drawing.Point(532, 83);
this.textBox_buff.Name = "textBox_buff";
this.textBox_buff.Size = new System.Drawing.Size(83, 20);
this.textBox_buff.TabIndex = 37;
//
// label26
//
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(453, 87);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(73, 13);
this.label26.TabIndex = 36;
this.label26.Text = "Buffer de exp.";
//
// label29
//
this.label29.AutoSize = true;
this.label29.Location = new System.Drawing.Point(628, 87);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(15, 13);
this.label29.TabIndex = 35;
this.label29.Text = "m";
//
// label28 // label28
// //
this.label28.Image = global::OliviaAddIn.Properties.Resources.documentinfo; this.label28.Image = global::OliviaAddIn.Properties.Resources.documentinfo;
@ -1074,31 +1099,6 @@
this.button_eje.UseVisualStyleBackColor = true; this.button_eje.UseVisualStyleBackColor = true;
this.button_eje.Click += new System.EventHandler(this.button_eje_Click); this.button_eje.Click += new System.EventHandler(this.button_eje_Click);
// //
// textBox_buff
//
this.textBox_buff.Location = new System.Drawing.Point(532, 83);
this.textBox_buff.Name = "textBox_buff";
this.textBox_buff.Size = new System.Drawing.Size(83, 20);
this.textBox_buff.TabIndex = 37;
//
// label26
//
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(453, 87);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(73, 13);
this.label26.TabIndex = 36;
this.label26.Text = "Buffer de exp.";
//
// label29
//
this.label29.AutoSize = true;
this.label29.Location = new System.Drawing.Point(628, 87);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(15, 13);
this.label29.TabIndex = 35;
this.label29.Text = "m";
//
// RecogidaDlg // RecogidaDlg
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1114,10 +1114,12 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "RecogidaDlg"; this.Name = "RecogidaDlg";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "OLIVIA | Recogida de Residuos"; this.Text = "OLIVIA | Recogida de Residuos";
this.TopMost = true; this.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RecogidaDlg_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.RecogidaDlg_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.RecogidaDlg_FormClosed);
this.Load += new System.EventHandler(this.RecogidaDlg_Load);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox_tiporeco.ResumeLayout(false); this.groupBox_tiporeco.ResumeLayout(false);
this.groupBox_tiporeco.PerformLayout(); this.groupBox_tiporeco.PerformLayout();

16
OliviaAddIn/RecogidaDlg.cs
View File

@ -282,6 +282,7 @@ namespace OliviaAddIn
{ {
OliviaGlob.gdb_reco.carg_otra = RecogidaDef.tipos_carg_str[reco.tipo_carg]; OliviaGlob.gdb_reco.carg_otra = RecogidaDef.tipos_carg_str[reco.tipo_carg];
} }
reco.lateralidad = -1;
if (comboBox_lateralidad.Visible == true) if (comboBox_lateralidad.Visible == true)
{ {
reco.lateralidad = comboBox_lateralidad.SelectedIndex; reco.lateralidad = comboBox_lateralidad.SelectedIndex;
@ -1218,6 +1219,21 @@ namespace OliviaAddIn
} }
} }
private void RecogidaDlg_Load(object sender, EventArgs e)
{
this.Location = Properties.Settings.Default.RecoDlg_Loc;
}
private void RecogidaDlg_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.WindowState == FormWindowState.Normal)
Properties.Settings.Default.RecoDlg_Loc = this.Location;
else
Properties.Settings.Default.RecoDlg_Loc = this.RestoreBounds.Location;
Properties.Settings.Default.Save();
}
/*revisar borrar /*revisar borrar
* private void RecogidaDlg_VisibleChanged(object sender, EventArgs e) * private void RecogidaDlg_VisibleChanged(object sender, EventArgs e)
{ {

21
OliviaAddIn/RecogidaDlg.resx
View File

@ -123,17 +123,16 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bt_capa_zonas.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="bt_capa_zonas.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2 H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
AAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

1
OliviaAddIn/SensCampos.Designer.cs generated
View File

@ -137,7 +137,6 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "SensCampos"; this.Name = "SensCampos";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Sensor"; this.Text = "Sensor";
this.TopMost = true; this.TopMost = true;
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.SensCampos_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.SensCampos_FormClosed);

28
OliviaAddIn/Settings.cs Normal file
View File

@ -0,0 +1,28 @@
namespace OliviaAddIn.Properties {
// This class allows you to handle specific events on the settings class:
// The SettingChanging event is raised before a setting's value is changed.
// The PropertyChanged event is raised after a setting's value is changed.
// The SettingsLoaded event is raised after the setting values are loaded.
// The SettingsSaving event is raised before the setting values are saved.
internal sealed partial class Settings {
public Settings() {
// // To add event handlers for saving and changing settings, uncomment the lines below:
//
// this.SettingChanging += this.SettingChangingEventHandler;
//
// this.SettingsSaving += this.SettingsSavingEventHandler;
//
}
private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
// Add code to handle the SettingChangingEvent event here.
}
private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
// Add code to handle the SettingsSaving event here.
}
}
}

42
OliviaAddIn/app.config Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="OliviaAddIn.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<userSettings>
<OliviaAddIn.Properties.Settings>
<setting name="EditTxtPlant_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="InicioDlg_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="LimpCampos_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="LimpDlg_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="ListMaq_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="ListForm_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="ProgrEje_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="ProgrIni_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="RecoCampos_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="RecoDlg_Loc" serializeAs="String">
<value>0, 0</value>
</setting>
</OliviaAddIn.Properties.Settings>
</userSettings>
</configuration>

42
OliviaDef/OliviaDef.cs
View File

@ -47,8 +47,8 @@ namespace OliviaDef
public const int ProgrMax = 100; public const int ProgrMax = 100;
public const int ProgrStep = 5; public const int ProgrStep = 5;
public const int ParamN = 6; public const int ParamN = 6;
public const int ParamLimpN = 18; public const int ParamLimpN = 37;
public const int ParamRecoN = 31; public const int ParamRecoN = 40;
/* /*
* Define el separador entre parámetros de la llamada al proceso Geofoto * Define el separador entre parámetros de la llamada al proceso Geofoto
*/ */
@ -57,6 +57,7 @@ namespace OliviaDef
public const string EjecGeoParamIgual = ":"; public const string EjecGeoParamIgual = ":";
public const string NombGeofoto = "geofoto"; public const string NombGeofoto = "geofoto";
public const string NombOlvTasks = "OliviaTasks"; public const string NombOlvTasks = "OliviaTasks";
public const string NombColSector = "SECTOR";
/** /**
* Define el nombre del grupo de propiedades generales * Define el nombre del grupo de propiedades generales
*/ */
@ -121,6 +122,10 @@ namespace OliviaDef
* Define el nombre del grupo de parámetros de recogida * Define el nombre del grupo de parámetros de recogida
*/ */
public const string GrupoSimbVsm = "SIMBOL_VSM"; public const string GrupoSimbVsm = "SIMBOL_VSM";
/**
* Define el nombre del grupo de campos de la red navegable
*/
public const string GrupoCampoNW = "CAMPOS_NW";
/** /**
* Define el nombre del grupo de propiedades generales * Define el nombre del grupo de propiedades generales
*/ */
@ -134,11 +139,9 @@ namespace OliviaDef
public const string GG_pt = "path_temp"; public const string GG_pt = "path_temp";
public const string GG_pd = "path_data"; public const string GG_pd = "path_data";
public const string GG_pn = "path_nw"; public const string GG_pn = "path_nw";
public const string GG_prut = "path_rut";
public const string GG_ppts = "path_pts";
public const string GG_psec = "path_sec";
public const string GG_pcar = "path_cart"; public const string GG_pcar = "path_cart";
public const string GG_pcfg = "path_cfgeo"; public const string GG_pcfg = "path_cfgeo";
public const string GG_strtto = "str_tto";
//// ////
public const string GG_tipo = "tipo"; public const string GG_tipo = "tipo";
public const string GG_ip = "ip"; public const string GG_ip = "ip";
@ -231,18 +234,11 @@ namespace OliviaDef
/** /**
* Define los nombres de los campos de limpieza a consultar en la GDB general * Define los nombres de los campos de limpieza a consultar en la GDB general
*/ */
public const string GAA_niv = "cons_niv";
public const string GAA_zon = "cons_zon";
public const string GAA_cap_niv = "cons_cap_niv";
public const string GAA_cap_zon = "cons_cap_zon";
public const string GAA_inst = "cons_instal";
public const string GAA_red = "cons_nw";
public const string GAA_pto_ini = "cons_pto_ini";
public const string GAA_pto_fin = "cons_pto_fin";
public const string GAA_entid = "cons_tip_ent"; public const string GAA_entid = "cons_tip_ent";
public const string GAA_mecan = "cons_mecaniz"; public const string GAA_mecan = "cons_mecaniz";
public const string GAA_sect = "cons_sector"; public const string GAA_obser = "cons_obser";
public const string GAA_amb_muni = "cons_amb_muni"; public const string GAA_anch_tip = "cons_anch_tip";
public const string GAA_tipolo = "cons_tipolo";
/** /**
* Define los nombres de los atributos de limpieza a consultar en la GDB general * Define los nombres de los atributos de limpieza a consultar en la GDB general
*/ */
@ -268,6 +264,8 @@ namespace OliviaDef
public const string GAL_turis = "atr_turis"; public const string GAL_turis = "atr_turis";
public const string GAL_solar = "atr_solar"; public const string GAL_solar = "atr_solar";
public const string GAL_suelo = "atr_suelo"; public const string GAL_suelo = "atr_suelo";
public const string GAL_ap_lin = "atr_ap_lin";
public const string GAL_ap_bat = "atr_ap_bat";
/** /**
* Define los nombres de los filtros de las consultas de limpieza a la GDB general * Define los nombres de los filtros de las consultas de limpieza a la GDB general
*/ */
@ -508,6 +506,20 @@ namespace OliviaDef
public const string GSV_tur = "turistico"; public const string GSV_tur = "turistico";
public const string GSV_sol = "solar"; public const string GSV_sol = "solar";
public const string GSV_sue = "uso_suelo"; public const string GSV_sue = "uso_suelo";
/**
* Define los nombres de los campos de la red navegable que tiene que leer
*/
public const string GTC_onew = "cons_onew";
public const string GTC_kph = "cons_kph";
public const string GTC_fow = "cons_fow";
public const string GTC_name = "cons_name";
/**
* Define los nombres de los atributos de la red navegable que tiene que leer
*/
public const string GTA_TF = "atr_TF";
public const string GTA_FT = "atr_FT";
public const string GTA_N = "atr_N";
public const string GTA_pedes = "atr_pedes";
/** /**
* Define el nombre para mandar a geofoto la configuración * Define el nombre para mandar a geofoto la configuración
*/ */