Compare commits

...

1 Commits

Author SHA1 Message Date
Gerardo f973a2c5e2 Configuracion simplificada realizada con herencia de clases 2022-02-21 22:01:18 +01:00
3 changed files with 53 additions and 7 deletions

View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -13,9 +14,12 @@ using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
namespace OliviaAddInPro.Model namespace OliviaAddInPro.Model
{ {
//This defaults to AllowMultiple = false.
[Serializable] [Serializable]
class OliviaConf class OliviaConf
{ {
public enum OpsRecoCont public enum OpsRecoCont
{ {
[Description("Contenedor lleno")] [Description("Contenedor lleno")]
@ -55,7 +59,11 @@ namespace OliviaAddInPro.Model
TiempoOutSocket = 20; TiempoOutSocket = 20;
} }
public void SimplificaConfig()
{
//}
}
#region PropiedadesOcultas #region PropiedadesOcultas
#region parametrosConexion #region parametrosConexion
/** /**
@ -195,8 +203,9 @@ namespace OliviaAddInPro.Model
[DisplayName("Eje via de red de carreteras")] [DisplayName("Eje via de red de carreteras")]
[Description("Eje de via de red de carreteras que se usara para la navegación")] [Description("Eje de via de red de carreteras que se usara para la navegación")]
[Editor(typeof(PropertyGridFilePickerLine), typeof(PropertyGridFilePickerLine))] [Editor(typeof(PropertyGridFilePickerLine), typeof(PropertyGridFilePickerLine))]
//[AtributoSimpleProperty]
//[Editor(typeof(EditorFilePickerDefinition), typeof(EditorFilePickerDefinition))] //[Editor(typeof(EditorFilePickerDefinition), typeof(EditorFilePickerDefinition))]
public string Path_Eje_via { get; set; } public virtual string Path_Eje_via { get; set; }
/* /*
[Category("General")] [Category("General")]
[DisplayName("Red de carreteras")] [DisplayName("Red de carreteras")]
@ -1317,5 +1326,24 @@ namespace OliviaAddInPro.Model
#endregion #endregion
} }
[Serializable]
class OliviaConfSimple: OliviaConf
{
[Browsable(false)]
public override string Path_Eje_via
{
get {
return base.Path_Eje_via;
}
set
{
base.Path_Eje_via = value;
}
}
}
} }

View File

@ -7,6 +7,7 @@ using System.Threading.Tasks;
using System.IO; using System.IO;
using Newtonsoft.Json; using Newtonsoft.Json;
using Microsoft.Win32; using Microsoft.Win32;
using System.Windows;
namespace OliviaAddInPro.Services namespace OliviaAddInPro.Services
{ {
@ -26,13 +27,23 @@ namespace OliviaAddInPro.Services
} }
} }
public OliviaConf Leer() public OliviaConf Leer(bool simplif=false)
{ {
var aa= System.Reflection.Assembly.GetEntryAssembly().Location;
var executingAssembly = System.Reflection.Assembly.GetExecutingAssembly(); //MyLibrary.dll
var callingAssembly = System.Reflection.Assembly.GetCallingAssembly(); //MyLibrary.dll
var entryAssembly = System.Reflection.Assembly.GetEntryAssembly(); //WpfApp.exe or MyLibrary.dll
OliviaConf res = null; OliviaConf res = null;
try try
{ {
res= JsonConvert.DeserializeObject<OliviaConf>(File.ReadAllText(GetPathConfig())); if(!simplif)
}catch(Exception e) res = JsonConvert.DeserializeObject<OliviaConf>(File.ReadAllText(GetPathConfig()));
else
res = JsonConvert.DeserializeObject<OliviaConfSimple>(File.ReadAllText(GetPathConfig()));
}
catch(Exception e)
{ {
var ee = e; var ee = e;
res = null; res = null;

View File

@ -44,7 +44,14 @@ namespace OliviaAddInPro
public void OnRefres() public void OnRefres()
{ {
Configuracion = ConfigServ.Serv.Leer(); ReferesConfig(true);
}
private void ReferesConfig(bool simplificado)
{
Configuracion = ConfigServ.Serv.Leer(simplificado);
} }
} }