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

Development #292

Merged
djankowski merged 8 commits from Development into master 2024-04-05 10:54:58 -04:00
Conversation 0 Commits 8 Files Changed 8 +26 -19
8 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/BGEOIall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/BGESTPall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/GENall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGP2all.xml
View File

Binary file not shown.

7
PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
View File

@ -44,8 +44,11 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
[assembly: AssemblyVersion("2.1.2403.2209")] [assembly: AssemblyVersion("2.1.2404.509")]
[assembly: AssemblyFileVersion("2.1.2403.2209")] [assembly: AssemblyFileVersion("2.1.2404.509")]

5
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -4452,9 +4452,10 @@ namespace VEPROMS.CSLA.Library
} }
} }
// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step // F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0) // F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
{ {
localPrintLevel--; // since parent is a high level step we only need to go back one level localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
} }
if (!tbformat.Contains(@"{!C")) if (!tbformat.Contains(@"{!C"))

5
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -4508,8 +4508,9 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
} }
} }
private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS; // F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
public bool ResetSeqNumberingAfterUnnumberedHLS private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
public int? ResetSeqNumberingAfterUnnumberedHLS
{ {
get get
{ {

28
PROMS/Volian.Print.Library/PromsPrinter.cs
View File

@ -701,22 +701,24 @@ namespace Volian.Print.Library
{ {
if (File.Exists(outputFileName)) if (File.Exists(outputFileName))
{ {
String tmpExt = System.IO.Path.GetExtension(outputFileName); if (!BaselineTesting)
String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName);
String tmpFN = System.IO.Path.GetFileName(outputFileName);
String tmpFNNoExt = System.IO.Path.GetFileNameWithoutExtension(outputFileName);
var files = new HashSet<string>(Directory.GetFiles(tmpPTH, "*.pdf"));
//string baseName = Path.Combine(scpath, "Screenshot_");
string filename;
int i = 0;
do
{ {
filename = tmpPTH + @"\" + tmpFNNoExt + "_" + ++i + ".pdf"; String tmpExt = System.IO.Path.GetExtension(outputFileName);
} while (files.Contains(filename)); String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName);
String tmpFN = System.IO.Path.GetFileName(outputFileName);
String tmpFNNoExt = System.IO.Path.GetFileNameWithoutExtension(outputFileName);
outputFileName = filename; var files = new HashSet<string>(Directory.GetFiles(tmpPTH, "*.pdf"));
//string baseName = Path.Combine(scpath, "Screenshot_");
string filename;
int i = 0;
do
{
filename = tmpPTH + @"\" + tmpFNNoExt + "_" + ++i + ".pdf";
} while (files.Contains(filename));
outputFileName = filename;
}
} }
writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create)); writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create));