diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj
index b10efd7..36f8ea4 100644
--- a/OliviaAddInPro.csproj
+++ b/OliviaAddInPro.csproj
@@ -158,6 +158,7 @@
+
@@ -168,6 +169,9 @@
+
+ MarchandoUnaDe.xaml
+
PropertyGridFilePickerLine.xaml
@@ -241,6 +245,10 @@
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
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 @@
+
+
+
+
+
+
+
+
\ 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
+{
+ ///
+ /// Lógica de interacción para MarchandoUnaDe.xaml
+ ///
+ 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 ac = OliviaGlob.finEjecuta;
- OliviaGlob.Limp.EjecutaAsync(modo, ac);
+ //oculta la ventana
+ OliviaGlob.ShowHidePane(false);
+
+ if (!Lee(out err))
+ {
+ HelperGlobal.ponMsg(err);
+ return;
+ }
+
+ Action ac = OliviaGlob.finEjecuta;
+ OliviaGlob.Limp.EjecutaAsync2(modo, ac);
+ }
}
}
}