From 24e0cd969733545dd5c48d1b7e8cc316a94beeba Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Wed, 9 Mar 2022 00:17:41 +0100
Subject: [PATCH] =?UTF-8?q?A=C3=B1adida=20Ventana=20marchandoUnaDe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OliviaAddInPro.csproj                       |  8 +++++
 View/Comun/MarchandoUnaDe.xaml              | 17 +++++++++
 View/Comun/MarchandoUnaDe.xaml.cs           | 35 ++++++++++++++++++
 ViewModel/Comun/MarchandoUnaDeViewModel.cs  | 35 ++++++++++++++++++
 ViewModel/Limpieza/PaneLimpiezaViewModel.cs | 39 ++++++++++++++-------
 5 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 View/Comun/MarchandoUnaDe.xaml
 create mode 100644 View/Comun/MarchandoUnaDe.xaml.cs
 create mode 100644 ViewModel/Comun/MarchandoUnaDeViewModel.cs

diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj
index b10efd7..36f8ea4 100644
--- a/OliviaAddInPro.csproj
+++ b/OliviaAddInPro.csproj
@@ -158,6 +158,7 @@
     <Compile Include="Services\LimpiezaServ.cs" />
     <Compile Include="Services\ProcesoEjecServ.cs" />
     <Compile Include="Services\RecogidaServ.cs" />
+    <Compile Include="ViewModel\Comun\MarchandoUnaDeViewModel.cs" />
     <Compile Include="ViewModel\Configuracion\DockpaneConfigViewModel.cs" />
     <Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
     <Compile Include="ViewModel\OptionsMenuItem.cs" />
@@ -168,6 +169,9 @@
     <Compile Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs" />
     <Compile Include="ViewModel\PanelViewModelBase.cs" />
     <Compile Include="ViewModel\Recogida\PaneRecogidaSub1ViewModel.cs" />
+    <Compile Include="View\Comun\MarchandoUnaDe.xaml.cs">
+      <DependentUpon>MarchandoUnaDe.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Configuracion\PropertyGridFilePickerLine.xaml.cs">
       <DependentUpon>PropertyGridFilePickerLine.xaml</DependentUpon>
     </Compile>
@@ -241,6 +245,10 @@
     <Resource Include="OliviaIconPro.ico" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="View\Comun\MarchandoUnaDe.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\Configuracion\PropertyGridFilePickerLine.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/View/Comun/MarchandoUnaDe.xaml b/View/Comun/MarchandoUnaDe.xaml
new file mode 100644
index 0000000..c84525b
--- /dev/null
+++ b/View/Comun/MarchandoUnaDe.xaml
@@ -0,0 +1,17 @@
+<Window x:Class="OliviaAddInPro.MarchandoUnaDe"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:ui="clr-namespace:OliviaAddInPro"
+        xmlns:local="clr-namespace:OliviaAddInPro"
+        mc:Ignorable="d"
+        Title="MarchandoUnaDe" Height="165" Width="462"
+        d:DataContext="{Binding Path=ui.MarchandoUnaDeViewModel}">
+
+    <Grid>
+        <Label Content="{Binding TextProceso}" HorizontalAlignment="Left" Margin="76,24,0,0" VerticalAlignment="Top" Width="303" Height="26"/>
+        <ProgressBar Minimum="0" Maximum="100" HorizontalAlignment="Left" Value="{Binding Progreso, UpdateSourceTrigger=PropertyChanged}" Height="20" Margin="76,66,0,0" VerticalAlignment="Top" Width="303"/>
+        <Label  Content="{Binding TextEstado}" HorizontalAlignment="Left" Margin="95,91,0,0" VerticalAlignment="Top" Width="265" Height="28"/>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/View/Comun/MarchandoUnaDe.xaml.cs b/View/Comun/MarchandoUnaDe.xaml.cs
new file mode 100644
index 0000000..3734e07
--- /dev/null
+++ b/View/Comun/MarchandoUnaDe.xaml.cs
@@ -0,0 +1,35 @@
+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.Shapes;
+
+namespace OliviaAddInPro
+{
+    /// <summary>
+    /// Lógica de interacción para MarchandoUnaDe.xaml
+    /// </summary>
+    public partial class MarchandoUnaDe : Window
+    {
+        public MarchandoUnaDe()
+        {
+            InitializeComponent();
+            DataContext = new MarchandoUnaDeViewModel();
+        }
+
+        public MarchandoUnaDeViewModel  GetViewModel()
+        {
+            if (DataContext is MarchandoUnaDeViewModel m)
+                return m;
+            return null;
+        }
+    }
+}
diff --git a/ViewModel/Comun/MarchandoUnaDeViewModel.cs b/ViewModel/Comun/MarchandoUnaDeViewModel.cs
new file mode 100644
index 0000000..365293e
--- /dev/null
+++ b/ViewModel/Comun/MarchandoUnaDeViewModel.cs
@@ -0,0 +1,35 @@
+using ArcGIS.Desktop.Framework.Contracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OliviaAddInPro
+{
+    public class MarchandoUnaDeViewModel : PropertyChangedBase
+    {
+        
+        private string textProceso;
+        public string TextProceso
+        {
+            get { return textProceso; }
+            set { base.SetProperty(ref textProceso, value, () => TextProceso); }
+        }
+
+        private string textEstado;
+        public string TextEstado
+        {
+            get { return textEstado; }
+            set { base.SetProperty(ref textEstado, value, () => TextEstado); }
+        }
+        private double progreso;
+
+        public double Progreso
+        {
+            get { return progreso; }
+            set { base.SetProperty(ref progreso, value, () => Progreso); }
+        }
+        
+    }
+}
diff --git a/ViewModel/Limpieza/PaneLimpiezaViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaViewModel.cs
index 0bdb8ea..cc92991 100644
--- a/ViewModel/Limpieza/PaneLimpiezaViewModel.cs
+++ b/ViewModel/Limpieza/PaneLimpiezaViewModel.cs
@@ -10,13 +10,14 @@ using OliviaAddInPro.Helper;
 using static OliviaAddInPro.Model.ComunDef;
 using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Framework.Contracts;
+
 namespace OliviaAddInPro
 {
     class PaneLimpiezaViewModel : PanelViewModelBase
     {
         private PaneLimpiezaSub1ViewModel _subPanel1ViewModel;
-        Limpieza limp; 
-
+        Limpieza limp;
+        public MarchandoUnaDe marchando;
         public PaneLimpiezaViewModel()
         {            
             _subPanel1ViewModel = new PaneLimpiezaSub1ViewModel();
@@ -176,20 +177,32 @@ namespace OliviaAddInPro
          public void Ejecuta(OliviaAddInPro.Services.ModosEjec modo)
         {
             string err = "";
+            marchando = new MarchandoUnaDe();
+            marchando.Show();
+            var vm= marchando.GetViewModel();
+            //marchando
             
-
-            OliviaGlob.progrDialog.Show();
-            //oculta la ventana
-            OliviaGlob.ShowHidePane(false);
-
-            if (!Lee(out err))
+            vm.Progreso = 50.0;
+            vm.TextProceso = "Proceso";
+            vm.TextEstado = "Estado";
+            using (var prog = new ProgressDialog("Procesando", Resource1.String_cancel_progreso, 100, false))
             {
-                HelperGlobal.ponMsg(err);
-                return;
-            }
+                OliviaGlob.progrDialog = prog;
+                OliviaGlob.Limp.ProgrSrc = new MyCancelableProgressorSource(OliviaGlob.progrDialog);
+                OliviaGlob.progrDialog.Show();
 
-            Action<TareaRes> ac = OliviaGlob.finEjecuta;
-            OliviaGlob.Limp.EjecutaAsync(modo, ac);
+                //oculta la ventana
+                OliviaGlob.ShowHidePane(false);
+
+                if (!Lee(out err))
+                {
+                    HelperGlobal.ponMsg(err);
+                    return;
+                }
+
+                Action<TareaRes> ac = OliviaGlob.finEjecuta;
+                OliviaGlob.Limp.EjecutaAsync2(modo, ac);
+            }
         }
     }
 }