diff --git a/OliviaAddIn/ClassDiagram2.cd b/OliviaAddIn/ClassDiagram2.cd
new file mode 100644
index 0000000..0519ecb
--- /dev/null
+++ b/OliviaAddIn/ClassDiagram2.cd
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/OliviaAddIn/Comun.cs b/OliviaAddIn/Comun.cs
index 73797ff..a7067c1 100644
--- a/OliviaAddIn/Comun.cs
+++ b/OliviaAddIn/Comun.cs
@@ -95,8 +95,9 @@ namespace OliviaAddIn
*/
public string text_restr = "";
/**
- * Path de la clase de los ámbitos
+ * String con el tipo de tratamiento
*/
+ public string tipo_tto = "";
//*************************************************************************************
//Funciones
diff --git a/OliviaAddIn/ComunDef.cs b/OliviaAddIn/ComunDef.cs
new file mode 100644
index 0000000..cf2c42c
--- /dev/null
+++ b/OliviaAddIn/ComunDef.cs
@@ -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; //
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E
- AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok
- GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0
- wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT
- tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD
- yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i
- 9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2
- 5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg
- fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A
- AAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
+ tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
+ llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
+ 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
+ ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
+ dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
+ cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
+ H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
+ Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
+ du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E
- AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok
- GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0
- wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT
- tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD
- yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i
- 9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2
- 5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg
- fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A
- AAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
+ tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
+ llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
+ 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
+ ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
+ dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
+ cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
+ H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
+ Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
+ du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E
- AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok
- GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0
- wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT
- tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD
- yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i
- 9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2
- 5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg
- fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A
- AAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
+ tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
+ llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
+ 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
+ ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
+ dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
+ cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
+ H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
+ Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
+ du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
diff --git a/OliviaAddIn/ListCapasMaqueta.Designer.cs b/OliviaAddIn/ListCapasMaqueta.Designer.cs
index 43fa24f..e964234 100644
--- a/OliviaAddIn/ListCapasMaqueta.Designer.cs
+++ b/OliviaAddIn/ListCapasMaqueta.Designer.cs
@@ -73,10 +73,11 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "ListCapasMaqueta";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "Capas para maquetar";
this.TopMost = true;
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.ResumeLayout(false);
diff --git a/OliviaAddIn/ListCapasMaqueta.cs b/OliviaAddIn/ListCapasMaqueta.cs
index c3fff8b..4ba2aa1 100644
--- a/OliviaAddIn/ListCapasMaqueta.cs
+++ b/OliviaAddIn/ListCapasMaqueta.cs
@@ -146,6 +146,18 @@ namespace OliviaAddIn
{
if (aceptar == false)
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;
}
}
diff --git a/OliviaAddIn/ListForm.Designer.cs b/OliviaAddIn/ListForm.Designer.cs
index 8cae6b2..280a8bd 100644
--- a/OliviaAddIn/ListForm.Designer.cs
+++ b/OliviaAddIn/ListForm.Designer.cs
@@ -62,8 +62,10 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
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.Load += new System.EventHandler(this.ListForm_Load);
this.ResumeLayout(false);
}
diff --git a/OliviaAddIn/ListForm.cs b/OliviaAddIn/ListForm.cs
index 3ebd596..58d405b 100644
--- a/OliviaAddIn/ListForm.cs
+++ b/OliviaAddIn/ListForm.cs
@@ -74,5 +74,20 @@ namespace OliviaAddIn
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;
+ }
}
}
diff --git a/OliviaAddIn/OliviaAddIn.csproj b/OliviaAddIn/OliviaAddIn.csproj
index 0d01beb..091b41b 100644
--- a/OliviaAddIn/OliviaAddIn.csproj
+++ b/OliviaAddIn/OliviaAddIn.csproj
@@ -148,6 +148,7 @@
+
True
Config.esriaddinx
@@ -229,6 +230,11 @@
True
Resources.resx
+
+ True
+ True
+ Settings.settings
+
Form
@@ -246,6 +252,7 @@
SensCampos.cs
+
@@ -331,8 +338,14 @@
+
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
diff --git a/OliviaAddIn/OliviaGlob.cs b/OliviaAddIn/OliviaGlob.cs
index a1e7c28..8f5415b 100644
--- a/OliviaAddIn/OliviaGlob.cs
+++ b/OliviaAddIn/OliviaGlob.cs
@@ -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.
*/
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
* (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
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_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
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_solar, LimpiezaDef.Atributos.atr_solar);
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
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_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();
return true;
@@ -542,6 +562,9 @@ namespace OliviaAddIn
//para el grupo CAMPOS de LIMPIEZA
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_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
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_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_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
LimpiezaDef.filtro_str[(int)LimpiezaDef.AmbitsTra.AmbEjeCalle] =
@@ -794,6 +819,18 @@ namespace OliviaAddIn
LimpiezaDef.nombre_simblimp_vsm[19] = ini.GetValue(GeneralDef.GrupoSimbVsm, GeneralDef.GSV_tur, LimpiezaDef.nombre_simblimp_vsm[19]);
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]);
+
+ //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.
//En el constructor de DatosGDBLimp hay una función (rellena_ftclass()) que depende de esta (lee_ini_gen()).
@@ -844,6 +881,9 @@ namespace OliviaAddIn
LimpiezaDef.Campos.consulta_entidad = "NOM_TIPO_ENTIDAD";
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_fuent = "Fuentes";
@@ -867,6 +907,8 @@ namespace OliviaAddIn
LimpiezaDef.Atributos.atr_turis = "Puntos_Interes_Turistico";
LimpiezaDef.Atributos.atr_solar = "Solares";
LimpiezaDef.Atributos.atr_suelo = "Uso_Suelos";
+ LimpiezaDef.Atributos.atr_ap_lin = "Linea";
+ LimpiezaDef.Atributos.atr_ap_bat = "Bateria";
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_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
RecogidaDef.rellena_simbrec_vsm();
LimpiezaDef.rellena_simblimp_vsm();
diff --git a/OliviaAddIn/ProgresoEjec.Designer.cs b/OliviaAddIn/ProgresoEjec.Designer.cs
index 866de1b..81f640b 100644
--- a/OliviaAddIn/ProgresoEjec.Designer.cs
+++ b/OliviaAddIn/ProgresoEjec.Designer.cs
@@ -76,11 +76,12 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
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.TopMost = true;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ProgresoEjec_FormClosing);
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.ResumeLayout(false);
this.PerformLayout();
diff --git a/OliviaAddIn/ProgresoEjec.cs b/OliviaAddIn/ProgresoEjec.cs
index 46db8ca..eeed7fc 100644
--- a/OliviaAddIn/ProgresoEjec.cs
+++ b/OliviaAddIn/ProgresoEjec.cs
@@ -699,6 +699,14 @@ namespace OliviaAddIn
}
espera_process(OliviaDef.GeneralDef.NombOlvTasks);
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();
}
else if (cancela)
@@ -722,6 +730,11 @@ namespace OliviaAddIn
e.Cancel = true;
}
}
+
+ private void ProgresoEjec_Load(object sender, EventArgs e)
+ {
+ this.Location = Properties.Settings.Default.ProgrEje_Loc;
+ }
private void button_canc_Click(object sender, EventArgs e)
{
@@ -756,5 +769,6 @@ namespace OliviaAddIn
rb.Location = p;
button_canc.Location = p;
}
+
}
}
diff --git a/OliviaAddIn/ProgresoInic.Designer.cs b/OliviaAddIn/ProgresoInic.Designer.cs
index 5db0f0e..558cc4b 100644
--- a/OliviaAddIn/ProgresoInic.Designer.cs
+++ b/OliviaAddIn/ProgresoInic.Designer.cs
@@ -62,9 +62,11 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "ProgresoInic";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "OLIVIA";
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.PerformLayout();
diff --git a/OliviaAddIn/ProgresoInic.cs b/OliviaAddIn/ProgresoInic.cs
index 1cfefbd..5f0a26f 100644
--- a/OliviaAddIn/ProgresoInic.cs
+++ b/OliviaAddIn/ProgresoInic.cs
@@ -15,5 +15,20 @@ namespace OliviaAddIn
{
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();
+ }
}
}
diff --git a/OliviaAddIn/Properties/Settings.Designer.cs b/OliviaAddIn/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..0342e6b
--- /dev/null
+++ b/OliviaAddIn/Properties/Settings.Designer.cs
@@ -0,0 +1,146 @@
+//------------------------------------------------------------------------------
+//
+// 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.
+//
+//------------------------------------------------------------------------------
+
+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;
+ }
+ }
+ }
+}
diff --git a/OliviaAddIn/Properties/Settings.settings b/OliviaAddIn/Properties/Settings.settings
new file mode 100644
index 0000000..c6193b2
--- /dev/null
+++ b/OliviaAddIn/Properties/Settings.settings
@@ -0,0 +1,36 @@
+
+
+
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+
\ No newline at end of file
diff --git a/OliviaAddIn/RecoCampos.cs b/OliviaAddIn/RecoCampos.cs
index a0edbfe..5bcb1ed 100644
--- a/OliviaAddIn/RecoCampos.cs
+++ b/OliviaAddIn/RecoCampos.cs
@@ -410,6 +410,9 @@ namespace OliviaAddIn
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.ClientSize = new System.Drawing.Size(292, 309);
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);
}
@@ -419,6 +422,22 @@ namespace OliviaAddIn
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;
+
+ }
+
}
}
diff --git a/OliviaAddIn/RecogidaDlg.Designer.cs b/OliviaAddIn/RecogidaDlg.Designer.cs
index f9e78fd..bf9d5f7 100644
--- a/OliviaAddIn/RecogidaDlg.Designer.cs
+++ b/OliviaAddIn/RecogidaDlg.Designer.cs
@@ -62,6 +62,9 @@
this.textBox_url = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
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.label27 = 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.groupBox_edits = new System.Windows.Forms.GroupBox();
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.groupBox_tiporeco.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -489,6 +489,31 @@
this.groupBox3.TabStop = false;
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
//
this.label28.Image = global::OliviaAddIn.Properties.Resources.documentinfo;
@@ -1074,31 +1099,6 @@
this.button_eje.UseVisualStyleBackColor = true;
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1114,10 +1114,12 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "RecogidaDlg";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "OLIVIA | Recogida de Residuos";
this.TopMost = true;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RecogidaDlg_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.RecogidaDlg_FormClosed);
+ this.Load += new System.EventHandler(this.RecogidaDlg_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox_tiporeco.ResumeLayout(false);
this.groupBox_tiporeco.PerformLayout();
diff --git a/OliviaAddIn/RecogidaDlg.cs b/OliviaAddIn/RecogidaDlg.cs
index d26e5dd..b4bb9ab 100644
--- a/OliviaAddIn/RecogidaDlg.cs
+++ b/OliviaAddIn/RecogidaDlg.cs
@@ -282,6 +282,7 @@ namespace OliviaAddIn
{
OliviaGlob.gdb_reco.carg_otra = RecogidaDef.tipos_carg_str[reco.tipo_carg];
}
+ reco.lateralidad = -1;
if (comboBox_lateralidad.Visible == true)
{
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
* private void RecogidaDlg_VisibleChanged(object sender, EventArgs e)
{
diff --git a/OliviaAddIn/RecogidaDlg.resx b/OliviaAddIn/RecogidaDlg.resx
index 11363b4..a5d8b9d 100644
--- a/OliviaAddIn/RecogidaDlg.resx
+++ b/OliviaAddIn/RecogidaDlg.resx
@@ -123,17 +123,16 @@
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAbrQAAG60AXJX/ekAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfZChYNADoI871E
- AAAB00lEQVQ4T5WTPUhbYRiFPydRyCAZpC5C61ZwsZZYROjStQ4OhUxdFbsVBFtQIxUnWxqcSurQodok
- GIyBRkHJD4lRkkL9ixeE0Egh9FZrWwuae4/vuTT1h9yiBw4f3Pd53nzkclUlDofDKccNaZNNG6U1Uts0
- wyaGYSCZTM4J0yK9uOT+mAbXsIbbgxpZM5VKIZPJgGcloVDIOuOJRFgU3uYsruH88UbxCGu7vyzofEzT
- tM5CoWCdzLv0T7QP7aDDo4E/ru6N5E8iuX3MpHULqHYDn8+HQCCAcDgMs/wH89l9xDYP0TGSlwWefPnD
- yje8jZX+4mep3OByyPrFEddaYPhX9H8Lqt3g8jOyAXGsBZ2jmhn5dIBpeXDVkKUjLtTNviU4H0fhdM+i
- 9tE86t0fUWdTzsiQpUNX3eqPnbwIlfBkclXexG9EPx9iwaackSFLh65qfZouD7zfQ9fAMoIZHd5oCZM2
- 5YwMWTp01d1nWeO5/yu6PQlEct/lD9IxFa9ezsiQpUNXdXnWjZdRHb3eVSS2DxDf+oGYTTkjQ5YOXfVg
- fNsMZo/wZvELJoIbeDW79d+SIUuHrurxFvDwdRHdXnbvii1aDl1+Dg3SNumda1Yc1XAKo6KvDnHu2l4A
- AAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAABu
+ tAAAbrQBclf96QAAAAd0SU1FB9kKFg0AOgjzvUQAAAHTSURBVDhPlZM9SFthGIU/J1HIIBmkLkLrVnCx
+ llhE6NK1Dg6FTF0VuxUEW1AjFSdbGpxK6tCh2iQYjIFGQckPiVGSQv2LF4TQSCH0VmtbC5p7j++5NPWH
+ 3KIHDh/c93nefORyVSUOh8Mpxw1pk00bpTVS2zTDJoZhIJlMzgnTIr245P6YBtewhtuDGlkzlUohk8mA
+ ZyWhUMg644lEWBTe5iyu4fzxRvEIa7u/LOh8TNO0zkKhYJ3Mu/RPtA/toMOjgT+u7o3kTyK5fcykdQuo
+ dgOfz4dAIIBwOAyz/Afz2X3ENg/RMZKXBZ58+cPKN7yNlf7iZ6nc4HLI+sUR11pg+Ff0fwuq3eDyM7IB
+ cawFnaOaGfl0gGl5cNWQpSMu1M2+JTgfR+F0z6L20Tzq3R9RZ1POyJClQ1fd6o+dvAiV8GRyVd7Eb0Q/
+ H2LBppyRIUuHrmp9mi4PvN9D18Ayghkd3mgJkzbljAxZOnTV3WdZ47n/K7o9CURy3+UP0jEVr17OyJCl
+ Q1d1edaNl1Edvd5VJLYPEN/6gZhNOSNDlg5d9WB82wxmj/Bm8Qsmght4Nbv135IhS4eu6vEW8PB1Ed1e
+ du+KLVoOXX4ODdI26Z1rVhzVcAqjoq8Oce7aXgAAAABJRU5ErkJggg==
diff --git a/OliviaAddIn/SensCampos.Designer.cs b/OliviaAddIn/SensCampos.Designer.cs
index d1a9cd5..78b8592 100644
--- a/OliviaAddIn/SensCampos.Designer.cs
+++ b/OliviaAddIn/SensCampos.Designer.cs
@@ -137,7 +137,6 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "SensCampos";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Sensor";
this.TopMost = true;
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.SensCampos_FormClosed);
diff --git a/OliviaAddIn/Settings.cs b/OliviaAddIn/Settings.cs
new file mode 100644
index 0000000..ebbb3ff
--- /dev/null
+++ b/OliviaAddIn/Settings.cs
@@ -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.
+ }
+ }
+}
diff --git a/OliviaAddIn/app.config b/OliviaAddIn/app.config
new file mode 100644
index 0000000..6e123dc
--- /dev/null
+++ b/OliviaAddIn/app.config
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+ 0, 0
+
+
+
+
\ No newline at end of file
diff --git a/OliviaDef/OliviaDef.cs b/OliviaDef/OliviaDef.cs
index 20c72e3..490349b 100644
--- a/OliviaDef/OliviaDef.cs
+++ b/OliviaDef/OliviaDef.cs
@@ -47,8 +47,8 @@ namespace OliviaDef
public const int ProgrMax = 100;
public const int ProgrStep = 5;
public const int ParamN = 6;
- public const int ParamLimpN = 18;
- public const int ParamRecoN = 31;
+ public const int ParamLimpN = 37;
+ public const int ParamRecoN = 40;
/*
* 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 NombGeofoto = "geofoto";
public const string NombOlvTasks = "OliviaTasks";
+ public const string NombColSector = "SECTOR";
/**
* Define el nombre del grupo de propiedades generales
*/
@@ -121,6 +122,10 @@ namespace OliviaDef
* Define el nombre del grupo de parámetros de recogida
*/
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
*/
@@ -134,11 +139,9 @@ namespace OliviaDef
public const string GG_pt = "path_temp";
public const string GG_pd = "path_data";
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_pcfg = "path_cfgeo";
+ public const string GG_strtto = "str_tto";
////
public const string GG_tipo = "tipo";
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
*/
- 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_mecan = "cons_mecaniz";
- public const string GAA_sect = "cons_sector";
- public const string GAA_amb_muni = "cons_amb_muni";
+ public const string GAA_obser = "cons_obser";
+ 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
*/
@@ -268,6 +264,8 @@ namespace OliviaDef
public const string GAL_turis = "atr_turis";
public const string GAL_solar = "atr_solar";
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
*/
@@ -508,6 +506,20 @@ namespace OliviaDef
public const string GSV_tur = "turistico";
public const string GSV_sol = "solar";
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
*/