added Docstyle format flag DSS_WordContentLandscaped to flag that Word content is landscaped

don’t change level for steps under sequentials (only under notes/cautions/equipment lists)
use Docstyle format flag DSS_WordContentLandscaped to make End message landscaped
This commit is contained in:
Kathy Ruffing 2014-11-18 15:12:23 +00:00
parent 443dc9adaf
commit 85a8a26504
4 changed files with 11 additions and 1 deletions

Binary file not shown.

View File

@ -2930,7 +2930,8 @@ namespace VEPROMS.CSLA.Library
// Check to be sure the parent tab should be included... If this sequential is within a note // Check to be sure the parent tab should be included... If this sequential is within a note
// or caution or equipment list, don't use parent tab AND always start the numbering as a numeric // or caution or equipment list, don't use parent tab AND always start the numbering as a numeric
if (doMeta && IsSequential && (InNote() || InCaution() || MyParent.IsEquipmentList)) if (doMeta && IsSequential && (InNote() || InCaution() ||
(MyParent.IsEquipmentList && !MyParent.FormatStepData.TabData.IdentPrint.Contains("{seq}"))))
{ {
// if immediate parent is note, caution or equip, use numeric, otherwise use alpha. // if immediate parent is note, caution or equip, use numeric, otherwise use alpha.
localPrintLevel = 0; localPrintLevel = 0;

View File

@ -168,6 +168,7 @@ namespace VEPROMS.CSLA.Library
DSS_DontDoCheckOffs = 0x100000000, // format has checkoffs, but don't do for this section DSS_DontDoCheckOffs = 0x100000000, // format has checkoffs, but don't do for this section
DSS_PageListSpBckgrnd = 0x200000000, // this background document style has special formatting: margins, title with cont and non underlined header (IP2BCK) DSS_PageListSpBckgrnd = 0x200000000, // this background document style has special formatting: margins, title with cont and non underlined header (IP2BCK)
DSS_PageListAddSectCont = 0x400000000, // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs) DSS_PageListAddSectCont = 0x400000000, // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs)
DSS_WordContentLandscaped = 0x800000000, // for this section, the word content is landscaped.
}; };
public enum E_DocStyleUse : uint public enum E_DocStyleUse : uint
{ {

View File

@ -723,7 +723,15 @@ namespace Volian.Print.Library
float wtpm = (float)mySection.MyDocStyle.Layout.PageWidth - (float)mySection.MyDocStyle.Layout.LeftMargin; float wtpm = (float)mySection.MyDocStyle.Layout.PageWidth - (float)mySection.MyDocStyle.Layout.LeftMargin;
float centerpos = (float)mySection.MyDocStyle.Layout.LeftMargin + (wtpm - (mySection.MyDocStyle.End.Message.Length * mySection.MyDocStyle.End.Font.CharsToTwips)) / 2; float centerpos = (float)mySection.MyDocStyle.Layout.LeftMargin + (wtpm - (mySection.MyDocStyle.End.Message.Length * mySection.MyDocStyle.End.Font.CharsToTwips)) / 2;
float yBottomMargin = Math.Max(0, (float)mySection.MyDocStyle.Layout.TopMargin - (float)mySection.MyDocStyle.Layout.PageLength - 2 * vlnPrintObject.SixLinesPerInch); float yBottomMargin = Math.Max(0, (float)mySection.MyDocStyle.Layout.TopMargin - (float)mySection.MyDocStyle.Layout.PageLength - 2 * vlnPrintObject.SixLinesPerInch);
bool landscape = (mySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_WordContentLandscaped) == E_DocStructStyle.DSS_WordContentLandscaped;
if (landscape)
{
cb.SaveState();
System.Drawing.Drawing2D.Matrix myMatrix = new System.Drawing.Drawing2D.Matrix(0, 1, -1, 0, cb.PdfDocument.PageSize.Height, 0);
cb.Transform(myMatrix);
}
Rtf2Pdf.TextAt(cb, para, centerpos, ylocation + 6, 100, 12, "", yBottomMargin); Rtf2Pdf.TextAt(cb, para, centerpos, ylocation + 6, 100, 12, "", yBottomMargin);
if (landscape) cb.RestoreState();
} }
} }
OnStatusChanged("Merge MSWord", PromsPrinterStatusType.MergeMSWord); OnStatusChanged("Merge MSWord", PromsPrinterStatusType.MergeMSWord);