Compare commits

...

8 Commits

Author SHA1 Message Date
caeead0bc0 C2025-060 When format is updated in PROMS, auto-update the format cache so it doesn't require exiting PROMS and going back in. 2025-12-10 14:49:45 -05:00
f93204e37e Merge pull request 'F2025-041 Added a non-bolded high level CAS step type for use in single column attachment' (#670) from F2025-042_Vogtle3&4_nonboldCAS into Development
format only change - good for testing
2025-12-09 16:15:45 -05:00
e6af91c6ab F2025-041 Added a non-bolded high level CAS step type for use in single column attachment 2025-12-09 16:15:06 -05:00
c89428eed8 Merge pull request 'F2025-040 Added code to adjust the position of the CAS box around the high level step number in single column attachment sections' (#668) from F2025-040_VogtleSingleColAtt_ContActStep_Box into Development
Looks Good! Ready for QA!
2025-12-05 06:00:16 -05:00
b4f2b89139 F2025-040 Added code to adjust the position of the CAS box around the high level step number in single column attachment sections 2025-12-04 16:42:40 -05:00
aab7cdcf77 Merge pull request 'B2025-064 PROMS clears the windows clipboard when closing PROMS with tabs open.' (#667) from B2025-064 into Development
good for testing phase
2025-12-04 11:19:24 -05:00
47cdedefd4 B2025-064 PROMS clears the windows clipboard when closing PROMS with tabs open. 2025-12-04 10:41:37 -05:00
710145a32d Merge pull request 'B2019-140/B2022-099 After doing an Approval (final stage) of a procedure, the change bars do not reset on the screen.' (#666) from B2019-140_B2022-099 into Development
good for testing phase
2025-12-03 16:03:25 -05:00
4 changed files with 6 additions and 1 deletions

Binary file not shown.

View File

@@ -5380,6 +5380,8 @@ namespace VEPROMS
private void btnUpdateFormat_Click(object sender, EventArgs e) private void btnUpdateFormat_Click(object sender, EventArgs e)
{ {
UpdateFormats(null); UpdateFormats(null);
//C2025-060 When format is updated in PROMS, auto-update the format cache so it doesn't require exiting PROMS and going back in.
RefreshFormats(sender, null);
} }
private void UpdateFormats(string mypath) private void UpdateFormats(string mypath)

View File

@@ -1667,7 +1667,7 @@ namespace Volian.Controls.Library
} }
} }
Clipboard.Clear(); Clipboard.Clear();
Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard Clipboard.SetDataObject(myDO, true); // this saves the cleaned up information to the Windows clipboard
} }
iData = Clipboard.GetDataObject(); iData = Clipboard.GetDataObject();
bool noEquationData = true; bool noEquationData = true;

View File

@@ -6456,8 +6456,11 @@ namespace Volian.Print.Library
{ {
if (itemInfo.MyDocStyle.AlignHLSTabWithSect || itemInfo.FormatStepData.AlignHLSTabWithSectOvride) if (itemInfo.MyDocStyle.AlignHLSTabWithSect || itemInfo.FormatStepData.AlignHLSTabWithSectOvride)
{ {
float orgXOffset = MyTab.XOffset;
myTab.XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos; myTab.XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;
XOffset = myTab.XOffset + myTab.Width; XOffset = myTab.XOffset + myTab.Width;
// F2025-040 Adjust the Cont Act box position around HLS number
if (myTab.MyMacro != null) myTab.MyMacro.XOffset += (MyTab.XOffset - orgXOffset);
} }
else else
{ {