Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2012-10-26 10:39:26 +00:00
parent bce4130e0e
commit 0614d01751
1 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -307,6 +307,13 @@ namespace Volian.Print.Library
get { return _RevDate; } get { return _RevDate; }
set { _RevDate = value; } set { _RevDate = value; }
} }
private bool _DoFloatingFoldout = true;
public bool DoFloatingFoldout
{
get { return _DoFloatingFoldout; }
set { _DoFloatingFoldout = value; }
}
private List<vlnChangeBar> _MyChangeBars = new List<vlnChangeBar>(); private List<vlnChangeBar> _MyChangeBars = new List<vlnChangeBar>();
public List<vlnChangeBar> MyChangeBars public List<vlnChangeBar> MyChangeBars
{ {
@ -537,6 +544,26 @@ namespace Volian.Print.Library
case E_NumberingSequence.WithinEachSection: case E_NumberingSequence.WithinEachSection:
key = key + "." + MySection.ItemID; key = key + "." + MySection.ItemID;
break; break;
case E_NumberingSequence.WithStepsAndSecondaryPageNumber:
// For this one, we'll do two keys and templates. One will go with the main steps
// section and one will be for this secondary section.
ProcedureInfo pc1 = MySection.MyProcedure;
int psectid = 0;
foreach (SectionInfo si in pc1.Sections)
{
SectionConfig sc = si.MyConfig as SectionConfig;
if (sc.Section_OriginalSteps == "Y")
{
psectid = si.ItemID;
break;
}
}
if (psectid != 0)
{
key = (int)E_NumberingSequence.WithinEachSection + "." + psectid;
PdfTemplate tmp1 = MyPageCounts.AddToTemplateList(key, MyPdfWriter, args.MyText, args.MySvgText.Font, args.MySvgText.Align, args.MySvgText.FillColor);
}
break;
} }
PdfTemplate tmp = MyPageCounts.AddToTemplateList(key, MyPdfWriter, args.MyText, args.MySvgText.Font, args.MySvgText.Align, args.MySvgText.FillColor); PdfTemplate tmp = MyPageCounts.AddToTemplateList(key, MyPdfWriter, args.MyText, args.MySvgText.Font, args.MySvgText.Align, args.MySvgText.FillColor);
// Proms page numbering designed requires a "{PAGE}" token to increment the page counter. So the easiest way // Proms page numbering designed requires a "{PAGE}" token to increment the page counter. So the easiest way
@ -1172,14 +1199,26 @@ namespace Volian.Print.Library
return CurrentPageNumber.ToString(); return CurrentPageNumber.ToString();
case "{OF}": // Total Page Count for this section case "{OF}": // Total Page Count for this section
return CurrentPageOf.ToString(); return CurrentPageOf.ToString();
case "{REVDATE}": // Revision Date case "{REV}": // Revision Number and/or Revision string.
if (RevDate == null || RevDate == "") return DateTime.Now.ToShortDateString(); case "{REV2}":
return RevDate; // The 16bit code has a revision number & then a revision date. This revision date
case "{REV}": // Revision Number // was actually either a date OR a string. The 32bit code no longer will call this
// 16-bit had very specific code to check for first character // token or string RevDate. HLP procs & stpdif show the different types of data
// == to a ' ' (space) and if so, start Rev from second character. // that are used.
if (Rev !=null && Rev != "" && Rev[0] == ' ') return Rev.Substring(1, Rev.Length - 1);
return Rev; // 16-bit had code to string preceeding blanks.
if (Rev != null && Rev != "") Rev = Rev.TrimStart(" ".ToCharArray());
// Now check the format flags to determine if/how the Rev string should be parsed.
if ((MySection.ActiveFormat.PlantFormat.FormatData.PrintData.DoRevDate && Rev.Contains("/"))
|| (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.RevDateWithForwardSlash && Rev.Contains("\\")))
{
int indx = Rev.IndexOf(MySection.ActiveFormat.PlantFormat.FormatData.PrintData.DoRevDate?'/':'\\');
if (match.Value == "{REV}") return Rev.Substring(0,indx);
return Rev.Substring(indx+1);
}
if (match.Value == "{REV}")return Rev;
return System.DateTime.Today.ToShortDateString();
case "{CHKOFFHEADING}": case "{CHKOFFHEADING}":
return PageListTopCheckOffHeader; return PageListTopCheckOffHeader;
} }