B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.

Merge pull request 'Rollback_B2025-064' (#674 ) from Rollback_B2025-064 into Development
merged into development.
2026-01-02 15:12:54 -05:00 · 2025-12-16 14:50:13 -05:00 · 2025-12-16 14:41:39 -05:00 · 2025-12-16 14:38:41 -05:00 · 2025-12-16 08:46:30 -05:00
2 changed files with 11 additions and 12 deletions
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
@@ -1363,9 +1363,14 @@ namespace VEPROMS.CSLA.Library
 								// An X/Y Plot RO type might have text preceding the Plot Commands
 								int pstart = roValue.IndexOf("<<G"); //  find the starting Plot Command

+								//B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.
+								//get x-offset
+								float fx1 = (float)MyApp.ActiveDocument.Range(sel.Start, sel.Start).get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage);
+								fx1 -= (float)MyApp.ActiveDocument.Range(0, 0).get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage);
+
 								// B2017-217 Added logic so that underscores are not converted to underline
 								// C2018-003 fixed use of getting the active section
-								AddPrecedingText(sel, roValue.Substring(0, pstart), 0.0F, (sect.ActiveSection != null) ? sect.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertUnderscoreToUnderline : false);// replace the RO token with what's in front of the X/Y Plot
+								AddPrecedingText(sel, roValue.Substring(0, pstart), fx1, (sect.ActiveSection != null) ? sect.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertUnderscoreToUnderline : false);// replace the RO token with what's in front of the X/Y Plot
 								roValue = roValue.Substring(pstart); // set rovalue to the start of the plot commands

 								pngFile = VlnSettings.TemporaryFolder + @"\XYPlot1.png"; //@"C:\Temp\XYPlot1.png";
@@ -1386,6 +1391,10 @@ namespace VEPROMS.CSLA.Library

 								float yAdjust = sel.Font.Size;
 								float yyy = yAdjust + y + plotRect.Y;
+
+								//B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.
+								xxx += fx1; //shift by x-offset
+
 								LBShape shape = myDoc.Shapes.AddPicture(pngFile, xxx, yyy, sel.Range);

 								try
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -1668,18 +1668,8 @@ namespace Volian.Controls.Library
 						}
 						Clipboard.Clear();

-						//Try to update the data object to persist beyond PROMS life
-						//if can't, log it and use old method of scoping clipboard to PROMS life
-						try
-						{
-							Clipboard.SetDataObject(myDO, true); // this saves the cleaned up information to the Windows clipboard		
-						}
-						catch (Exception ex)
-						{
-                            _MyLog.Warn($"Error Setting Clipboard Object to Persist beyond PROMS. Clipboard will be scoped to PROMS. Error:{ex.Message}");
 						Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
 					}
-					}
 					iData = Clipboard.GetDataObject();
 					bool noEquationData = true;
 					// part of bug B2017-117 we were running out of window handles when printing, found this similar use of
Author	SHA1	Message	Date
mschill	dae850616d	B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.	2026-01-02 15:12:54 -05:00
John Jenko	149e114359	Merge pull request 'Rollback_B2025-064' (#674 ) from Rollback_B2025-064 into Development merged into development.	2025-12-16 14:50:13 -05:00
mschill	7d63e7e417	Rollback_B2025-064 - Rolling back changes for B2025-064 - that CSM item will be re-opened and revisited late January once vogtle is out.	2025-12-16 14:41:39 -05:00
mschill	d12e5d19c9	Rollback_B2025-064 - Rolling back changes for B2025-064 - that CSM item will be re-opened and revisited late January once vogtle is out.	2025-12-16 14:38:41 -05:00
John Jenko	7a6b3b7a86	Merge pull request 'Code Cleanup - Added a debug for developers around Clipboard setting Data Objects via the StepTabRibbon. Will be verified during the internal vogtle cleanup.' (#673 ) from Code_Cleanup_12_16_2025 into Development Reviewed-on: #673 Reviewed-by: John Jenko <jjenko@volian.com> Passed review. merging into development	2025-12-16 08:46:30 -05:00