From 28cdbeeab5c7812ce2c16f42d03a9ffd2ef15492 Mon Sep 17 00:00:00 2001
From: Elena <Elena@narvaling.com>
Date: Mon, 4 Jul 2022 15:48:40 +0200
Subject: [PATCH] Algunas modificaciones finales

---
 Config.daml                                   |   4 +-
 Helper/HelperGdb.cs                           |  57 ++++++++++------
 Images/config.png                             | Bin 1123 -> 0 bytes
 Images/config2.png                            | Bin 1082 -> 0 bytes
 Images/help16Pro.png                          | Bin 0 -> 1302 bytes
 Model/Limpieza.cs                             |  43 +++++++++---
 Model/OliviaConf.cs                           |  17 +++++
 Model/OliviaGlob.cs                           |  53 +++++++++++++--
 Model/Recogida.cs                             |   4 +-
 Model/TratamientoComun.cs                     |   4 +-
 OliviaAddInPro.csproj                         |  14 ++--
 Properties/AssemblyInfo.cs                    |   8 +--
 Services/ConfigServ.cs                        |  23 +++++--
 Services/EjecServ.cs                          |  10 ++-
 Services/FinProcServ.cs                       |  31 ++++++---
 Services/LimpiezaServ.cs                      |  31 ++-------
 Services/RecogidaServ.cs                      |   2 +
 .../PropertyGridFilePickerFolder.xaml         |  14 ++++
 .../PropertyGridFilePickerFolder.xaml.cs      |  63 ++++++++++++++++++
 View/Limpieza/PaneLimpieza.xaml               |  21 ++++--
 View/Limpieza/PaneLimpieza.xaml.cs            |   6 ++
 View/Recogida/PaneRecogida.xaml               |  21 ++++--
 View/Recogida/PaneRecogida.xaml.cs            |   9 ++-
 23 files changed, 325 insertions(+), 110 deletions(-)
 delete mode 100644 Images/config.png
 delete mode 100644 Images/config2.png
 create mode 100644 Images/help16Pro.png
 create mode 100644 View/Configuracion/PropertyGridFilePickerFolder.xaml
 create mode 100644 View/Configuracion/PropertyGridFilePickerFolder.xaml.cs

diff --git a/Config.daml b/Config.daml
index 882f6e4..69da287 100644
--- a/Config.daml
+++ b/Config.daml
@@ -1,11 +1,11 @@
 <ArcGIS defaultAssembly="OliviaAddInPro.dll" defaultNamespace="OliviaAddInPro" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
-  <AddInInfo id="{10742570-cf59-42f2-bea2-2a38002a06ee}" version="1.0" desktopVersion="2.8.29751">
+  <AddInInfo id="{10742570-cf59-42f2-bea2-2a38002a06ee}" version="3.0" desktopVersion="2.8.29751">
     <Name>OliviaAddInPro</Name>
     <Description>AddIn de Optimización de la Limpieza Viaria para ArcGIs Pro</Description>
     <Image>Images\AddinDesktop32.png</Image>
     <Author>VSM</Author>
     <Company>VSM - Narvaling</Company>
-    <Date>08/07/2021 12:28:02, 2021</Date>
+    <Date>08/07/2022 12:00:00, 2022</Date>
     <Subject>Framework</Subject>
     <!-- Note subject can be one or more of these topics:
                     Content, Framework, Editing, Geodatabase, Geometry, Geoprocessing, Layouts, Map Authoring, Map Exploration -->
diff --git a/Helper/HelperGdb.cs b/Helper/HelperGdb.cs
index 94676b4..989b35d 100644
--- a/Helper/HelperGdb.cs
+++ b/Helper/HelperGdb.cs
@@ -2043,31 +2043,44 @@ namespace OliviaAddInPro.Helper
                     return res;
                 }
                 //comprueba si extiste ya el dataset
-                var task1 = CheckDataset(gdb, datasetName);
-                task1.Wait();
-                if (task1.Result)
-                {
-                    //comprueba si tiene la misma referencia espacial       
-                    var r = CheckSpatRefDataset(gdb, datasetName, spatref).Result;
-                    if (r==0)
+                bool repite = false;
+                bool crea = false;
+                int idat = 1;
+                int r = 2;
+                while(r==2)
+                {                
+                    var task1 = CheckDataset(gdb, datasetName);
+                    task1.Wait();
+                    if (task1.Result)
                     {
-                        res.Value = 0; //no hay nada que crear, existe y coincide la spatial ref                        
-                        return res;
-                    }
-                    else if(r==2)
-                    {
-                        //crea un nuevo dataset y avisa                        
-                        datasetName = datasetName + "_1";
-                        datasetNameOut = datasetName;
+                        //comprueba si tiene la misma referencia espacial       
+                        r = CheckSpatRefDataset(gdb, datasetName, spatref).Result;
+                        if (r == 0)
+                        {
+                            res.Value = 0; //no hay nada que crear, existe y coincide la spatial ref                        
+                            //return res;
+                        }
+                        else if (r == 2)
+                        {
+                            //existe ese nombre, pero con otra ref espacial
+                            //crea un nuevo dataset y avisa                        
+                            datasetName = string.Format("{0}_{1}",datasetName,idat);
+                            datasetNameOut = datasetName;
+                            idat++;
+                        }
+                        else//r==1
+                        {
+                            //ha dado error al comprobar
+                            res.Value = 1;
+                            res.Error.Add("Errores al crear el Dataset " + datasetName);
+                            //return res;
+                        }
                     }
                     else
-                    {
-                        //ha dado error al comprobar
-                        res.Value = 1;
-                        res.Error.Add("Errores al crear el Dataset " + datasetName);
-                        return res;
-                    }
-                }
+                        r = 3; //no existe, lo crea con ese nombre
+                };
+                if (r!=3)
+                    return res;
                 //no existe, lo crea
                 var task = ArcGIS.Desktop.Framework.Threading.Tasks.QueuedTask.Run((Func<Respuesta<bool>>)(() =>
                 {
diff --git a/Images/config.png b/Images/config.png
deleted file mode 100644
index e635bcddad46658b1e455294d4a521c2a8065070..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1123
zcmV-p1f2VcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1Mo>i
zK~#9!#8=Nx6HyR;+g1Xxhn9ma7@?vdKLV^lg6M&28c~8u^lZRCKvSZLNAa#{qkjNx
zJZnUWNeu>25fw>_CV~f4g3{Il?Ex+b#`%_Av-|qCU1}32*%aQJH*a?4o0)GVR)Ac&
zIyh8b?!H-4Qlk97v9ZBcSJSud-3<-x)Ru!4CSC3AZOrTODE}l=DHe;3broXBR-gla
zFX#U*N(3mx1N75RPn5zM5vaH<uI0656CI%Z4qv>`=f^MdEwC$FSyQp1w>7})*hQCj
zp9-+DvNCq4u9mH@t@~^1>V5Ctz8Rr?xuc`=hS%#kdhkGv!B8solQlIpyJ$Z}x=GR<
zCY@j)aFPM6`+e1HWhK$q(jqU>eq1{zaSn{bTc>lk!T8+VM;4#^kfC)~Lqolib8^(6
zLsg)FaejV*t*xzR<kl8fYiqMXht}DHhmR&G6(`Iv5FMYG^q=kRF)YH6$GgXs3v6%*
zPa`=<jtF(hwsMDQ3J@9!k%X{URqZnzb~>GwkuB1lnwn-mRubqHVN(ZGCnk_{iAgf$
zniWHk!cX%H5xRUZCkS;;j8yw-g5*HyPTpK3zy-a1hA!{iNgt2_IJ2CqZ=|$f2vCmP
z^Ptn36l}pJIT5$oiu-|fkvtiF$|@=<*!62c=5}vaLOPvhBacUwJs!Xi*qWJ{MKj8B
zKvEk`m#&-1K=biqomr)ZH~+P{$p-o_37v~X@3UPFM^+?IqEoM@m0#6~jJh@Hz*N%@
zmRy3c<IT<F{JCCs`%XB^0lbJVGO~sZii+Qc{8_mi`NpG#T_o7kaA9Sb;cgrI&tike
z2uD7Fw|D?JGr^ulQmm9G?sgC`!bB!yJqXc&+K;qlfe@tzw3~qtdyRtX0r+O#&$47P
z#e*;|ne>4W0W&Bvrj;Q8$CqIukr0+4z)OG&i#nlMABfUa6FPtkP>w*m-M$T>t*zh6
zn~N@oU_$akNH~tUD5Sf)1FnCeTUz)jYG}p6^0Av-K1}mGi*ytsAT~7EN@=zzq$aNe
z=!{@8XimivfSN|UOjB0Ew9QA!LZDHivavcDMY`Y@%gf*WJS8(YKzuILbLO;<uVsJ^
zBXx1{OQ~|mZdXFf=lbinCHCUwD+1l;48qRyiM^GT0Hli?h?=otP%=Y11(P8@2r}U&
zPInmPgqr3BYuJMhba4h}^{w10C0hb}g}1S1V;YSbRQHqg#EAV45lFKr7f1(mG*W|{
zBkZs>_Iw;sy3BtYWX%F7KoRU!Js|onh+A31S<Y6(QX^6oBRO!EvACAkR>9LyKftUE
pvtoZ8$3Z6apXVlN$t!;Z7yz&z5RKOu&1V1r002ovPDHLkV1jG?{h0s&

diff --git a/Images/config2.png b/Images/config2.png
deleted file mode 100644
index de7e0b2587c504224d22a09dbe63e511a977d511..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1082
zcmV-A1jYM_P)<h;3K|Lk000e1NJLTq001Ze001Be1^@s6V68d;00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM
zkN^M!z)3_wRCwCVmrZLMR}_XH2@5-e8`P4T+KsUS*%j4tvgxKE8Ip7%iUb0oRW+OJ
zq>g@p<6kgB`T<f_#^53?1ch!S2q91ins!J-x~Z(Xfq;X@UN|i^br-#3Ci2|*kP_%w
zNpt7pxo6J%o->j2^K+aLi9`q*m1->oq=C50@&Fh$8~TV4afv4^V5M4109!y#0tR3K
zhWNeRZ0Lh&0p~(wD=xq^$teTiA<%6$bc=Tsb0OgRKuVG=wb{_S0q#=<z7b_%N8an&
zpc&kfzyY-V;3OLy2{^;++Gs$))Rb#>v?k6Q02_XAfkYydI`p`Q1>BI;oe<S;jzinc
zhW=nCk%*h-fHe<M*bxVGK$WbgCriS|Ax56BxKgd<M8@<0Z~(RYch_oWuU?j{Cno-X
z>mi_FkQ(er{H+aq2;2Z_VyEi;yK4g>fR@>-YZCi$Mp<O)LO_*jttINz3ZmkX%dQ8_
zhORnlt`5}AUOgdpZEr|7dvz<B)h=G+=j-e7U!FbV?Ci{062nThrV2CfI0W=CNCs;z
zBFK9PWU`gD%w9bOu(P`tUtC<=T3%UktJ{tcPikW0-hjf>R7W;5GKD6yngwKBAp7It
z54l?#>wO@#y1L5J(vn{-=iQzYnPph8Lu9P)tlj9`JlAi3&8wp~JRSaLcYholSo{0?
z)<g-tW!N(h3m%YZ0f_|C05YXw!4lpYcbj(J8z8`e+3y_f|CGA~c`IwpU;TJvVPU~{
z^qP8_@r#|^y;f}Lv)t9c|K#N5i;Ls`oc+c4$M5hM&1P$L0l;iUrWHkDGyNs6e*T^}
zM=#wJpGjslBTNRPGiEIz>Mjj%dV0#E$4^*U|BCq!uDMxD-?pHj5uE|f9wOd);PLSZ
zL-RS;Zhp~q=?tMEqf^3_CvC+U<MHo<k3PMbcQJh@Wa7O5?(FVqqHoHI-mp85XnAc3
zWXJ5)<L?x3XLqk9rW~)?FjFcPtcliXNCw@$A7mgEJCzy$&Ir<JoEcAMwT-D&JgHQV
zP~G6ft2R6a+LYO=x2Af<B6C9^6^q4C6vYe9^TR2b)w;m8WVtMZ^vhrwh%1W1y*r!S
zyR*si@+X%D*;2944pPI(to8utdO()L0>%Lp<qEM_41l%O>(2FVsaQ}$8i6Vijs5i(
z3eW;LJbcY~e8A!1Yo5RO)oCYT;p`bwbsO*9j`;yzbc3fugGY~_aD03svy(88hQ!3x
zP=KXkVdOF~4`zXLK(-y3907SDByS)5zs0`;0Jlb+ZWW;g6951J07*qoM6N<$f>YA+
AqyPW_

diff --git a/Images/help16Pro.png b/Images/help16Pro.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebf35600672a424ff02b2bc3165fb7c97923d80f
GIT binary patch
literal 1302
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUS}H#V;r8ce_d)2~P@&^OdG0C@?f(AO8g(%f9Q>f(~1RD^r68eAMwS&*t9
zlv<o$T9gcoxHM&uRRvbgMX8A;`9&f5`8lvq49LhY$uG{xFHmp}HdD~>O-#<r0|{t?
zb@=*PdFB<DB<3Zjdb-#u0nO0M%uKOzG&6E?v@|j?Hg&TwG;}p~G<I`zv#@kAv9NS?
zH8M1Y>2=9ZF3nBND}m`vLFhHbsTY(OatnYqyQCInmZhe+73JqDfIV%MiQ6qkIL(9V
zO~LIJW1M>RfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;u-&emEoER}?C^AP45_%4
zl;Xhr@N}LU!^#SUGKa}l3`e-b-B#*5h^4q(TEVd7nl^W_)D5jqh8f+(i(l;f^-25i
z!{75I-tGHa$9RI5Md}Mf9z)3IN_*Wz#%R~N4Q=oD|2Mo-{eAAko6F;QyqxCnoH`_v
z@bU0>d!w9P-@Y+V$mB3;Va+;Nm2$TH{=bBXif^np1UM@AO&TUE9(J0<xXO(o<3!a2
z#WM=_%&NvsrLGUo%`JQ+dHDJKddWLiSR@a9Jt}dp_V?j}&tJ{i6!pZ|H0{dRDjoS2
zysq=`s7$p<VPcgyasI@Ezu)Z>ZiR+UaGWriHBCE4hGjw3BgeP`2mTFt`Klsz8afUP
zDH1#mUo8v_1sKxj)ui1heQkT;We$&;(H@N=1?HI?nQ@gLO(TliT1DDyPIy=FGGwwb
z+Up9k`Gvjla$Lmj(8(g-u$1vj3+p9ruBojDMA`%=++Y%xYzR{I&==OoZJwmA(Ymnt
z(%SC_B!WM?7ffP%*;=V1FvZ5P(Tzhv^{K<FR5h<n#tsdP3{!4yoDzJ-`y;5N@^tlc
JS?83{1OT?oyej|z

literal 0
HcmV?d00001

diff --git a/Model/Limpieza.cs b/Model/Limpieza.cs
index 2e704e2..33fcd62 100644
--- a/Model/Limpieza.cs
+++ b/Model/Limpieza.cs
@@ -148,18 +148,39 @@ namespace OliviaAddInPro.Model
 
         }
         /**
-         * Restaura el nombre original del campo si se ha truncado a 10 car al exportar a shp
-         */
-        public override string[] GetCamposRestaura()
+         * Devuelve los campos característicos de la capa
+         */ 
+        public override string[] GetCampos(string capa=null)
         {
-            string[] camps = {
-            LimpiezaDef.Campos.consulta_entidad,
-            LimpiezaDef.Campos.consulta_mecan,
-            LimpiezaDef.Campos.consulta_observ,
-            LimpiezaDef.Campos.consulta_anch_tip,
-            LimpiezaDef.Campos.consulta_tipolo,
-            /*LimpiezaDef.Campos.consulta_sector,
-            LimpiezaDef.Campos.consulta_secuen */};
+            string[] camps=null;
+            var capa_ = !string.IsNullOrEmpty(capa) ? capa : CapaElems;
+            if (string.IsNullOrEmpty(capa_))
+            {
+                ErrStr = "Error al comprobar campos en la capa.";
+                return camps;
+            }
+            GeometryType tipo = HelperGdb.GetGeomType(capa_);
+            if (tipo == GeometryType.Polyline)
+            {
+                int NCAMPS = 5;
+                camps = new string[NCAMPS];
+                camps[0] = LimpiezaDef.Campos.consulta_entidad;
+                camps[1] = LimpiezaDef.Campos.consulta_mecan;
+                camps[2] = LimpiezaDef.Campos.consulta_observ;
+                camps[3] = LimpiezaDef.Campos.consulta_anch_tip;
+                camps[4] = LimpiezaDef.Campos.consulta_tipolo;
+            }
+            else if (tipo == GeometryType.Point)//es mobiliario, con el tipo vale
+            {
+                int NCAMPS = 1;
+                camps = new string[NCAMPS];
+                camps[0] = LimpiezaDef.Campos.consulta_entidad;
+            }
+            else
+            {
+                ErrStr = "Error al comprobar campos en la capa.";
+            }
+            
             return camps;
         }
     }
diff --git a/Model/OliviaConf.cs b/Model/OliviaConf.cs
index 4a2ff06..8138962 100644
--- a/Model/OliviaConf.cs
+++ b/Model/OliviaConf.cs
@@ -99,6 +99,9 @@ namespace OliviaAddInPro.Model
         [Browsable(false)]
         public string path_exe { get; set; }
 
+        [Browsable(false)]
+        public string path_manual { get; set; }
+
         [Browsable(false)]
         public string path_temp { get; set; }
 
@@ -234,6 +237,20 @@ namespace OliviaAddInPro.Model
         [DisplayName("Campo Secuencia")]
         [Description("Nombre del campo Secuencia donde se indica el orden en que se trata el ámbito dentro de su sector")]
         public string consulta_secuen { get; set; }
+
+        [Category("General")]
+        [PropertyOrder(5)]
+        [DisplayName("GDB para Importación")]
+        [Description("Gdb en la que se importarán los resultados de la ejecución")]
+        [Editor(typeof(PropertyGridFilePickerGDB), typeof(PropertyGridFilePickerGDB))]
+        public string Path_Gdb_Import { get; set; }
+
+        [Category("General")]
+        [PropertyOrder(5)]
+        [DisplayName("Carpeta para listados (CSV)")]
+        [Description("Carpeta en la que se guardarán los listados en CSV de la planificación")]
+        [Editor(typeof(PropertyGridFilePickerFolder), typeof(PropertyGridFilePickerFolder))]
+        public string Path_Guarda_Csv { get; set; }
         #endregion
 
         #region 02CamposLimp
diff --git a/Model/OliviaGlob.cs b/Model/OliviaGlob.cs
index 8e491f3..f22bfda 100644
--- a/Model/OliviaGlob.cs
+++ b/Model/OliviaGlob.cs
@@ -12,6 +12,7 @@ using OliviaAddInPro.Helper;
 using System.Net;
 using System.Net.Sockets;
 using System.IO;
+using System.Diagnostics;
 
 namespace OliviaAddInPro.Model
 {
@@ -45,6 +46,7 @@ namespace OliviaAddInPro.Model
             public static string PathWork;          //<Path del directorio de trabajo
             public static string PathCfg;           //<Path de la configuración general
             public static string PathExeOlivia;      //<Path del ejecutable de OliviaTask
+            public static string PathManualOlivia;  //<Path del Manual de Olivia
             public static string PathTemp;          //<Path temporal de generación de archivos intermedios
             public static string DirData;           //<Dir donde están los shapefiles data y nw
             public static string PathData;          //<Path del shp con datos a planificar, ya filtrados e intersecados con las zonas y niveles
@@ -55,6 +57,10 @@ namespace OliviaAddInPro.Model
             public static string PathGdbNw;         //<Path de la gdb referente a la red de carreteras de TOMTOM
             public static string PathSimbVSM;       //<Path de la galeria de estilos aplicada por VSM
             public static string PathSimbESRI;       //<Path de la galeria de estilos de ESRI
+
+            //paths import
+            public static string PathGdbImport;        //<Path de la gdb en la que se guardan los resultados
+            public static string PathGuardCsv;         //<Path para guardar CSV de la planificación
         };
         public struct Conexion
         {
@@ -228,8 +234,6 @@ namespace OliviaAddInPro.Model
                     DockpaneRecogidaViewModel.Show();
                     //SetFlagTipEjec(TiposEjecucion.Reco);
                     ViewSetFlagTipEjec(TiposEjecucion.Reco);
-
-
                 }
                 else
                 {
@@ -243,8 +247,6 @@ namespace OliviaAddInPro.Model
                     DockpaneConfigViewModel.Show();
                     SetFlagTipEjec(TiposEjecucion.Props);
                     ViewSetFlagTipEjec(TiposEjecucion.Props);
-
-
                 }
                 else
                 {
@@ -278,6 +280,22 @@ namespace OliviaAddInPro.Model
             camps[3] = ComunDef.CamposNW.cons_fow;
             return HelperGdb.CheckFileds(OliviaGlob.Paths.PathGdbNw, camps) == 0;
         }
+
+        /**
+         * Comprueba que no es null y existe
+         */
+         public static bool CompruebaExistePath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return false;
+
+            var dir = Path.GetDirectoryName(path);
+            if (string.IsNullOrEmpty(dir) || !Directory.Exists(path))
+                return false;
+
+            return true;
+        }        
+
         /**
          * Devuelve una lista de las ips locales
          */
@@ -362,20 +380,45 @@ namespace OliviaAddInPro.Model
             }
         }
 
+        /**
+         * Abre el pdf del manual de ayuda
+         */
+         public static void OpenManual()
+        {
+            string[] archivos = null;
+
+            try
+            {
+                if (!File.Exists(OliviaGlob.Paths.PathManualOlivia))
+                    HelperGlobal.ponMsg("No se encuentra el archivo " + OliviaGlob.Paths.PathManualOlivia);
+                else
+                {
+                    System.Diagnostics.Process.Start(OliviaGlob.Paths.PathManualOlivia);
+                }
+            }
+            catch (Exception)
+            {
+                HelperGlobal.ponMsg("Error al abrir el manual de ayuda " + OliviaGlob.Paths.PathManualOlivia);
+                return;
+            }
+        }
         /**
          * Inicializa los nombres por defecto de las variables, para debug por si no hay instalador
          */
         public static void IniDefault()
         {
-
             var c = ConfigServ.Serv.Leer();
             Paths.PathCfg = "";
             Paths.PathWork = c.path_work;
             Paths.PathExeOlivia = c.path_exe;
+            Paths.PathManualOlivia = c.path_manual;
             Paths.DirData = c.path_data;
             Paths.PathTemp = c.path_temp;
             c.PathCartela = c.PathCartela;
 
+            Paths.PathGdbImport = c.Path_Gdb_Import;
+            Paths.PathGuardCsv = c.Path_Guarda_Csv;
+
             HelperGlobal.create_folder(Paths.DirData);
             HelperGlobal.create_folder(Paths.PathTemp);
 
diff --git a/Model/Recogida.cs b/Model/Recogida.cs
index bfee6f4..a34fe8b 100644
--- a/Model/Recogida.cs
+++ b/Model/Recogida.cs
@@ -157,9 +157,9 @@ namespace OliviaAddInPro.Model
         }
 
         /**
-         * Restaura el nombre original del campo si se ha truncado a 10 car al exportar a shp
+         * Devuelve los campos característicos de la capa
          */
-        public override string[] GetCamposRestaura()
+        public override string[] GetCampos(string capa=null)
         {
             string[] camps = {
             RecogidaDef.campos_def.cons_id,
diff --git a/Model/TratamientoComun.cs b/Model/TratamientoComun.cs
index f9d8308..55377b5 100644
--- a/Model/TratamientoComun.cs
+++ b/Model/TratamientoComun.cs
@@ -197,7 +197,7 @@ namespace OliviaAddInPro.Model
         /**
          * Restaura el nombre original del campo si se ha truncado a 10 car al exportar a shp
          */
-        public virtual string[] GetCamposRestaura()
+        public virtual string[] GetCampos(string capa=null)
         {
             return null;
         }
@@ -213,7 +213,7 @@ namespace OliviaAddInPro.Model
             if (fc == null)
                 return resp;
             ////////////////////////////////////////////////////////
-            string[] camps = GetCamposRestaura();
+            string[] camps = GetCampos();
 
             ObservableCollection<string> fields = HelperGdb.GetFieldsSync(fc);
             HelperGdb.Free(fc);
diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj
index e8f1d77..7897709 100644
--- a/OliviaAddInPro.csproj
+++ b/OliviaAddInPro.csproj
@@ -173,6 +173,9 @@
     <Compile Include="View\Comun\MarchandoUnaDe.xaml.cs">
       <DependentUpon>MarchandoUnaDe.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Configuracion\PropertyGridFilePickerFolder.xaml.cs">
+      <DependentUpon>PropertyGridFilePickerFolder.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Configuracion\PropertyGridFilePickerLine.xaml.cs">
       <DependentUpon>PropertyGridFilePickerLine.xaml</DependentUpon>
     </Compile>
@@ -250,6 +253,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Configuracion\PropertyGridFilePickerFolder.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\Configuracion\PropertyGridFilePickerLine.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -323,9 +330,6 @@
       <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <AddInContent Include="Images\config.png" />
-  </ItemGroup>
   <ItemGroup>
     <AddInContent Include="DarkImages\GenericButtonGreen16.png" />
   </ItemGroup>
@@ -351,7 +355,6 @@
     <Resource Include="Images\openfolder.png" />
   </ItemGroup>
   <ItemGroup>
-    <AddInContent Include="Images\config2.png" />
     <AddInContent Include="Images\reco2.png" />
   </ItemGroup>
   <ItemGroup>
@@ -360,6 +363,9 @@
   <ItemGroup>
     <AddInContent Include="Images\config2_olv.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\help16Pro.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!--
   PackageAction can be:
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 6e7f78b..3fec284 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("OliviaAddInPro")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Acme")]
+[assembly: AssemblyCompany("VSM - Narvaling")]
 [assembly: AssemblyProduct("OliviaAddInPro")]
-[assembly: AssemblyCopyright("Copyright © Acme 2021")]
+[assembly: AssemblyCopyright("Copyright © VSM 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
diff --git a/Services/ConfigServ.cs b/Services/ConfigServ.cs
index 0344598..5c440e8 100644
--- a/Services/ConfigServ.cs
+++ b/Services/ConfigServ.cs
@@ -15,7 +15,9 @@ namespace OliviaAddInPro.Services
         private static string pathConfigDef = "C:\\Olivia\\olv.conf";
         private static ConfigServ configServ=null;
         private static string nameDirWork = "%dir_work%";
-        public const string OlvRegKey = "SOFTWARE\\Narvaling\\Olivia";
+        public const string OlvRegKey = "SOFTWARE\\Narvaling\\Olivia_3_0";
+        public const string OlvRegName = "workdir";
+        public const string OlvConfigName = "olv.conf";
 
         public static ConfigServ Serv
         {
@@ -28,10 +30,12 @@ namespace OliviaAddInPro.Services
 
         public OliviaConf Leer()
         {
-            OliviaConf res = null;
+            OliviaConf res = Default();
             try
             {
-                res= JsonConvert.DeserializeObject<OliviaConf>(File.ReadAllText(GetPathConfig()));
+                var path_cfg = GetPathConfig();
+                path_cfg = Path.Combine(path_cfg, OlvConfigName);
+                res = JsonConvert.DeserializeObject<OliviaConf>(File.ReadAllText(path_cfg));
             }catch(Exception e)
             {
                 var ee = e;
@@ -49,6 +53,7 @@ namespace OliviaAddInPro.Services
 
 
             res.path_exe = pon_path_absoluto(res.path_exe, res.path_work);
+            res.path_manual = pon_path_absoluto(res.path_manual, res.path_work);
             res.path_temp = pon_path_absoluto(res.path_temp, res.path_work);
             res.path_data = pon_path_absoluto(res.path_data, res.path_work);
             return res;
@@ -57,6 +62,7 @@ namespace OliviaAddInPro.Services
         public void Guardar(OliviaConf conf)
         {
             conf.path_exe = pon_path_relativo(conf.path_exe, conf.path_work);
+            conf.path_manual = pon_path_relativo(conf.path_manual, conf.path_work);
             conf.path_temp = pon_path_relativo(conf.path_temp, conf.path_work);
             conf.path_data = pon_path_relativo(conf.path_data, conf.path_work);
 
@@ -67,10 +73,13 @@ namespace OliviaAddInPro.Services
             conf.Path_Eje_via = pon_path_relativo(conf.Path_Eje_via, conf.path_work);
 
             string  jsonString = JsonConvert.SerializeObject(conf);
-            File.WriteAllText(GetPathConfig(), jsonString);
+            var path_cfg = GetPathConfig();
+            path_cfg = Path.Combine(path_cfg, OlvConfigName);
+            File.WriteAllText(path_cfg, jsonString);
 
             conf.path_exe = pon_path_absoluto(conf.path_exe, conf.path_work);
             conf.path_temp = pon_path_absoluto(conf.path_temp, conf.path_work);
+            conf.path_manual = pon_path_absoluto(conf.path_manual, conf.path_work);
             conf.path_data = pon_path_absoluto(conf.path_data, conf.path_work);
             conf.PathGdbGen = pon_path_absoluto(conf.PathGdbGen, conf.path_work);
             conf.PathSimbVSM = pon_path_absoluto(conf.PathSimbVSM, conf.path_work);
@@ -109,7 +118,7 @@ namespace OliviaAddInPro.Services
             str = null;
             if (rkprg.ValueCount > 0)
             {
-                str = (String)rkprg.GetValue("path_cfg");
+                str = (String)rkprg.GetValue(OlvRegName);
                 if (!string.IsNullOrEmpty(str))
                     return str;
             }
@@ -125,6 +134,7 @@ namespace OliviaAddInPro.Services
                 var path = GetPathConfig();
                 if(!string.IsNullOrEmpty(path))
                 {
+                    path = Path.Combine(path, OlvConfigName);
                     c.path_work = Path.GetDirectoryName(path) + "\\";
                 }
 
@@ -148,9 +158,12 @@ namespace OliviaAddInPro.Services
             c.buffer_export = 1000;
             
             c.path_exe=@"%dir_work%bin\OliviaTasks.exe";
+            c.path_manual= @"%dir_work%Manual_Olivia_3_0.pdf";
             c.path_temp = @"%dir_work%temp\";
             c.path_data=@"%dir_work%data\";
             c.Path_Eje_via = @"%dir_work%Datos\gdbs\TomTom_Q4_2015.gdb\TomTom_Q4_2015___nw";
+            c.Path_Gdb_Import = "";
+            c.Path_Guarda_Csv = "";
             /*c.eje_via = "TomTom_Q4_2015___nw";
             c.municipios = "TomTom_Q4_2015___a8";*/
 
diff --git a/Services/EjecServ.cs b/Services/EjecServ.cs
index a201535..afc757c 100644
--- a/Services/EjecServ.cs
+++ b/Services/EjecServ.cs
@@ -692,7 +692,13 @@ namespace OliviaAddInPro.Services
             string datasetNameOut = string.Empty;
             var resp = HelperGdb.CreateDataset(GdbFileName, tratamiento, spatRefData, out datasetNameOut);
             string err_spatref = "Atención, no coincide la proyección de las FeatureClass del Dataset ya creado con la del FeatureClass a importar";
-            if (resp.Value == 1)
+            if(resp.Value==0)
+            {
+                //avisa
+                HelperGlobal.ponMsg("Se importan los archivos en "+ GdbFileName+"\\"+ datasetNameOut);
+                tratamiento = datasetNameOut;
+            }
+            else if (resp.Value == 1)
             {
                 res.Error.Add("Error al crear el Dataset para importar " + tratamiento);
                 return res;
@@ -790,7 +796,7 @@ namespace OliviaAddInPro.Services
                 resp2 = com.RestauraNomCampos(GdbFileName + "\\" + dataset + "\\" + noms_gdb[0]);
                 if (!resp2.Value)
                 {
-                    err_st = "Error al renombrar campos " + noms_gdb[i];
+                    err_st = "Error al renombrar campos " + noms_gdb[0];
                     if (resp2.HasError)
                         err_st += " " + resp2.Error.First();
                     res.Error.Add("Errores en la importación: " + err_st);
diff --git a/Services/FinProcServ.cs b/Services/FinProcServ.cs
index df55d46..0c97039 100644
--- a/Services/FinProcServ.cs
+++ b/Services/FinProcServ.cs
@@ -212,7 +212,11 @@ namespace OliviaAddInPro.Services
                     out auxi, out nombre);
 
             //string Path = HelperGdb.SaveFileDlg(Title, DirData, inst.ServCom.EXT_CSV, Filter);            
-            string Path = HelperGdb.SaveFileDlg(Title, DirData, null, ArcGIS.Desktop.Catalog.ItemFilters.folders);
+            string Path = string.Empty;
+            if (OliviaGlob.CompruebaExistePath(OliviaGlob.Paths.PathGuardCsv))
+                Path = OliviaGlob.Paths.PathGuardCsv;
+            else
+                Path = HelperGdb.SaveFileDlg(Title, DirData, null, ArcGIS.Desktop.Catalog.ItemFilters.folders);
 
             if (string.IsNullOrEmpty(Path) || Path.Length == 0)
             {
@@ -237,19 +241,24 @@ namespace OliviaAddInPro.Services
         public Respuesta<string> IniImport()
         {
             var res = new Respuesta<string>() { Value = string.Empty };
-            //Lanza ventana para elegir gdb a la que importar resultados
-            bool sal = true;
+            //Lanza ventana para elegir gdb a la que importar resultados            
             string GdbFileName="";
-            do
+            if (OliviaGlob.CompruebaExistePath(OliviaGlob.Paths.PathGdbImport))
+                GdbFileName = OliviaGlob.Paths.PathGdbImport;
+            else
             {
-                sal = true;
-                //repite por si se ha equivocado hasta que elige la gdb
-                GdbFileName = HelperGdb.OpenFileDialog(HelperGdb.TiposOpenFileDlg.OpenGdb,"", "Seleccionar GDB a la que importar los resultados");
-                if(string.IsNullOrEmpty(GdbFileName))
-                    sal= HelperGlobal.ponMsg("¿Desea cancelar el proceso de importación?",
-                     MessageBoxImage.Question, "OLIVIA", MessageBoxButton.YesNo);
-            } while (!sal);
+                bool sal = true;               
+                do
+                {
+                    sal = true;
+                    //repite por si se ha equivocado hasta que elige la gdb
+                    GdbFileName = HelperGdb.OpenFileDialog(HelperGdb.TiposOpenFileDlg.OpenGdb, "", "Seleccionar GDB a la que importar los resultados");
 
+                    if (string.IsNullOrEmpty(GdbFileName))
+                        sal = HelperGlobal.ponMsg("¿Desea cancelar el proceso de importación?",
+                         MessageBoxImage.Question, "OLIVIA", MessageBoxButton.YesNo);
+                } while (!sal);
+            }
             if (string.IsNullOrEmpty(GdbFileName) || !Directory.Exists(GdbFileName))
             {
                 res.Error.Add("Se ha cancelado la importación de resultados. Se cancela la elección de GDB.");
diff --git a/Services/LimpiezaServ.cs b/Services/LimpiezaServ.cs
index 230ac42..f92cee9 100644
--- a/Services/LimpiezaServ.cs
+++ b/Services/LimpiezaServ.cs
@@ -20,6 +20,8 @@ namespace OliviaAddInPro.Services
 
         public LimpiezaServ(Limpieza _limp)
         {
+            if (_limp == null)
+                _limp = OliviaGlob.Limp;
             limp = _limp;
         }
         /**
@@ -147,33 +149,14 @@ namespace OliviaAddInPro.Services
          */
         public bool CompruebaCamposLimp(string pathCapa)
         {
-            string[] camps;
-            GeometryType tipo = HelperGdb.GetGeomType(pathCapa);
-            if (tipo == GeometryType.Polyline)
+            string[] camps = limp.GetCampos(pathCapa);
+            int res = 1;
+            if ((camps == null) || (HelperGdb.CheckFileds(pathCapa, camps) != 0))
             {
-                int NCAMPS = 5;
-                camps = new string[NCAMPS];
-                camps[0] = LimpiezaDef.Campos.consulta_entidad;
-                camps[1] = LimpiezaDef.Campos.consulta_mecan;
-                camps[2] = LimpiezaDef.Campos.consulta_observ;
-                camps[3] = LimpiezaDef.Campos.consulta_anch_tip;
-                camps[4] = LimpiezaDef.Campos.consulta_tipolo;
-            }
-            else if (tipo == GeometryType.Point)//es mobiliario, con el tipo vale
-            {
-                int NCAMPS = 1;
-                camps = new string[NCAMPS];
-                camps[0] = LimpiezaDef.Campos.consulta_entidad;
-            }
-            else
-            {
-                ErrStr = "Error al comprobar campos en la capa.";
+                ErrStr = HelperGdb.OutStr;
                 return false;
             }
-            int res = HelperGdb.CheckFileds(pathCapa, camps);
-            if (res != 0)
-                ErrStr = HelperGdb.OutStr;
-            return res==0;
+            return true;            
         }
         /**
          * Lee la gdb y devuelve el array de ámbitos en función de si hay en la gdb o no
diff --git a/Services/RecogidaServ.cs b/Services/RecogidaServ.cs
index 1b4ce90..d8f0301 100644
--- a/Services/RecogidaServ.cs
+++ b/Services/RecogidaServ.cs
@@ -17,6 +17,8 @@ namespace OliviaAddInPro.Services
 
         public RecogidaServ(Recogida _reco)
         {
+            if (_reco == null)
+                _reco = OliviaGlob.Reco;
             reco = _reco;
         }
 
diff --git a/View/Configuracion/PropertyGridFilePickerFolder.xaml b/View/Configuracion/PropertyGridFilePickerFolder.xaml
new file mode 100644
index 0000000..3ed1970
--- /dev/null
+++ b/View/Configuracion/PropertyGridFilePickerFolder.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="OliviaAddInPro.View.Configuracion.PropertyGridFilePickerFolder"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OliviaAddInPro.View.Configuracion"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800"
+             x:Name="TheControl">
+    <DockPanel>
+        <Button x:Name="PickFileButton" Content="…" Click="PickFileButton_Click" DockPanel.Dock="Right" Width="15" />
+        <TextBox Text="{Binding ElementName=TheControl, Path=Value}" />
+    </DockPanel>
+</UserControl>
diff --git a/View/Configuracion/PropertyGridFilePickerFolder.xaml.cs b/View/Configuracion/PropertyGridFilePickerFolder.xaml.cs
new file mode 100644
index 0000000..c8cd91a
--- /dev/null
+++ b/View/Configuracion/PropertyGridFilePickerFolder.xaml.cs
@@ -0,0 +1,63 @@
+using Microsoft.Win32;
+using OliviaAddInPro.Helper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.PropertyGrid;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+using static OliviaAddInPro.Helper.HelperGdb;
+
+namespace OliviaAddInPro.View.Configuracion
+{
+    /// <summary>
+    /// Lógica de interacción para PropertyGridFilePicker.xaml
+    /// </summary>
+    public partial class PropertyGridFilePickerFolder : ITypeEditor
+    {
+        public PropertyGridFilePickerFolder()
+        {
+            InitializeComponent();
+        }
+        public string Value
+        {
+            get { return (string)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for Value.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register("Value", typeof(string), typeof(PropertyGridFilePickerFolder), new PropertyMetadata(null));
+
+
+
+        public FrameworkElement ResolveEditor(PropertyItem propertyItem)
+        {
+            Binding binding = new Binding("Value");
+            binding.Source = propertyItem;
+            binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+            BindingOperations.SetBinding(this, ValueProperty, binding);
+            return this;
+        }
+
+        private void PickFileButton_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog fd = new OpenFileDialog();
+            var st = HelperGdb.SaveFileDlg("Seleccione carpeta", null, null, ArcGIS.Desktop.Catalog.ItemFilters.folders);
+            if (!string.IsNullOrEmpty(st))
+            {
+                Value = st;
+            }
+        }
+    }
+}
diff --git a/View/Limpieza/PaneLimpieza.xaml b/View/Limpieza/PaneLimpieza.xaml
index 2bb4798..e570aee 100644
--- a/View/Limpieza/PaneLimpieza.xaml
+++ b/View/Limpieza/PaneLimpieza.xaml
@@ -38,11 +38,11 @@
             </DataTemplate>
             <DataTemplate DataType="{x:Type viewModel:PaneLimpiezaSub4ViewModel}">
                 <view:PaneLimpiezaSub4View/>
-            </DataTemplate>            
+            </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid MinHeight="200" MinWidth="300" x:Name="GridLimp">        
+    <Grid MinHeight="200" MinWidth="300" x:Name="GridLimp">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -56,10 +56,10 @@
                     ItemsSource="{Binding OptionsMenu}" 
                     SelectedItem="{Binding SelectedOption}">
             </frameworkControls:TabIndicator>
-        </StackPanel>        
-            <StackPanel Grid.Row="1">
-                <ContentPresenter Content="{Binding CurrentSubPanelPage}"/>
-            </StackPanel>
+        </StackPanel>
+        <StackPanel Grid.Row="1">
+            <ContentPresenter Content="{Binding CurrentSubPanelPage}"/>
+        </StackPanel>
         <StackPanel Grid.Row="2" Margin="0,20,0,0">
             <ContentPresenter Name="PaneEjecutar">
                 <ContentPresenter.Content>
@@ -72,10 +72,17 @@
                             </Grid.ColumnDefinitions>
                             <Button x:Name="button_secto" Grid.Column="1" Style="{DynamicResource Esri_Button}" Content="Sectorizar" Margin="10,0,10,0" Click="button_secto_Click"/>
                             <Button x:Name="button_planif" Grid.Column="2" Style="{DynamicResource Esri_Button}" Content="Planificar" Margin="10,0,10,0" Click="button_planif_Click"/>
-                        </Grid>                        
+                        </Grid>
                     </StackPanel>
                 </ContentPresenter.Content>
             </ContentPresenter>
         </StackPanel>
+        <StackPanel Grid.Row="3" Margin="0,70,10,0">
+            <Button x:Name="button_help" Content="" Margin="274,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="16" Height="16" BorderThickness="0" RenderTransformOrigin="16.875,0.375" Click="button_help_Click">
+                <Button.Background>
+                    <ImageBrush ImageSource="../../Images/help16Pro.png"/>
+                </Button.Background>
+            </Button>
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/View/Limpieza/PaneLimpieza.xaml.cs b/View/Limpieza/PaneLimpieza.xaml.cs
index 7a32e87..95c1e37 100644
--- a/View/Limpieza/PaneLimpieza.xaml.cs
+++ b/View/Limpieza/PaneLimpieza.xaml.cs
@@ -13,6 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using OliviaAddInPro.Helper;
+using OliviaAddInPro.Model;
 
 
 namespace OliviaAddInPro
@@ -49,5 +50,10 @@ namespace OliviaAddInPro
             }
 
         }
+
+        private void button_help_Click(object sender, RoutedEventArgs e)
+        {
+            OliviaGlob.OpenManual();
+        }
     }
 }
diff --git a/View/Recogida/PaneRecogida.xaml b/View/Recogida/PaneRecogida.xaml
index 7db8695..99756fc 100644
--- a/View/Recogida/PaneRecogida.xaml
+++ b/View/Recogida/PaneRecogida.xaml
@@ -63,18 +63,25 @@
             <ContentPresenter Name="PaneEjecutar">
                 <ContentPresenter.Content>
                     <StackPanel Orientation="Vertical">
-                        <Grid Margin="0,10,0,0" Height="40 ">
+                        <Grid Margin="0,10,0,0">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="30"/>
-                                <ColumnDefinition Width="150"/>
-                                <ColumnDefinition Width="120"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="100"/>
                             </Grid.ColumnDefinitions>
-                            <Button x:Name="button_secto" Grid.Column="1"  Height="40 " Style="{DynamicResource Esri_Button}" Content="Sectorizar" Margin="10,0,10,0" Click="button_secto_Click" FontStretch="Condensed"/>
-                            <Button x:Name="button_planif" Grid.Column="2" Height="40 " Style="{DynamicResource Esri_Button}" Content="Planificar" Margin="10,0,10,0" Click="button_planif_Click"/>
+                            <Button x:Name="button_secto" Grid.Column="1" Style="{DynamicResource Esri_Button}" Content="Sectorizar" Margin="10,0,10,0" Click="button_secto_Click"/>
+                            <Button x:Name="button_planif" Grid.Column="2" Style="{DynamicResource Esri_Button}" Content="Planificar" Margin="10,0,10,0" Click="button_planif_Click"/>
                         </Grid>
                     </StackPanel>
-                </ContentPresenter.Content>
+                </ContentPresenter.Content>                
             </ContentPresenter>
         </StackPanel>
+        <StackPanel Grid.Row="3" Margin="0,70,10,0">
+            <Button x:Name="button_help" Content="" Margin="0,0,0,0" HorizontalAlignment="Right" VerticalAlignment="Top" Width="16" Height="16" BorderThickness="0" RenderTransformOrigin="16.875,0.375" Click="button_help_Click">
+                <Button.Background>
+                    <ImageBrush ImageSource="../../Images/help16Pro.png"/>
+                </Button.Background>
+            </Button>
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/View/Recogida/PaneRecogida.xaml.cs b/View/Recogida/PaneRecogida.xaml.cs
index 6e9cfe0..70946dd 100644
--- a/View/Recogida/PaneRecogida.xaml.cs
+++ b/View/Recogida/PaneRecogida.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using OliviaAddInPro.Helper;
-
+using OliviaAddInPro.Model;
 
 namespace OliviaAddInPro
 {
@@ -43,11 +43,16 @@ namespace OliviaAddInPro
             if (DataContext is PaneRecogidaViewModel mod)
             {
                 if (mod.PaneSub1.CapaAbierta)
-                    mod.Ejecuta(OliviaAddInPro.Services.ModosEjec.Planifica);
+                    mod.Ejecuta(OliviaAddInPro.Services.ModosEjec.SoloPlanifica);
                 else
                     HelperGlobal.ponMsg("No se ha seleccionado ninguna capa de Recogida");
             }
 
         }
+
+        private void button_help_Click(object sender, RoutedEventArgs e)
+        {
+            OliviaGlob.OpenManual();
+        }
     }
 }