Empty Genmac fix, split cover page title fix

logic for Delta on HLS tab, better check for proportional font
different way to register fonts , check for null base font
fixed problem of too many carriage returns in some plot definitions.
This commit is contained in:
2011-11-21 20:55:31 +00:00
parent babe5482b2
commit 1ebcd90f48
4 changed files with 64 additions and 17 deletions

View File

@@ -401,6 +401,10 @@ namespace Volian.Print.Library
VEPROMS.CSLA.Library.FormatInfo activeFormat = mySection.ActiveFormat;
VEPROMS.CSLA.Library.DocStyle docStyle = mySection.MyDocStyle;
Volian.Svg.Library.Svg mySvg = null;
//string jsj = BuildMyText(activeFormat);
//if (jsj == "")
// Console.WriteLine("here");
//mySvg = SvgSerializer<Volian.Svg.Library.Svg>.StringDeserialize(jsj);
mySvg = SvgSerializer<Volian.Svg.Library.Svg>.StringDeserialize(BuildMyText(activeFormat));
mySvg.ViewBox.Height = 1100;
mySvg.ViewBox.Width = 850;
@@ -506,7 +510,8 @@ namespace Volian.Print.Library
sGenMac = tmpf.GenMac;
tmpf = FormatInfo.Get(tmpf.ParentID);
}
if (sGenMac == null || sGenMac == "") return "";
if (sGenMac == null || sGenMac == "")
sGenMac = "<svg/>";// return "";
}
if (!sGenMac.Contains("xmlns"))
sGenMac = sGenMac.Replace("<svg ", "<svg xmlns='http://www.w3.org/2000/svg' ");
@@ -622,7 +627,7 @@ namespace Volian.Print.Library
case "{PROCTITLE2}":
case "{COVERPROCTITLE}":
float linelen = (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength * (float)pageItem.Font.CPI / 12;
SplitTitle(svgGroup, pageItem, section.MyProcedure.MyContent.Text, (int)linelen, token); //,rowAdj);
SplitTitle(svgGroup, pageItem, section.MyProcedure.MyContent.Text.ToUpper(), (int)linelen, token); //,rowAdj);
//SplitTitle(svgGroup, pageItem, section.MyProcedure.MyContent.Text, (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength, token);
break;
case "{COVERTITLE1}":