NSPIFG support

NSPIFG2 missing genmac
NSP IFG improvements
This commit is contained in:
2013-07-17 13:09:04 +00:00
parent 60fc6bbd18
commit 15efb46dd3
7 changed files with 61 additions and 18 deletions

View File

@@ -507,9 +507,11 @@ namespace Volian.Print.Library
set { _MyPromsPrinter = value; }
}
private int _MyRomanPage = 1;
public VlnSvgPageHelper(VEPROMS.CSLA.Library.SectionInfo mySection,PromsPrinter myPromsPrinter,string hlsText) : base()
public VlnSvgPageHelper(VEPROMS.CSLA.Library.SectionInfo mySection, PromsPrinter myPromsPrinter, string hlsText, int hlsItemId)
: base()
{
HLSText = hlsText;
HasHLSTextId = hlsItemId;
MySection = mySection;
MyPromsPrinter = myPromsPrinter;
}
@@ -531,7 +533,7 @@ namespace Volian.Print.Library
//}
VEPROMS.CSLA.Library.FormatInfo activeFormat = mySection.ActiveFormat;
VEPROMS.CSLA.Library.DocStyle docStyle = mySection.MyDocStyle;
Volian.Svg.Library.Svg mySvg = null;
Volian.Svg.Library.Svg mySvg = null;
mySvg = SvgSerializer<Volian.Svg.Library.Svg>.StringDeserialize(BuildMyText(activeFormat));
mySvg.ViewBox.Height = 1100;
mySvg.ViewBox.Width = 850;
@@ -753,6 +755,8 @@ namespace Volian.Print.Library
//float rowAdj = 0; // = 18;
foreach (VEPROMS.CSLA.Library.PageItem pageItem in pageStyle.PageItems)
{
if (pageItem.Token == null) continue; // can be null if token is dependent on PSI lookup!
DidHLSText = false; // reset to false for this group of tokens.
//if (pageItem.Token.Contains("HLSTEXT"))
// Console.WriteLine("{0} - PageList Token", pageItem.Token);
@@ -866,11 +870,17 @@ namespace Volian.Print.Library
}
return deflt;
}
private bool _HasHLSText = false;
public bool HasHLSText
private bool _DidHLSText = false;
public bool DidHLSText
{
get { return _HasHLSText; }
set { _HasHLSText = value; }
get { return _DidHLSText; }
set { _DidHLSText = value; }
}
private int _HasHLSTextId = 0;
public int HasHLSTextId
{
get { return _HasHLSTextId; }
set { _HasHLSTextId = value; }
}
private string _HLSText = "";
public string HLSText
@@ -1049,9 +1059,8 @@ namespace Volian.Print.Library
PageListCheckOffHeader = PageItemToSvgText(pageItem, pageItem.Token, vf, section);
break;
case "{HLSTEXT}":
HasHLSText = true;
DidHLSText = true;
plstr = plstr.Replace(token, HLSText);
Console.WriteLine("'{0}' pagelist", plstr);
break;
default:
if (token.Contains(@"RO-"))