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

Cambios en nombres pedidos por vsm, arreglo tema oscuro propertygrid, envia mima

develop
Elena 2023-02-17 01:16:51 +01:00
parent c7f8bb403a
commit 2b91905abb
11 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Helper/HelperGdb.cs
View File

@ -76,7 +76,7 @@ namespace OliviaAddInPro.Helper
}
//Proceso para sacar un diálogo y seleccionar una o varias geometrías de dentro de una fclass
public static ArcGIS.Core.Geometry.Geometry OpenGeom(TiposOpenFileDlg tipo, out string txt_sal, string initialLoc = "")
public static ArcGIS.Core.Geometry.Geometry OpenGeom(TiposOpenFileDlg tipo, out string txt_sal, string initialLoc = "", bool multisel=false)
{
//inicialmente
ArcGIS.Core.Geometry.Geometry geom = null;
@ -87,7 +87,7 @@ namespace OliviaAddInPro.Helper
if (fc != null)
{
//hace geom
geom = SelecLeeGeom(fc, out txt_sal, true);
geom = SelecLeeGeom(fc, out txt_sal, multisel);
if (geom == null && (HelperGdb.OutStr.Length > 0))
HelperGlobal.ponMsg(HelperGdb.OutStr, System.Windows.MessageBoxImage.Error);

4
Model/OliviaConf.cs
View File

@ -239,14 +239,14 @@ namespace OliviaAddInPro.Model
[Category("General")]
[PropertyOrder(5)]
[DisplayName("GDB para Importación")]
[DisplayName("GDB para Resultados")]
[Description("Gdb en la que se importarán los resultados de la ejecución")]
[Editor(typeof(PropertyGridFilePickerGDB), typeof(PropertyGridFilePickerGDB))]
public string Path_Gdb_Import { get; set; }
[Category("General")]
[PropertyOrder(6)]
[DisplayName("Dataset para Importación")]
[DisplayName("Dataset para Resultados")]
[Description("Dataset, dentro de la GDB, en la que se importarán los resultados de la ejecución")]
[Editor(typeof(PropertyGridFilePickerDataset), typeof(PropertyGridFilePickerDataset))]
public string Path_Dataset_Import { get; set; }

9
Model/OliviaDef.cs
View File

@ -51,8 +51,8 @@ namespace OliviaAddInPro.Model
public const int ProgrMax = 100;
public const int ProgrStep = 5;
public const int ParamN = 5;
public const int ParamLimpN = 48;
public const int ParamRecoN = 46;
public const int ParamLimpN = 52;
public const int ParamRecoN = 50;
/*
* Define el separador entre parámetros de la llamada al proceso oliviatasks
*/
@ -533,6 +533,11 @@ namespace OliviaAddInPro.Model
public const string GTO_camp_objectid = "Camp_objectid";
public const string GTO_camp_sector = "Camp_sector";
public const string GTO_camp_secuencia = "Camp_secuencia";
//mima
public const string GTO_mima_xmin = "Coor_mima_xmin";
public const string GTO_mima_xmax = "Coor_mima_xmax";
public const string GTO_mima_ymin = "Coor_mima_ymin";
public const string GTO_mima_ymax = "Coor_mima_ymax";
/**
* Define el nombre para mandar a oliviatasks la configuración

4
Model/TratamientoComun.cs
View File

@ -116,6 +116,10 @@ namespace OliviaAddInPro.Model
* Ignorar o noelementos aislados
*/
public bool IgnoAis { get; set; } = LimpiezaDef.Parametros.igno_ais;
/**
* Coordenadas Min y Max de la red navegable
*/
public Envelope MimaNw { get; set; } = null;
/**
* Almacena la consulta para exportar los ámbitos
*/

2
Services/ConfigServ.cs
View File

@ -298,7 +298,7 @@ namespace OliviaAddInPro.Services
c.frac= "FRACCION";
c.capac= "CAPACIDAD";
c.uds= "UNIDADES";
c.kgrec= "KGRECO";
c.kgrec= "Kg_Recog";
c.kgrec_val=200;
c.is_lleno=false;
c.is_campo=false;

5
Services/EjecServ.cs
View File

@ -331,7 +331,10 @@ namespace OliviaAddInPro.Services
* /
}
}*/
//////////////////////////////////////
//guarda la mima de la geometría de la red navegable a exportar
com.MimaNw = geom_export.Extent;
//////////////////////////////////////
//Hace el filtro con la geometría final
filtroEspacial = HelperGdb.CreateFiler(String.Empty, geom_export);
if (filtroEspacial == null)

10
Services/LanzaSrv/LanzaLimpSrv.cs
View File

@ -97,9 +97,13 @@ namespace OliviaAddInPro.Services.LanzaSrv
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_ace + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_ace + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_aplin + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_aplin + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_apbat + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_apbat + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_bordlib + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_bordlib + " ";
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_anch_bordlib + GeneralDef.EjecGeoParamIgual + LimpiezaDef.OtrosParam.anch_bordlib + " " +
//mima de la nw
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmin + GeneralDef.EjecGeoParamIgual + limp.MimaNw.XMin + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmax + GeneralDef.EjecGeoParamIgual + limp.MimaNw.XMax + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymin + GeneralDef.EjecGeoParamIgual + limp.MimaNw.YMin + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymax + GeneralDef.EjecGeoParamIgual + limp.MimaNw.YMax + " ";
base.str_cfg = str;
return true;

7
Services/LanzaSrv/LanzaRecoSrv.cs
View File

@ -91,7 +91,12 @@ namespace OliviaAddInPro.Services.LanzaSrv
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_fechaf + GeneralDef.EjecGeoParamIgual + "0 " +
GeneralDef.EjecGeoParamSep + GeneralDef.GR_sens_modo + GeneralDef.EjecGeoParamIgual + "0 " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + (reco.IgnoAis?1:0) + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.TipoLate + " ";
GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.TipoLate + " " +
//mima de la nw
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmin + GeneralDef.EjecGeoParamIgual + reco.MimaNw.XMin + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmax + GeneralDef.EjecGeoParamIgual + reco.MimaNw.XMax + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymin + GeneralDef.EjecGeoParamIgual + reco.MimaNw.YMin + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_ymax + GeneralDef.EjecGeoParamIgual + reco.MimaNw.YMax + " ";
base.str_cfg = str;

14
View/Configuracion/PaneConfigView.xaml
View File

@ -17,12 +17,16 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Content="Guardar" Grid.Column="0" VerticalAlignment="Top" Width="75" Style="{DynamicResource Esri_Button}" Click="OnGuardar"/>
<Button Content="Releer Config." Grid.Column="1" VerticalAlignment="Top" Style="{DynamicResource Esri_Button}" Click="OnRefres"/>
<Button Content="Releer Config." Grid.Column="1" VerticalAlignment="Top" Style="{DynamicResource Esri_Button}" Click="OnRefres"/>
</Grid>
<xctk:PropertyGrid x:Name="Configuracion" SelectedObject="{Binding Configuracion}" HorizontalAlignment="Stretch" PropertyValueChanged="Configuracion_PropertyValueChanged">
<!-- Only the following properties will be displayed in the PropertyGrid -->
</xctk:PropertyGrid>
<xctk:PropertyGrid x:Name="Configuracion" SelectedObject="{Binding Configuracion}" HorizontalAlignment="Stretch" PropertyValueChanged="Configuracion_PropertyValueChanged" ShowDescriptionByTooltip="True">
<xctk:PropertyGrid.CategoryGroupHeaderTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" Background="{DynamicResource Esri_BackgroundPressedBrush}" Foreground="{DynamicResource Esri_TextStyleDefaultBrush}"/>
<!--TextBlock Text="{Binding}" Style="{DynamicResource Esri_TextBlockH3}" Foreground="{DynamicResource Esri_TextMenuBrush}"/-->
</DataTemplate>
</xctk:PropertyGrid.CategoryGroupHeaderTemplate>
</xctk:PropertyGrid>
</StackPanel>

1
View/Configuracion/PaneConfigView.xaml.cs
View File

@ -25,7 +25,6 @@ namespace OliviaAddInPro
public PaneConfigView()
{
InitializeComponent();
}
private void OnGuardar(object sender, RoutedEventArgs e)
{

6
View/Limpieza/PaneLimpiezaSub2.xaml.cs
View File

@ -41,7 +41,7 @@ namespace OliviaAddInPro
private void button_caparestr_Click(object sender, RoutedEventArgs e)
{
string texto = "";
ArcGIS.Core.Geometry.Geometry geom = HelperGdb.OpenGeom(HelperGdb.TiposOpenFileDlg.OpenFtrClassPolygon, out texto);
ArcGIS.Core.Geometry.Geometry geom = HelperGdb.OpenGeom(HelperGdb.TiposOpenFileDlg.OpenFtrClassPolygon, out texto, "", true);
if (DataContext is PaneLimpiezaSub2ViewModel mod)
{
mod.GeomRestr = geom;
@ -55,7 +55,7 @@ namespace OliviaAddInPro
private void button_capaniv_Click(object sender, RoutedEventArgs e)
{
string texto = "";
ArcGIS.Core.Geometry.Geometry geom = HelperGdb.OpenGeom(HelperGdb.TiposOpenFileDlg.OpenFtrClassPolygon, out texto);
ArcGIS.Core.Geometry.Geometry geom = HelperGdb.OpenGeom(HelperGdb.TiposOpenFileDlg.OpenFtrClassPolygon, out texto, "", true);
if (DataContext is PaneLimpiezaSub2ViewModel mod)
{
mod.GeomNiv = geom;
@ -69,7 +69,7 @@ namespace OliviaAddInPro
private void button_capazon_Click(object sender, RoutedEventArgs e)
{
string texto = "";
ArcGIS.Core.Geometry.Geometry geom = HelperGdb.OpenGeom(HelperGdb.TiposOpenFileDlg.OpenFtrClassPolygon, out texto);
ArcGIS.Core.Geometry.Geometry geom = HelperGdb.OpenGeom(HelperGdb.TiposOpenFileDlg.OpenFtrClassPolygon, out texto,"",true);
if (DataContext is PaneLimpiezaSub2ViewModel mod)
{
mod.GeomZon = geom;