diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 21950d46..692b67bf 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -65,6 +65,12 @@ namespace VEPROMS.CSLA.Library public class VE_Font : vlnFormatItem { public VE_Font(XmlNode xmlNode) : base(xmlNode) { } + public VE_Font(string family, int size, E_Style style) + { + _Family = new LazyLoad(family); + _Size = new LazyLoad(size); + _Style = new LazyLoad(style); + } private LazyLoad _Family; private Font _WindowsFont; public Font WindowsFont @@ -116,6 +122,10 @@ namespace VEPROMS.CSLA.Library { return LazyLoad(ref _Style, "Font/@Style"); } + //set + //{ + // _Style.Value = value; + //} } public override string ToString() { @@ -4336,6 +4346,14 @@ namespace VEPROMS.CSLA.Library return String.Format("{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}", BXURC, BXHorz, BXULC, BXVert, BXMLS, BXMRS, BXLRC, BXLLC, BXMID, BXLHorz, BXUMID, BXLMID); } + public string BoxStyle + { + get + { + return String.Format("{0}.{1}.{2}.{3}.{4}.{5}.{6}.{7}.{8}.{9}.{10}.{11}", + BXURC ?? " ", BXHorz ?? " ", BXULC ?? " ", BXVert ?? " ", BXMLS ?? " ", BXMRS ?? " ", BXLRC ?? " ", BXLLC ?? " ", BXMID ?? " ", BXLHorz ?? BXHorz, BXUMID ?? " ", BXLMID ?? " "); + } + } } #endregion #region BoxList diff --git a/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs index 980b2e93..cdee4cce 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs @@ -55,6 +55,7 @@ namespace VEPROMS.CSLA.Library */ if (xmlNode == null) return null; XmlNode xn = xmlNode.SelectSingleNode(path); + if (xmlNode.Name == "Box") return xn; // if box, don't do inheritance. if (xn != null) return xn; //if (path.Contains("Font")) Console.WriteLine("vlnFormatDocument.LookupSingleNode {0},{1}", xmlNode.Name == "Step" ? "Step." + xmlNode.Attributes["Type"].Value : xmlNode.Name, path); if (xmlNode.Name == "Step") xn = LookupSingleStepNode(xmlNode, path); // Check for Step Inheritance