Compare commits

...

21 Commits

Author SHA1 Message Date
78f83eb2a5 B2024-013 - Fixed issue where hard returns are replaced with semi-colons in section titles in Automatic Table of Contents and will use the hard return when printing the section title for Vogtle’s Units 3 & 4 formats. 2024-03-04 10:40:10 -05:00
e38a706931 Merge pull request '~Removed previous edits and added "Dashed Equipment List" type' (#255) from F2024-020 into Development
Merged into Development.  No code review needed since formats are under development.
2024-02-29 11:25:30 -05:00
8a8507395f ~Removed previous edits and added "Dashed Equipment List" type 2024-02-29 11:25:52 -05:00
e0faa6403f Merge pull request 'F2024-020' (#254) from F2024-020 into Development
Merging into Development.  No code review needed since formats are under development.
2024-02-29 10:43:51 -05:00
88391824eb ~Re-committing after merge conflict 2024-02-29 10:43:05 -05:00
b6f1c9cdb5 ~Added a Dashed Single Spaced List to the VEGP2 format 2024-02-29 10:35:53 -05:00
3a44d4cd0e Merge pull request '~Added the word "Step" after "Go To" and to the Through and And transition types.' (#251) from F2024-022 into Development
Merging into Development.  No code review needed since formats are under development.
2024-02-29 09:00:35 -05:00
e6f9ae3623 ~Added the word "Step" after "Go To" and to the Through and And transition types. 2024-02-29 08:59:45 -05:00
8fa08b09fa Merge pull request 'C2024-003-Print-Sub-Section' (#241) from C2024-003 into Development
ready to build and test
2024-02-28 10:46:06 -05:00
578b8842f7 C2024-003-print-sub-section 2024-02-28 09:16:47 -05:00
1db167e5ca Merge pull request 'F2024-026 - Added a transition type that is just a section number in parentheses in the Vogtle Alarms format.' (#249) from Vogtle3&4 into Development
format only change
2024-02-27 15:22:15 -05:00
fcaa0ce41d C2024-003-print-sub-section 2024-02-27 12:02:21 -05:00
3710e871a9 Merge remote-tracking branch 'origin/Development' into C2024-003 2024-02-27 10:31:20 -05:00
15048a317f Merge remote-tracking branch 'origin/Development' into C2024-003 2024-02-27 09:11:59 -05:00
9e56422df8 C2024-003-print-sub-section 2024-02-26 23:00:29 -05:00
092ed83ca4 C2024-003-print-sub-section 2024-02-26 16:06:04 -05:00
6078d30a94 Revert "F2024-006 Fixed pagination logic to that step text at the bottom of an Alarm Point page does not print on top of the bottom continue message"
This reverts commit 82fa4f1e74882ba3024656ea735087d8dc0f7c79.
2024-02-26 15:08:52 -05:00
9804cf0fce C2024-003-print-sub-section 2024-02-26 12:48:54 -05:00
72457d956e C2024-003-print-sub-section 2024-02-26 10:04:57 -05:00
837978da92 C2024-003-print-sub-sections 2024-02-25 21:40:27 -05:00
dcfdf5f852 C2024-003-Print-Sub-Section 2024-02-22 16:54:56 -05:00
4 changed files with 29 additions and 7 deletions

Binary file not shown.

Binary file not shown.

View File

@ -2932,7 +2932,19 @@ namespace VEPROMS.CSLA.Library
string str = MyContent.Text;
// B2022-035: resolve unit specific designators
if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
return ConvertToDisplayText(str, false);
return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon
}
}
// B2024-013 added for Vogtle Units 3 & 4, used with {TOPSECTIONTITLE} pagelist item
// this will format the text and keep the hard return command
public string FormattedDisplayTextKeepHardReturn
{
get
{
string str = MyContent.Text;
// B2022-035: resolve unit specific designators
if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return
}
}
// Used in Comanche Peak EOP and Flex formats for step designators. Will allow a hard return to be used that that caution type.
@ -3109,7 +3121,12 @@ namespace VEPROMS.CSLA.Library
return ConvertToDisplayText(txt, true);
}
public static string ConvertToDisplayText(string txt, bool stripRTF)
// B2024-013 This allos us to control "what with" or "whether to" replace hard returns
// Semi-colons where printing on auto table of contents for section titles with hard returns
// added HardReturnChar string to parameter. The default is to use the semi-colon, for auto table of contents
// we replace it with a space, for Vogtle Unit 3 & 4 we retain the hard return when printing the section
public static string ConvertToDisplayText(string txt, bool stripRTF, string HardReturnChar = ";")
{
string retval = txt;
@ -3120,9 +3137,12 @@ namespace VEPROMS.CSLA.Library
retval = ReplaceSpecialCharacters(retval);
retval = retval.Replace("\u2011", "-");
retval = retval.Replace("\u2572", @"\"); // replace backslash symbol with a backslash
retval = Regex.Replace(retval, @"\\line ?", ";"); // better handing of hard returns - replace with semi-colon for use on tree view
retval = retval.Replace("\r\n", ";");
retval = retval.Replace("\n", ";"); //added for consistency checking with approved version
if (HardReturnChar != "") // B2024-013 if a null string don't replace the hard return
{
retval = Regex.Replace(retval, @"\\line ?", HardReturnChar); // better handing of hard returns - replace with semi-colon for use on tree view
retval = retval.Replace("\r\n", HardReturnChar);
retval = retval.Replace("\n", HardReturnChar); //added for consistency checking with approved version
}
}
return retval;

View File

@ -2023,15 +2023,17 @@ i = 0;
break;
case "{TOPSECTIONTITLE}": // This will print the top level section title
case "[TOPSECTIONTITLE]":
// get top most section:
// get top most section: put in for Vogtle Units 3 & 4 formats
{
ItemInfo top = section;
while (top.MyParent != null && !top.MyParent.IsProcedure)
{
top = top.MyParent;
}
// B2024-013 changed to use the FormattedDisplayTextKeepHardReturn instead of display text for the section title
// this gives us to use the hard return that the user placed in the section title
if (top.IsSection)
plstr = SplitTitle(svgGroup, pageItem, top.DisplayText, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength);
plstr = SplitTitle(svgGroup, pageItem, top.FormattedDisplayTextKeepHardReturn, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength);
else
plstr = plstr.Replace(token, string.Empty);
}