Narvaling
/
OliviaAddInPro
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avances limpieza, no se muestra botón ejecutar

ConfiguracionSimplificada
Elena 2021-07-29 13:02:36 +02:00
parent b8d856ceee
commit 734a79cf63
21 changed files with 205 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Button/ButtonConfig.cs
View File

@ -31,7 +31,7 @@ namespace OliviaAddInPro
}
else
{
HelperGlobal.ponMsg(Resource1.String_existe_ejec, MessageType.Warning);
HelperGlobal.ponMsg(Resource1.String_existe_ejec, System.Windows.MessageBoxImage.Warning);
}
}
}

2
Button/ButtonLimp.cs
View File

@ -32,7 +32,7 @@ namespace OliviaAddInPro
}
else
{
HelperGlobal.ponMsg(Resource1.String_existe_ejec, MessageType.Warning);
HelperGlobal.ponMsg(Resource1.String_existe_ejec, System.Windows.MessageBoxImage.Warning);
}
}
}

2
Button/ButtonMaq.cs
View File

@ -31,7 +31,7 @@ namespace OliviaAddInPro
}
else
{
HelperGlobal.ponMsg(Resource1.String_existe_ejec, MessageType.Warning);
HelperGlobal.ponMsg(Resource1.String_existe_ejec, System.Windows.MessageBoxImage.Warning);
}
}
}

2
Button/ButtonRec.cs
View File

@ -32,7 +32,7 @@ namespace OliviaAddInPro
}
else
{
HelperGlobal.ponMsg(Resource1.String_existe_ejec, MessageType.Warning);
HelperGlobal.ponMsg(Resource1.String_existe_ejec, System.Windows.MessageBoxImage.Warning);
}
}
}

3
Config.daml
View File

@ -45,6 +45,9 @@
<tooltip heading="OLIVIA - Configuración">
Add-In de ArcGIS Pro para la herramienta de optimización de la limpieza viaria, OLIVIA<disabledText /></tooltip>
</button>
<button id="OliviaAddInPro_ButtonArcGisPro" caption="ButtonArcGisPro" className="ButtonArcGisPro" loadOnClick="true" smallImage="pack://application:,,,/ArcGIS.Desktop.Resources;component/Images/GenericButtonBlue16.png" largeImage="pack://application:,,,/ArcGIS.Desktop.Resources;component/Images/GenericButtonBlue32.png">
<tooltip heading="Tooltip Heading">Tooltip text<disabledText /></tooltip>
</button>
</controls>
<dockPanes>
<dockPane id="OliviaAddInPro_DockpaneLimpieza" caption="OLIVIA | Limpieza" className="DockpaneLimpiezaViewModel" dock="group" dockWith="esri_core_contentsDockPane">

11
Helper/HelperGlobal.cs
View File

@ -5,17 +5,20 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ArcGIS.Desktop.Internal.Framework.Controls;
using ArcGIS.Desktop.Framework.Dialogs;
using System.Windows;
namespace OliviaAddInPro.Helper
{
public static class HelperGlobal
{
public static ErrorMessageDialog msg;
public static void ponMsg(String mensaje, MessageType tipo, String titulo = "OLIVIA")
public static void ponMsg(String mensaje, System.Windows.MessageBoxImage icon = MessageBoxImage.Information,
String titulo = "OLIVIA",
MessageBoxButton button= MessageBoxButton.OK)
{
msg = new ErrorMessageDialog(titulo, mensaje, tipo);
msg.ShowDialog();
//MessageBoxResult Show(string messageText, string caption, MessageBoxButton button, MessageBoxImage icon);
ArcGIS.Desktop.Framework.Dialogs.MessageBox.Show(mensaje, titulo, button, icon);
}
public static string RevisaText(string text)
{

8
OliviaAddInPro.csproj
View File

@ -138,11 +138,15 @@
<Compile Include="Model\LimpiezaDef.cs" />
<Compile Include="Model\OliviaDef.cs" />
<Compile Include="ViewModel\OptionsMenuItem.cs" />
<Compile Include="ViewModel\PaneEjecutarViewModel.cs" />
<Compile Include="ViewModel\PaneLimpiezaSub4ViewModel.cs" />
<Compile Include="ViewModel\PaneLimpiezaSub3ViewModel.cs" />
<Compile Include="ViewModel\PaneLimpiezaSub2ViewModel.cs" />
<Compile Include="ViewModel\PaneLimpiezaViewModel.cs" />
<Compile Include="ViewModel\PanelViewModelBase.cs" />
<Compile Include="View\PaneEjecutar.xaml.cs">
<DependentUpon>PaneEjecutar.xaml</DependentUpon>
</Compile>
<Compile Include="View\PaneLimpiezaSub4.xaml.cs">
<DependentUpon>PaneLimpiezaSub4.xaml</DependentUpon>
</Compile>
@ -200,6 +204,10 @@
<Resource Include="OliviaIconPro.ico" />
</ItemGroup>
<ItemGroup>
<Page Include="View\PaneEjecutar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\PaneLimpiezaSub4.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>

2
View/DockpaneLimpieza.xaml
View File

@ -22,7 +22,7 @@
</ResourceDictionary>
</UserControl.Resources>
<ScrollViewer Height="Auto">
<StackPanel>
<StackPanel MinWidth="300">
<ContentPresenter Content="{Binding CurrentPage}"></ContentPresenter>
</StackPanel>
</ScrollViewer>

31
View/PaneEjecutar.xaml Normal file
View File

@ -0,0 +1,31 @@
<UserControl x:Class="OliviaAddInPro.PaneEjecutarView"
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:extensions="clr-namespace:ArcGIS.Desktop.Extensions;assembly=ArcGIS.Desktop.Extensions"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
xmlns:ui="clr-namespace:OliviaAddInPro"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300"
d:DataContext="{Binding Path=ui.PaneLimpiezaSub3ViewModel}">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<extensions:DesignOnlyResourceDictionary Source="pack://application:,,,/ArcGIS.Desktop.Framework;component\Themes\Default.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<StackPanel Orientation="Vertical">
<Grid Margin="0,10,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Button x:Name="button_secto" Grid.Column="1" Style="{DynamicResource Esri_Button}" Content="Sectorizar" Margin="5,0,5,0"/>
<Button x:Name="button_planif" Grid.Column="2" Style="{DynamicResource Esri_Button}" Content="Planificar" Margin="5,0,5,0"/>
</Grid>
</StackPanel>
</UserControl>

30
View/PaneEjecutar.xaml.cs Normal file
View File

@ -0,0 +1,30 @@
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
{
/// <summary>
/// Interaction logic for PaneEjecutarView.xaml
/// </summary>
public partial class PaneEjecutarView : UserControl
{
public PaneEjecutarView()
{
InitializeComponent();
}
}
}

11
View/PaneLimpieza.xaml
View File

@ -39,6 +39,9 @@
<DataTemplate DataType="{x:Type viewModel:PaneLimpiezaSub4ViewModel}">
<view:PaneLimpiezaSub4View/>
</DataTemplate>
<DataTemplate DataType="{x:Type viewModel:PaneEjecutarViewModel}">
<view:PaneEjecutarView/>
</DataTemplate>
</ResourceDictionary>
</UserControl.Resources>
@ -46,8 +49,8 @@
<!--TextBlock Text="Add your custom content here" VerticalAlignment="Center" HorizontalAlignment="Center"></-->
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="380"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0">
<frameworkControls:TabIndicator HorizontalAlignment="Stretch"
@ -61,8 +64,8 @@
<StackPanel Grid.Row="1">
<ContentPresenter Content="{Binding CurrentSubPanelPage}"/>
</StackPanel>
<StackPanel Grid.Row="2">
<Label Content="botón ejecutar"></Label>
<StackPanel Grid.Row="2" Margin="0,20,0,0">
<ContentPresenter Content="{Binding SubPanelEjec}"/>
</StackPanel>
</Grid>
</UserControl>

36
View/PaneLimpiezaSub1.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:extensions="clr-namespace:ArcGIS.Desktop.Extensions;assembly=ArcGIS.Desktop.Extensions"
xmlns:ui="clr-namespace:OliviaAddInPro"
mc:Ignorable="d" d:DesignWidth="300" Height="380"
mc:Ignorable="d" d:DesignWidth="300" Height="350"
d:DataContext="{Binding Path=ui.PaneLimpiezaSub1ViewModel}" >
<UserControl.Resources>
<ResourceDictionary>
@ -28,38 +28,42 @@
</Button>
<Label x:Name="label_capalimp" Content="{Binding Path=LblCapaLimp, Mode = TwoWay}" Grid.Column="1" HorizontalAlignment="Left" Margin="13,0,0,0" VerticalAlignment="Top" Width="221" Height="30" Grid.ColumnSpan="3"/>
</Grid>
<Label Content="Tipo de Tratamiento" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" FontWeight="DemiBold"/>
<ComboBox x:Name="comboBox_tto" ItemsSource="{Binding Path=TiposTto, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" VerticalAlignment="Top" Width="260" DropDownOpened="ComboBox_DropDownOpened" SelectionChanged="comboBox_tto_SelectionChanged"/>
<Label Content="Ámbitos de Trabajo" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.391,-0.203" FontWeight="DemiBold"/>
<ComboBox x:Name="comboBox_ambitos" ItemsSource="{Binding Path=OpsAmbs, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" VerticalAlignment="Top" Width="260" SelectionChanged="comboBox_ambitos_SelectionChanged"/>
<ListBox x:Name="listBox_ambitos" ItemsSource="{Binding Path=Ambitos, Mode = TwoWay}" HorizontalAlignment="Left" Height="100" Margin="20,2,0,0" VerticalAlignment="Top" Width="260">
<Label Content="Tipo de Tratamiento" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" FontWeight="DemiBold"/>
<ComboBox x:Name="comboBox_tto" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=TiposTto, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" VerticalAlignment="Top" Width="260" DropDownOpened="ComboBox_DropDownOpened" SelectionChanged="comboBox_tto_SelectionChanged"/>
<Label Content="Ámbitos de Trabajo" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.391,-0.203" FontWeight="DemiBold"/>
<ComboBox x:Name="comboBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=OpsAmbs, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" VerticalAlignment="Top" Width="260" SelectionChanged="comboBox_ambitos_SelectionChanged"/>
<ListBox x:Name="listBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=Ambitos, Mode = TwoWay}" HorizontalAlignment="Left" Height="100"
ItemContainerStyle="{DynamicResource Esri_ListBoxItemHighlightBrush}" Margin="20,2,0,0" VerticalAlignment="Top" Width="260">
<ListBox.ItemTemplate>
<DataTemplate>
<ListBoxItem IsSelected="{Binding IsChecked}" IsEnabled="{Binding IsEnabled}">
<ListBoxItem IsEnabled="{Binding IsEnabled}">
<CheckBox IsChecked="{Binding IsChecked}" Content="{Binding Path=Item}" />
</ListBoxItem>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<CheckBox x:Name="checkBox_sentidocirc" Content="Respeta el sentido de circulación" IsChecked="{Binding RespSentCirc}" HorizontalAlignment="Left" Margin="20,2,0,0" VerticalAlignment="Top"/>
<CheckBox x:Name="checkBox_sentidocirc" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}"
Content="Respeta el sentido de circulación" IsChecked="{Binding RespSentCirc}" HorizontalAlignment="Left" Margin="20,2,0,0" VerticalAlignment="Top"/>
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="185"/>
<ColumnDefinition Width="75"/>
<ColumnDefinition Width="40"/>
</Grid.ColumnDefinitions>
<Label x:Name="label_velodespl" Margin="15,0,0,0" Content="Velocidad de desplazamiento"/>
<TextBox x:Name="txtBox_velodespl" Grid.Column="1" Margin="10,2,10,4" TextWrapping="Wrap" Text="{Binding Path=TextVeloDespl, Mode = TwoWay}" TextAlignment="Right" MaxLength="4" PreviewTextInput="TextBox_velodespl_PreviewTextInput"/>
<TextBox x:Name="txtBox_velodespl" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" Grid.Column="1" Margin="10,2,10,4" TextWrapping="NoWrap" Text="{Binding Path=TextVeloDespl, Mode = TwoWay}" TextAlignment="Right" MaxLength="4" PreviewTextInput="TextBox_velodespl_PreviewTextInput"/>
<Label x:Name="label_udsvelodespl" Grid.Column="2" Content="{Binding LblUdsVeloDespl}" Margin="0,0,0,0"/>
</Grid>
<Grid Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="185"/>
<ColumnDefinition Width="75"/>
<ColumnDefinition Width="40"/>
</Grid.ColumnDefinitions>
<Label x:Name="label_tiempotto" Margin="15,0,0,0" Content="{Binding LblTimeTto}"/>
<TextBox x:Name="txtBox_tiempotto" Grid.Column="1" Margin="10,2,10,4" TextWrapping="Wrap" Text="{Binding Path=TimeTto, Mode = TwoWay}" TextAlignment="Right" MaxLength="4" PreviewTextInput="TextBox_tiempotto_PreviewTextInput"/>
<TextBox x:Name="txtBox_tiempotto" Grid.Column="1" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" Margin="10,2,10,4" TextWrapping="Wrap" Text="{Binding Path=TimeTto, Mode = TwoWay}" TextAlignment="Right" MaxLength="4" PreviewTextInput="TextBox_tiempotto_PreviewTextInput"/>
<Label x:Name="label_udstiempotto" Grid.Column="2" Content="{Binding LblUdsTimeTto}" Margin="0,0,0,0"/>
</Grid>
</StackPanel>

13
View/PaneLimpiezaSub1.xaml.cs
View File

@ -47,10 +47,15 @@ namespace OliviaAddInPro
if (!string.IsNullOrEmpty(capa))
{
label_capalimp.Content = System.IO.Path.GetFileNameWithoutExtension(capa);
((PaneLimpiezaSub1ViewModel)DataContext).AbiertaCapa(capa);
if (DataContext is PaneLimpiezaSub1ViewModel mod)
mod.AbiertaCapa(capa);
}
else
{
label_capalimp.Content = Resource1.String_selec_capa;
if (DataContext is PaneLimpiezaSub1ViewModel mod)
mod.CapaAbierta = false;
}
}
private void comboBox_tto_SelectionChanged(object sender, SelectionChangedEventArgs e)
@ -58,7 +63,8 @@ namespace OliviaAddInPro
int i = -1;
if (sender is ComboBox combo)
i = combo.SelectedIndex;
((PaneLimpiezaSub1ViewModel)DataContext).ComboTtoSel(i);
if(DataContext is PaneLimpiezaSub1ViewModel mod)
mod.ComboTtoSel(i);
}
@ -67,7 +73,8 @@ namespace OliviaAddInPro
int i = -1;
if (sender is ComboBox combo)
i = combo.SelectedIndex;
((PaneLimpiezaSub1ViewModel)DataContext).ComboAmbSel(i);
if (DataContext is PaneLimpiezaSub1ViewModel mod)
mod.ComboAmbSel(i);
}
}
}

2
View/PaneLimpiezaSub2.xaml.cs
View File

@ -57,7 +57,7 @@ namespace OliviaAddInPro
{
texto = Resource1.String_selec_capa;
if (HelperGdb.OutStr.Length > 0)
HelperGlobal.ponMsg(HelperGdb.OutStr, MessageType.Error);
HelperGlobal.ponMsg(HelperGdb.OutStr, System.Windows.MessageBoxImage.Error);
}
_texto = texto;

3
View/PaneLimpiezaSub3.xaml
View File

@ -38,6 +38,7 @@
<xctk:IntegerUpDown x:Name="spinner_nsect" Value="{Binding Path=NumSect, Mode = TwoWay}" Grid.Column="1" Height="20" Width="70" FormatString="N0" Increment="1" Maximum="20" Minimum="1" Margin="17,4,2,6" AllowTextInput ="False"/>
<CheckBox x:Name="checkBox_sectauto" Grid.Column="2" Margin="9,6,9,-1" Content="Automático" IsChecked="{Binding Path=CheckSectAuto, Mode = TwoWay}" Checked="checkBox_sectauto_Checked"/>
</Grid>
<CheckBox x:Name="checkBox_ajustsect" Margin="18,5,0,0" Content="Ajustar sectores a jornada" IsChecked="{Binding Path=CheckAjustSect, Mode = TwoWay}"/>
<CheckBox x:Name="checkBox_ajustsect" Margin="18,10,0,0" Content="Ajustar sectores a jornada" IsChecked="{Binding Path=CheckAjustSect, Mode = TwoWay}"/>
<CheckBox x:Name="checkBox_ignorais" Margin="18,10,0,0" Content="Ignorar elementos aislados" IsChecked="{Binding Path=CheckIgnoAis, Mode = TwoWay}"/>
</StackPanel>
</UserControl>

4
View/ProWndSelectFields.xaml.cs
View File

@ -51,9 +51,9 @@ namespace OliviaAddInPro.View
if (elems.Count == 0)
{
if (HelperGdb.OutStr.Length > 0)
HelperGlobal.ponMsg(HelperGdb.OutStr, MessageType.Error);
HelperGlobal.ponMsg(HelperGdb.OutStr, System.Windows.MessageBoxImage.Error);
else
HelperGlobal.ponMsg(Resource1.String_error_elems_tabla, MessageType.Warning);
HelperGlobal.ponMsg(Resource1.String_error_elems_tabla, System.Windows.MessageBoxImage.Warning);
}
listBoxAttributes.ItemsSource = elems;
}

44
ViewModel/PaneEjecutarViewModel.cs Normal file
View File

@ -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 PaneEjecutarViewModel : PanelViewModelBase
{
public PaneEjecutarViewModel()
{
}
#region Properties
public override string DisplayName
{
get { return "Ejecutar"; }
}
private int numPtosCtrl;
public int NumPtosCtrl
{
get { return numPtosCtrl; }
set { base.SetProperty(ref numPtosCtrl, value, () => NumPtosCtrl); }
}
#endregion Properties
}
}

17
ViewModel/PaneLimpiezaSub1ViewModel.cs
View File

@ -31,6 +31,7 @@ namespace OliviaAddInPro
private int selOpAmb = -1;
private ObservableCollection<CheckedListItem<string>> ambitos = new ObservableCollection<CheckedListItem<string>>();
private bool[] ambitosSel;
private bool capaAbierta = false;
/**
@ -159,6 +160,15 @@ namespace OliviaAddInPro
base.NotifyPropertyChanged("OpsAmbs");
}
}
public bool CapaAbierta
{
get { return capaAbierta; }
set
{
capaAbierta = value;
base.NotifyPropertyChanged("CapaAbierta");
}
}
#endregion Properties
public PaneLimpiezaSub1ViewModel(Limpieza _limp)
@ -177,11 +187,12 @@ namespace OliviaAddInPro
public void AbiertaCapa(string capa)
{
limp.CapaElems = capa;
CapaAbierta = false;
//comprueba los campos de limpieza
if (!limp.CompruebaCamposLimp())
{
string ss = limp.ErrStr;
HelperGlobal.ponMsg(ss, ArcGIS.Desktop.Internal.Framework.Controls.MessageType.Warning);
HelperGlobal.ponMsg(ss, System.Windows.MessageBoxImage.Warning);
return;
}
@ -198,13 +209,13 @@ namespace OliviaAddInPro
if (!hay_alguno)
{
HelperGlobal.ponMsg(Resource1.String_error_elems_tabla,
ArcGIS.Desktop.Internal.Framework.Controls.MessageType.Warning);
System.Windows.MessageBoxImage.Warning);
return;
}
//hay elementos en la gdb
OpsAmbs.Clear();
Ambitos.Clear();
CapaAbierta = true;
}
/**

6
ViewModel/PaneLimpiezaSub3ViewModel.cs
View File

@ -60,6 +60,12 @@ namespace OliviaAddInPro
get { return checkAjustSect; }
set { base.SetProperty(ref checkAjustSect, value, () => CheckAjustSect); }
}
private bool checkIgnoAis;
public bool CheckIgnoAis
{
get { return checkIgnoAis; }
set { base.SetProperty(ref checkIgnoAis, value, () => CheckIgnoAis); }
}
#endregion Properties
}

9
ViewModel/PaneLimpiezaViewModel.cs
View File

@ -15,12 +15,14 @@ namespace OliviaAddInPro
private PaneLimpiezaSub2ViewModel _subPanel2ViewModel;
private PaneLimpiezaSub3ViewModel _subPanel3ViewModel;
private PaneLimpiezaSub4ViewModel _subPanel4ViewModel;
private PaneEjecutarViewModel _subPanelEjecutar;
public PaneLimpiezaViewModel()
{
_subPanel1ViewModel = new PaneLimpiezaSub1ViewModel(OliviaGlob.Limp);
_subPanel2ViewModel = new PaneLimpiezaSub2ViewModel();
_subPanel3ViewModel = new PaneLimpiezaSub3ViewModel();
_subPanel4ViewModel = new PaneLimpiezaSub4ViewModel();
_subPanelEjecutar = new PaneEjecutarViewModel();
OptionsMenu = new ObservableCollection<OptionsMenuItem>
{
@ -49,6 +51,13 @@ namespace OliviaAddInPro
set { SetProperty(ref _currentSubPanelPage, value, () => CurrentSubPanelPage); }
}
private PanelViewModelBase _subPanelEjec;
public PanelViewModelBase SubPanelEjec
{
get { return _subPanelEjec; }
set { SetProperty(ref _subPanelEjec, value, () => SubPanelEjec); }
}
private OptionsMenuItem _selectionOption;
public OptionsMenuItem SelectedOption
{

4
ViewModel/ShowProWndSelectFields.cs
View File

@ -42,9 +42,9 @@ namespace OliviaAddInPro.View
if (fields.Count == 0)
{
if (HelperGdb.OutStr.Length > 0)
HelperGlobal.ponMsg(HelperGdb.OutStr, MessageType.Error);
HelperGlobal.ponMsg(HelperGdb.OutStr, System.Windows.MessageBoxImage.Error);
else
HelperGlobal.ponMsg(Resource1.String_error_elems_tabla, MessageType.Warning);
HelperGlobal.ponMsg(Resource1.String_error_elems_tabla, System.Windows.MessageBoxImage.Warning);
}
else
{