diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj index 52f33ab..ed4b0b8 100644 --- a/OliviaAddInPro.csproj +++ b/OliviaAddInPro.csproj @@ -114,6 +114,9 @@ C:\Users\Elena\AppData\Local\Programs\ArcGIS\Pro\bin\ESRI.ArcGIS.ItemIndex.dll False + + ..\wpftoolkit-master\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll + @@ -127,10 +130,19 @@ + + + + + PaneLimpiezaSub4.xaml + + + PaneLimpiezaSub3.xaml + PaneLimpiezaSub2.xaml @@ -178,6 +190,14 @@ + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + MSBuild:Compile Designer diff --git a/Resource1.Designer.cs b/Resource1.Designer.cs index 6e571cc..a30f454 100644 --- a/Resource1.Designer.cs +++ b/Resource1.Designer.cs @@ -60,6 +60,15 @@ namespace OliviaAddInPro { } } + /// + /// Busca una cadena traducida similar a Control. + /// + internal static string String_ctrol { + get { + return ResourceManager.GetString("String_ctrol", resourceCulture); + } + } + /// /// Busca una cadena traducida similar a Ya existe una ejecución en marcha. /// @@ -87,6 +96,15 @@ namespace OliviaAddInPro { } } + /// + /// Busca una cadena traducida similar a Tiempos. + /// + internal static string String_tiempos { + get { + return ResourceManager.GetString("String_tiempos", resourceCulture); + } + } + /// /// Busca una cadena traducida similar a Tratamiento. /// diff --git a/Resource1.resx b/Resource1.resx index 2677390..65f8492 100644 --- a/Resource1.resx +++ b/Resource1.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Control + Ya existe una ejecución en marcha @@ -126,6 +129,9 @@ Seleccionar capa ... + + Tiempos + Tratamiento diff --git a/View/DockpaneLimpieza.xaml b/View/DockpaneLimpieza.xaml index 1694b87..945a429 100644 --- a/View/DockpaneLimpieza.xaml +++ b/View/DockpaneLimpieza.xaml @@ -21,13 +21,9 @@ - - - - - - - - - + + + + + diff --git a/View/NumberSpin.cs b/View/NumberSpin.cs new file mode 100644 index 0000000..b48c790 --- /dev/null +++ b/View/NumberSpin.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Xceed.Wpf.Toolkit; + +namespace OliviaAddInPro +{ + class NumberSpin : IntegerUpDown + { + } +} diff --git a/View/PaneLimpieza.xaml b/View/PaneLimpieza.xaml index 046ea72..48d653e 100644 --- a/View/PaneLimpieza.xaml +++ b/View/PaneLimpieza.xaml @@ -13,7 +13,7 @@ mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{Binding Path=ui.PaneLimpiezaViewModel}"> - + @@ -33,15 +33,20 @@ - + + + + + + - - + + + + @@ -51,10 +56,13 @@ ItemTemplate="{StaticResource SubPanelListItem}" ItemsSource="{Binding OptionsMenu}" SelectedItem="{Binding SelectedOption}"> - - - - + + + + + + + diff --git a/View/PaneLimpiezaSub1.xaml b/View/PaneLimpiezaSub1.xaml index d5ac710..0c7a330 100644 --- a/View/PaneLimpiezaSub1.xaml +++ b/View/PaneLimpiezaSub1.xaml @@ -6,34 +6,33 @@ xmlns:extensions="clr-namespace:ArcGIS.Desktop.Extensions;assembly=ArcGIS.Desktop.Extensions" xmlns:ui="clr-namespace:OliviaAddInPro" mc:Ignorable="d" d:DesignWidth="300" - d:DataContext="{Binding Path=ui.PaneLimpiezaSub1ViewModel}" Height="343.2"> + d:DataContext="{Binding Path=ui.PaneLimpiezaSub1ViewModel}" Height="300"> - - - - + + + - diff --git a/View/PaneLimpiezaSub1.xaml.cs b/View/PaneLimpiezaSub1.xaml.cs index 132b45b..26f8208 100644 --- a/View/PaneLimpiezaSub1.xaml.cs +++ b/View/PaneLimpiezaSub1.xaml.cs @@ -25,5 +25,10 @@ namespace OliviaAddInPro { InitializeComponent(); } + + private void ComboBox_DropDownOpened(object sender, EventArgs e) + { + + } } } diff --git a/View/PaneLimpiezaSub2.xaml b/View/PaneLimpiezaSub2.xaml index 9109ae1..a15521d 100644 --- a/View/PaneLimpiezaSub2.xaml +++ b/View/PaneLimpiezaSub2.xaml @@ -8,18 +8,79 @@ mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{Binding Path=ui.PaneLimpiezaSub2ViewModel}"> - + - + - + - + diff --git a/View/PaneLimpiezaSub3.xaml b/View/PaneLimpiezaSub3.xaml new file mode 100644 index 0000000..cbcb500 --- /dev/null +++ b/View/PaneLimpiezaSub3.xaml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + diff --git a/View/PaneLimpiezaSub3.xaml.cs b/View/PaneLimpiezaSub3.xaml.cs new file mode 100644 index 0000000..dcfdb48 --- /dev/null +++ b/View/PaneLimpiezaSub3.xaml.cs @@ -0,0 +1,29 @@ +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; + + +namespace OliviaAddInPro +{ + /// + /// Interaction logic for PaneLimpiezaSub2View.xaml + /// + public partial class PaneLimpiezaSub3View : UserControl + { + public PaneLimpiezaSub3View() + { + InitializeComponent(); + } + } +} diff --git a/View/PaneLimpiezaSub4.xaml b/View/PaneLimpiezaSub4.xaml new file mode 100644 index 0000000..ab5290c --- /dev/null +++ b/View/PaneLimpiezaSub4.xaml @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/View/PaneLimpiezaSub4.xaml.cs b/View/PaneLimpiezaSub4.xaml.cs new file mode 100644 index 0000000..64bce09 --- /dev/null +++ b/View/PaneLimpiezaSub4.xaml.cs @@ -0,0 +1,29 @@ +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; + + +namespace OliviaAddInPro +{ + /// + /// Interaction logic for PaneLimpiezaSub2View.xaml + /// + public partial class PaneLimpiezaSub4View : UserControl + { + public PaneLimpiezaSub4View() + { + InitializeComponent(); + } + } +} diff --git a/ViewModel/PaneLimpiezaSub2ViewModel.cs b/ViewModel/PaneLimpiezaSub2ViewModel.cs index f9bf310..e221c19 100644 --- a/ViewModel/PaneLimpiezaSub2ViewModel.cs +++ b/ViewModel/PaneLimpiezaSub2ViewModel.cs @@ -19,9 +19,50 @@ namespace OliviaAddInPro { internal class PaneLimpiezaSub2ViewModel : PanelViewModelBase { + public PaneLimpiezaSub2ViewModel() + { + lblCapaRestr= lblCapaNiv= lblCapaZon= lblCapaInst = Resource1.String_selec_capa; + txtBuffExport = "1000"; + } + + + #region Properties + public override string DisplayName { - get { return "Opción 2 se muestra"; } + get { return Resource1.String_zonif; } } + + private string lblCapaRestr; + public string LblCapaRestr + { + get { return lblCapaRestr; } + set { LblCapaRestr = lblCapaRestr; } + } + private string lblCapaNiv; + public string LblCapaNiv + { + get { return lblCapaNiv; } + set { LblCapaNiv = lblCapaNiv; } + } + private string lblCapaZon; + public string LblCapaZon + { + get { return lblCapaZon; } + set { LblCapaZon = lblCapaZon; } + } + private string lblCapaInst; + public string LblCapaInst + { + get { return lblCapaInst; } + set { LblCapaInst = lblCapaInst; } + } + private string txtBuffExport; + public string TxtBuffExport + { + get { return txtBuffExport; } + set { TxtBuffExport = txtBuffExport; } + } + #endregion Properties } } diff --git a/ViewModel/PaneLimpiezaSub3ViewModel.cs b/ViewModel/PaneLimpiezaSub3ViewModel.cs new file mode 100644 index 0000000..15d9f63 --- /dev/null +++ b/ViewModel/PaneLimpiezaSub3ViewModel.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ArcGIS.Core.CIM; +using ArcGIS.Core.Data; +using ArcGIS.Core.Geometry; +using ArcGIS.Desktop.Catalog; +using ArcGIS.Desktop.Core; +using ArcGIS.Desktop.Editing; +using ArcGIS.Desktop.Extensions; +using ArcGIS.Desktop.Framework; +using ArcGIS.Desktop.Framework.Contracts; +using ArcGIS.Desktop.Framework.Dialogs; +using ArcGIS.Desktop.Framework.Threading.Tasks; +using ArcGIS.Desktop.Mapping; + +namespace OliviaAddInPro +{ + internal class PaneLimpiezaSub3ViewModel : PanelViewModelBase + { + public PaneLimpiezaSub3ViewModel() + { + + } + + + #region Properties + + public override string DisplayName + { + get { return Resource1.String_ctrol; } + } + + /*private string lblCapaRestr; + public string LblCapaRestr + { + get { return lblCapaRestr; } + set { LblCapaRestr = lblCapaRestr; } + }*/ + + #endregion Properties + } +} diff --git a/ViewModel/PaneLimpiezaSub4ViewModel.cs b/ViewModel/PaneLimpiezaSub4ViewModel.cs new file mode 100644 index 0000000..b4ae52b --- /dev/null +++ b/ViewModel/PaneLimpiezaSub4ViewModel.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ArcGIS.Core.CIM; +using ArcGIS.Core.Data; +using ArcGIS.Core.Geometry; +using ArcGIS.Desktop.Catalog; +using ArcGIS.Desktop.Core; +using ArcGIS.Desktop.Editing; +using ArcGIS.Desktop.Extensions; +using ArcGIS.Desktop.Framework; +using ArcGIS.Desktop.Framework.Contracts; +using ArcGIS.Desktop.Framework.Dialogs; +using ArcGIS.Desktop.Framework.Threading.Tasks; +using ArcGIS.Desktop.Mapping; + +namespace OliviaAddInPro +{ + internal class PaneLimpiezaSub4ViewModel : PanelViewModelBase + { + public PaneLimpiezaSub4ViewModel() + { + + } + + + #region Properties + + public override string DisplayName + { + get { return Resource1.String_tiempos; } + } + + /*private string lblCapaRestr; + public string LblCapaRestr + { + get { return lblCapaRestr; } + set { LblCapaRestr = lblCapaRestr; } + }*/ + + #endregion Properties + } +} diff --git a/ViewModel/PaneLimpiezaViewModel.cs b/ViewModel/PaneLimpiezaViewModel.cs index 4f12973..4793086 100644 --- a/ViewModel/PaneLimpiezaViewModel.cs +++ b/ViewModel/PaneLimpiezaViewModel.cs @@ -12,18 +12,21 @@ namespace OliviaAddInPro { private PaneLimpiezaSub1ViewModel _subPanel1ViewModel; private PaneLimpiezaSub2ViewModel _subPanel2ViewModel; - //private SubPanel3ViewModel _subPanel3ViewModel; + private PaneLimpiezaSub3ViewModel _subPanel3ViewModel; + private PaneLimpiezaSub4ViewModel _subPanel4ViewModel; public PaneLimpiezaViewModel() { _subPanel1ViewModel = new PaneLimpiezaSub1ViewModel(); _subPanel2ViewModel = new PaneLimpiezaSub2ViewModel(); - //_subPanel3ViewModel = new SubPanel3ViewModel(); + _subPanel3ViewModel = new PaneLimpiezaSub3ViewModel(); + _subPanel4ViewModel = new PaneLimpiezaSub4ViewModel(); OptionsMenu = new ObservableCollection { new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/Dog32.png")), Resource1.String_tto, _subPanel1ViewModel), new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/Dino32.png")), Resource1.String_zonif, _subPanel2ViewModel), - //new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/CustomCatalog;component/Resources/panda-32.png")), "Option 3", _subPanel3ViewModel) + new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/Cat32.png")), Resource1.String_ctrol, _subPanel3ViewModel), + new OptionsMenuItem(new BitmapImage(new Uri("pack://application:,,,/OliviaAddInPro;component/Resources/Panda32.png")), Resource1.String_tiempos, _subPanel4ViewModel) }; SelectedOption = OptionsMenu[0]; }