Compare commits

..

11 Commits

Author SHA1 Message Date
fe90af5aa4 Merge pull request 'B2026-021-some-symbols-not-being-displayed-correctly' (#726) from B2026-021-some-symbols-not-being-displayed-correctly into Development
good for testing phase
2026-02-27 13:34:23 -05:00
7e672d91e9 Merge branch 'Development' of https://git.volian.com/Volian/SourceCode into Development 2026-02-27 12:07:26 -05:00
09f472bee2 Merge pull request 'F2026-011 Vogtle Units 3&4 Backgrounds. Adjusted the section title text for the section 5.0 continue message so that it aligns with the background text on the page' (#725) from F2026-011_VogtleBackgrounds_sect_title_adj into Development
format only change
2026-02-27 10:35:25 -05:00
d2082cdbea Merge pull request 'B2026-019' (#724) from B2026-019 into Development
good for testing
2026-02-27 10:11:28 -05:00
c42596811e Merge branch 'Development' into B2026-019 2026-02-27 10:05:26 -05:00
d095a19187 Merge branch 'B2026-019' of https://git.volian.com/Volian/SourceCode into B2026-019 2026-02-27 10:06:42 -05:00
8089e2c898 B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open 2026-02-27 10:06:24 -05:00
bef9be5cbe Merge branch 'Development' of https://git.volian.com/Volian/SourceCode into Development 2026-02-26 15:44:46 -05:00
21890e74fe Merge branch 'Development' of https://git.volian.com/Volian/SourceCode into Development 2026-02-26 14:33:59 -05:00
bb7b892f7c Merge branch 'Development' of https://git.volian.com/Volian/SourceCode into Development 2026-02-25 15:51:27 -05:00
ded6f18dd5 Development 2026-02-25 15:27:25 -05:00
3 changed files with 24 additions and 18 deletions

View File

@@ -32,7 +32,7 @@ namespace ctlXMLEditLib
public void InsertSymbol( int symbcode)
{
int position = this.SelectionStart;
string sym = string.Format(symbcode < 256 ? "\'{0:X2}" : @"\u{0}", symbcode);
string sym = symbcode < 256 ? ((char)symbcode).ToString() : string.Format(@"\u{0}", symbcode);
this.SelectedRtf = RtfPrefixForSymbols + sym + @"}";
Select(position, -1);
Select(position + 1, 0);

View File

@@ -637,6 +637,8 @@ namespace VEPROMS
DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
if (dti != null)
{
_ = ItemInfo.ResetProcedure(pi.ItemID, true);
if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
dti.MyStepTabPanel.MyStepPanel.Focus();

View File

@@ -3849,7 +3849,7 @@ namespace VEPROMS.CSLA.Library
// When This occurs, it will cause a
// "ThreadException ... Collection was modified; enumeration operation may not execute.”
// **********************
public static ProcedureInfo ResetProcedure(int procID)
public static ProcedureInfo ResetProcedure(int procID, bool resetindisplaytab = false)
{
// The following lines reload the procedure info cache
ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
@@ -3867,6 +3867,8 @@ namespace VEPROMS.CSLA.Library
ItemInfo newprocitem = Get(procID, true);
newprocitem.RefreshConfig();
if (!resetindisplaytab)
{
//Reload all the child/sub items
#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
//otherwise will get a "Collection was modified; enumeration operation may not execute" error
@@ -3887,6 +3889,8 @@ namespace VEPROMS.CSLA.Library
pconfigrefresh_items[index].MyProcedure = newproc;
}
}
//return the changed procedure info
return newproc;
}