Compare commits

..

9 Commits

Author SHA1 Message Date
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
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
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
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
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
97fc02b601 Code Cleanup - Added a debug for developers around Clipboard setting Data Objects via the StepTabRibbon. Will be verified during the internal vogtle cleanup. 2025-12-16 06:03:18 -05:00
9485403712 Merge pull request 'C2025-060 When format is updated in PROMS, auto-update the format cache so it doesn't require exiting PROMS and going back in.' (#671) from C2025-060 into Development
good for testing phase
2025-12-10 14:53:31 -05:00
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
3 changed files with 14 additions and 2 deletions

View File

@@ -5380,6 +5380,8 @@ namespace VEPROMS
private void btnUpdateFormat_Click(object sender, EventArgs e)
{
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)

View File

@@ -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

View File

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