From 640e58572b6aa040a5f3ef10808f0806610b22d4 Mon Sep 17 00:00:00 2001
From: Elena <Elena@narvaling.com>
Date: Fri, 15 Mar 2019 16:16:37 +0100
Subject: [PATCH] =?UTF-8?q?A=C3=B1adido=20progreso=20multitask?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OliviaAddIn.sln                |   1 +
 OliviaAddIn/Config.Designer.cs | Bin 11528 -> 11528 bytes
 OliviaAddIn/Config.esriaddinx  |   4 ++--
 OliviaAddIn/ProgresoEjec.cs    |  14 +++++++++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/OliviaAddIn.sln b/OliviaAddIn.sln
index ea0a740..4f29098 100644
--- a/OliviaAddIn.sln
+++ b/OliviaAddIn.sln
@@ -36,6 +36,7 @@ Global
 		{DB9A28BA-37A9-4D46-8CFF-06A444FCDEF7}.Release|x64.ActiveCfg = Release|x64
 		{DB9A28BA-37A9-4D46-8CFF-06A444FCDEF7}.Release|x64.Build.0 = Release|x64
 		{DB9A28BA-37A9-4D46-8CFF-06A444FCDEF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB9A28BA-37A9-4D46-8CFF-06A444FCDEF7}.Release|x86.Build.0 = Release|Any CPU
 		{B395D0F3-766D-46C5-BDE9-FBDEE1582259}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B395D0F3-766D-46C5-BDE9-FBDEE1582259}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B395D0F3-766D-46C5-BDE9-FBDEE1582259}.Debug|Mixed Platforms.Build.0 = Debug|x86
diff --git a/OliviaAddIn/Config.Designer.cs b/OliviaAddIn/Config.Designer.cs
index 143f92f4242fae1b360d4054e4beb93482707c2f..504e88410252d0a529fbd77500e05a4d93d325b6 100644
GIT binary patch
delta 28
jcmeB(>WJD<!^LPcxt_0ak_g{s9_}P&M$^std^6<$i<}70

delta 28
jcmeB(>WJD<!^LPYxt_0ak_g{s9_}P&M#Ihdd^6<$i(ClF

diff --git a/OliviaAddIn/Config.esriaddinx b/OliviaAddIn/Config.esriaddinx
index c25189f..6515a80 100644
--- a/OliviaAddIn/Config.esriaddinx
+++ b/OliviaAddIn/Config.esriaddinx
@@ -2,11 +2,11 @@
   <Name>OLIVIA AddIn</Name>
   <AddInID>{0718b3b3-5422-4d80-97ad-f72b18a3e476}</AddInID>
   <Description>Add-In de ArcMap para la herramienta de optimización de la limpieza viaria, OLIVIA.</Description>
-  <Version>1.1.0.10</Version>
+  <Version>1.1.0.12</Version>
   <Image>Images\OliviaAddIn.png</Image>
   <Author>Intergeo Tecnología</Author>
   <Company>Intergeo Tecnología</Company>
-  <Date>11/03/2019</Date>
+  <Date>15/03/2019</Date>
   <Targets>
     <Target name="Desktop" version="10.2" />
   </Targets>
diff --git a/OliviaAddIn/ProgresoEjec.cs b/OliviaAddIn/ProgresoEjec.cs
index 38a9f31..93e675a 100644
--- a/OliviaAddIn/ProgresoEjec.cs
+++ b/OliviaAddIn/ProgresoEjec.cs
@@ -48,6 +48,7 @@ namespace OliviaAddIn
             ActuNoActu,
             ActuBien,
             ActuPermu,
+            ActuMulti,
             ActuFinOk,
             ActuSect,
             ActuPlan,
@@ -390,6 +391,10 @@ namespace OliviaAddIn
                 {
                     tt = TiposActu.ActuPermu;
                 }
+                else if (args.Contains("multitask"))
+                {
+                    tt = TiposActu.ActuMulti;
+                }
                 modo_fin = (int)tt;
 
                 tarea = args.Substring(i);
@@ -497,11 +502,18 @@ namespace OliviaAddIn
                             pon_estilo(ProgressBarStyle.Marquee);
                             break;
                         }
+                    case TiposActu.ActuMulti:
+                        {
+                            permu = true;
+                            pon_texto(tarea);
+                            pon_estilo(ProgressBarStyle.Marquee);
+                            break;
+                        }
                     default:
                         return;
                 }
 
-                if (actu != TiposActu.ActuPermu)
+                if (actu != TiposActu.ActuPermu && actu != TiposActu.ActuMulti)
                     pon_estilo(ProgressBarStyle.Continuous);
                 pon_barstate(actu);
             }