Compare commits
11 Commits
F2026-011_
...
Developmen
| Author | SHA1 | Date | |
|---|---|---|---|
| fe90af5aa4 | |||
| 7e672d91e9 | |||
| 09f472bee2 | |||
| d2082cdbea | |||
| c42596811e | |||
| d095a19187 | |||
| 8089e2c898 | |||
| bef9be5cbe | |||
| 21890e74fe | |||
| bb7b892f7c | |||
| ded6f18dd5 |
@@ -32,7 +32,7 @@ namespace ctlXMLEditLib
|
|||||||
public void InsertSymbol( int symbcode)
|
public void InsertSymbol( int symbcode)
|
||||||
{
|
{
|
||||||
int position = this.SelectionStart;
|
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 + @"}";
|
this.SelectedRtf = RtfPrefixForSymbols + sym + @"}";
|
||||||
Select(position, -1);
|
Select(position, -1);
|
||||||
Select(position + 1, 0);
|
Select(position + 1, 0);
|
||||||
|
|||||||
@@ -637,6 +637,8 @@ namespace VEPROMS
|
|||||||
DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
|
DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
|
||||||
if (dti != null)
|
if (dti != null)
|
||||||
{
|
{
|
||||||
|
_ = ItemInfo.ResetProcedure(pi.ItemID, true);
|
||||||
|
|
||||||
if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
|
if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
|
||||||
dti.MyStepTabPanel.MyStepPanel.Focus();
|
dti.MyStepTabPanel.MyStepPanel.Focus();
|
||||||
|
|
||||||
|
|||||||
@@ -3849,7 +3849,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
// When This occurs, it will cause a
|
// When This occurs, it will cause a
|
||||||
// "ThreadException ... Collection was modified; enumeration operation may not execute.”
|
// "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
|
// The following lines reload the procedure info cache
|
||||||
ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
|
ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
|
||||||
@@ -3867,6 +3867,8 @@ namespace VEPROMS.CSLA.Library
|
|||||||
ItemInfo newprocitem = Get(procID, true);
|
ItemInfo newprocitem = Get(procID, true);
|
||||||
newprocitem.RefreshConfig();
|
newprocitem.RefreshConfig();
|
||||||
|
|
||||||
|
if (!resetindisplaytab)
|
||||||
|
{
|
||||||
//Reload all the child/sub items
|
//Reload all the child/sub items
|
||||||
#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
|
#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
|
//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;
|
pconfigrefresh_items[index].MyProcedure = newproc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
//return the changed procedure info
|
//return the changed procedure info
|
||||||
return newproc;
|
return newproc;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user