Merge pull request 'Development' (#189) from Development into master
Initial check-in of Vogtle Background formats. No testing required since formats are under development.
This commit is contained in:
commit
517ebe2902
@ -301,6 +301,7 @@
|
|||||||
<Content Include="fmtall\SHESAMall.xml" />
|
<Content Include="fmtall\SHESAMall.xml" />
|
||||||
<Content Include="fmtall\SHESSDall.xml" />
|
<Content Include="fmtall\SHESSDall.xml" />
|
||||||
<Content Include="fmtall\SHESSD_00all.xml" />
|
<Content Include="fmtall\SHESSD_00all.xml" />
|
||||||
|
<Content Include="fmtall\VEGPBckall.xml" />
|
||||||
<Content Include="fmtall\VEGP1all.xml" />
|
<Content Include="fmtall\VEGP1all.xml" />
|
||||||
<Content Include="fmtall\VEGP2all.xml" />
|
<Content Include="fmtall\VEGP2all.xml" />
|
||||||
<Content Include="fmtall\VEGPAlrall.xml" />
|
<Content Include="fmtall\VEGPAlrall.xml" />
|
||||||
@ -376,7 +377,7 @@
|
|||||||
<Content Include="fmtall\wst1all.xml" />
|
<Content Include="fmtall\wst1all.xml" />
|
||||||
<Content Include="fmtall\wst2all.xml" />
|
<Content Include="fmtall\wst2all.xml" />
|
||||||
<Content Include="fmtall\wstalrall.xml" />
|
<Content Include="fmtall\wstalrall.xml" />
|
||||||
<Content Include="fmtall\VEGPBckall.xml" />
|
<Content Include="fmtall\VEGPBckStpsall.xml" />
|
||||||
<Content Include="fmtall\wstbckall.xml" />
|
<Content Include="fmtall\wstbckall.xml" />
|
||||||
<Content Include="fmtall\wstcklall.xml" />
|
<Content Include="fmtall\wstcklall.xml" />
|
||||||
<Content Include="fmtall\wstdcsall.xml" />
|
<Content Include="fmtall\wstdcsall.xml" />
|
||||||
@ -512,6 +513,7 @@
|
|||||||
<Content Include="genmacall\shesam.svg" />
|
<Content Include="genmacall\shesam.svg" />
|
||||||
<Content Include="genmacall\shessd.svg" />
|
<Content Include="genmacall\shessd.svg" />
|
||||||
<Content Include="genmacall\VEGPBck.svg" />
|
<Content Include="genmacall\VEGPBck.svg" />
|
||||||
|
<Content Include="genmacall\VEGPBckStps.svg" />
|
||||||
<Content Include="genmacall\VEGP1.svg" />
|
<Content Include="genmacall\VEGP1.svg" />
|
||||||
<Content Include="genmacall\VEGP2.svg" />
|
<Content Include="genmacall\VEGP2.svg" />
|
||||||
<Content Include="genmacall\VEGPAlr.svg" />
|
<Content Include="genmacall\VEGPAlr.svg" />
|
||||||
|
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/fmtall/VEGPBckStpsall.xml
Normal file
BIN
PROMS/Formats/fmtall/VEGPBckStpsall.xml
Normal file
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/genmacall/VEGPBckStps.svg
Normal file
BIN
PROMS/Formats/genmacall/VEGPBckStps.svg
Normal file
Binary file not shown.
@ -4104,7 +4104,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID);
|
ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID);
|
||||||
if (srcItem == null) return null;
|
if (srcItem == null) return null;
|
||||||
|
|
||||||
if (srcItem.IsHigh) return srcItem.Ordinal;
|
if (srcItem.IsHigh || srcItem.IsSection || srcItem.IsProcedure) return srcItem.Ordinal;
|
||||||
// B2018-118: the LinkedOrdinal count must take into account cautions versus notes types:
|
// B2018-118: the LinkedOrdinal count must take into account cautions versus notes types:
|
||||||
ItemInfo hls = srcItem.MyHLS;
|
ItemInfo hls = srcItem.MyHLS;
|
||||||
bool enIsCaution = this.IsCaution;
|
bool enIsCaution = this.IsCaution;
|
||||||
|
@ -171,7 +171,8 @@ namespace VEPROMS.CSLA.Library
|
|||||||
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.
|
DSS_WordContentLandscaped = 0x800000000, // for this section, the word content is landscaped.
|
||||||
DSS_ChklstEditSize = 0x100000000, // Westinghouse checklist - edit window size
|
DSS_ChklstEditSize = 0x100000000, // Westinghouse checklist - edit window size
|
||||||
DSS_SameXOffSubsections = 0x2000000000, // print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
|
DSS_SameXOffSubsections = 0x2000000000, // print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
|
||||||
|
DSS_PageListBkgndStpContMsg = 0x4000000000, // Background Step Number printed via Pagelist with "{CM:(Cont)}" which will print "(cont)" next to step number if it's continued to the next page - (VEGPBckStp) F2023-112
|
||||||
};
|
};
|
||||||
public enum E_DocStyleUse : uint
|
public enum E_DocStyleUse : uint
|
||||||
{
|
{
|
||||||
|
@ -1912,7 +1912,11 @@ namespace Volian.Print.Library
|
|||||||
float bcm_yLocation = TableBottom == -1 ? yLocation: Math.Min(TableBottom,yLocation);
|
float bcm_yLocation = TableBottom == -1 ? yLocation: Math.Min(TableBottom,yLocation);
|
||||||
DoBottomContinueMsg(cb, yBottomMargin, bcm_yLocation, docstyle, doThreeContinues);
|
DoBottomContinueMsg(cb, yBottomMargin, bcm_yLocation, docstyle, doThreeContinues);
|
||||||
MyPromsPrinter.NewPage();
|
MyPromsPrinter.NewPage();
|
||||||
if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null && ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd))) // C2018-003 fixed use of getting the active section
|
// C2018-003 fixed use of getting the active section
|
||||||
|
// F2023-112 Vogtle Units 3 & 4 background document format DSS_PageListBkgndStpContMsg to print continue message next to step number
|
||||||
|
if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null &&
|
||||||
|
((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) ||
|
||||||
|
((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListBkgndStpContMsg) == E_DocStructStyle.DSS_PageListBkgndStpContMsg)))
|
||||||
{
|
{
|
||||||
// check if parent (can be HLS, Caution or Note) has the UseOldTemplate. If so,
|
// check if parent (can be HLS, Caution or Note) has the UseOldTemplate. If so,
|
||||||
// flag that a continue message should be printed as part of a pagelist header (if pagelist
|
// flag that a continue message should be printed as part of a pagelist header (if pagelist
|
||||||
|
Loading…
x
Reference in New Issue
Block a user