property page fix
added some debug
This commit is contained in:
parent
bb4825939e
commit
8103cc041f
@ -658,6 +658,22 @@ namespace VEPROMS.CSLA.Library
|
|||||||
OnPropertyChanged("Print_Pagination");
|
OnPropertyChanged("Print_Pagination");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
[Category("Print Settings")]
|
||||||
|
[DisplayName("PDFLocation")]
|
||||||
|
[RefreshProperties(RefreshProperties.All)]
|
||||||
|
[Description("PDF Location")]
|
||||||
|
public string Print_PDFLocation
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return _Xp["PrintSettings", "PDFLocation"];
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_Xp["PrintSettings", "PDFLocation"] = value; // save selected value
|
||||||
|
OnPropertyChanged("Print_PDFLocation");
|
||||||
|
}
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
#region Unit // From PROC.INI
|
#region Unit // From PROC.INI
|
||||||
[Category("Unit")]
|
[Category("Unit")]
|
||||||
|
@ -155,13 +155,17 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (_Procedure != null && _Procedure.MyContent.MyFormat != null) return _Procedure.MyContent.MyFormat.PlantFormat.FormatData.Name;
|
if (_Procedure != null && _Procedure.MyContent.MyFormat != null) return _Procedure.MyContent.MyFormat.FullName; //.PlantFormat.FormatData.Name;
|
||||||
if (_ProcedureInfo != null && _ProcedureInfo.MyContent.MyFormat != null) return _ProcedureInfo.MyContent.MyFormat.PlantFormat.FormatData.Name;
|
if (_ProcedureInfo != null && _ProcedureInfo.MyContent.MyFormat != null) return _ProcedureInfo.MyContent.MyFormat.FullName;//.PlantFormat.FormatData.Name;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (_Procedure != null) _Procedure.MyContent.MyFormat = FormatList.ToFormat(value); // Can only be set if _DocVersion is set
|
if (_Procedure != null)
|
||||||
|
{
|
||||||
|
_Procedure.MyContent.MyFormat = FormatList.ToFormat(value); // Can only be set if _DocVersion is set
|
||||||
|
_Procedure.ActiveFormat = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
[Category("Format Settings")]
|
[Category("Format Settings")]
|
||||||
|
@ -354,11 +354,14 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
public FormatInfo ActiveFormat
|
public FormatInfo ActiveFormat
|
||||||
{
|
{
|
||||||
get { return LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat; }
|
get {return LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat;}
|
||||||
}
|
}
|
||||||
public FormatInfo LocalFormat
|
public FormatInfo LocalFormat
|
||||||
{
|
{
|
||||||
get { return MyFormat; }
|
get {
|
||||||
|
Console.WriteLine("DV Local {0} {1} {2}", (MyFormat == null) ? "MYformat is null" : MyFormat.Name,FormatID,(MyFormat == null)?0:MyFormat.FormatID);
|
||||||
|
return MyFormat;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
public ConfigDynamicTypeDescriptor MyConfig
|
public ConfigDynamicTypeDescriptor MyConfig
|
||||||
{
|
{
|
||||||
|
@ -1335,13 +1335,16 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
if (_ActiveFormat == null)
|
if (_ActiveFormat == null)
|
||||||
_ActiveFormat = (LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat);
|
_ActiveFormat = (LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat);
|
||||||
|
Console.WriteLine("Active {0}", (_ActiveFormat == null) ? "_ActiveFormat is null" : _ActiveFormat.Name);
|
||||||
return _ActiveFormat;
|
return _ActiveFormat;
|
||||||
}
|
}
|
||||||
//get { return LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat; }
|
//get { return LocalFormat != null ? LocalFormat : ActiveParent.ActiveFormat; }
|
||||||
}
|
}
|
||||||
public FormatInfo LocalFormat
|
public FormatInfo LocalFormat
|
||||||
{
|
{
|
||||||
get { return MyContent.MyFormat; }
|
get {
|
||||||
|
Console.WriteLine("Local {0}", (MyContent.MyFormat==null)?"MYformat is null": MyContent.MyFormat.Name);
|
||||||
|
return MyContent.MyFormat; }
|
||||||
}
|
}
|
||||||
private ConfigDynamicTypeDescriptor _MyConfig=null;
|
private ConfigDynamicTypeDescriptor _MyConfig=null;
|
||||||
public ConfigDynamicTypeDescriptor MyConfig
|
public ConfigDynamicTypeDescriptor MyConfig
|
||||||
|
Loading…
x
Reference in New Issue
Block a user