Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Development #464

Merged
djankowski merged 18 commits from Development into master 2024-11-11 11:39:02 -05:00
Conversation 0 Commits 18 Files Changed 15 +728 -535
15 changed files with 728 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/hlpfsgall.xml
View File

Binary file not shown.

10
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -2385,6 +2385,16 @@ namespace VEPROMS
OpenItem(_Procedure); OpenItem(_Procedure);
// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work. // SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel; SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
//CSM B2024-090 - if last displaytab item,
//select the steptab panel for it
//and set the EditItem for Find/Replace
//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
{
SelectedStepTabPanel.Select();
dlgFindReplace.MyEditItem = tc.MyEditItem;
}
} }
} }
} }

52
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -2752,6 +2752,29 @@ namespace VEPROMS.CSLA.Library
} }
#endregion UnlinkEnhanced #endregion UnlinkEnhanced
#region Search #region Search
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
//Create cleaned version of variable for use in DisplaySearch
//This is the Function that does the cleaning
public string CleanSearchString(string value)
{
// \u000C = PageBreak
// \u0009 = Tab
// \u160? = Hard Space
// \u0007 = Bell (Separates Parent Path and Child Path)
// \u0011 - Separates DisplayNumber & DisplayText of Step
if (value == null)
return null;
string tmp = value.Replace("\a", "\\").Replace("\u0007", "\\");
tmp = tmp.Replace("\u000C", " ").Replace("\u0009", " ").Replace(@"\u160?", " ").Replace("\u0011", " ");
if (tmp.StartsWith("\\"))
tmp = tmp.Substring(1);
return tmp;
}
internal string _SearchDVPath; internal string _SearchDVPath;
public string SearchDVPath public string SearchDVPath
{ {
@ -2767,6 +2790,10 @@ namespace VEPROMS.CSLA.Library
return _SearchDVPath; return _SearchDVPath;
} }
} }
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
//Create cleaned version of variable for use in DisplaySearch
public string SearchDVPath_clean => CleanSearchString(SearchDVPath);
internal string _SearchPath; internal string _SearchPath;
public string SearchPath public string SearchPath
{ {
@ -2790,6 +2817,10 @@ namespace VEPROMS.CSLA.Library
return _SearchPath; return _SearchPath;
} }
} }
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
//Create cleaned version of variable for use in DisplaySearch
public string SearchPath_clean => CleanSearchString(SearchPath);
public string ShortSearchPath public string ShortSearchPath
{ {
get get
@ -2800,6 +2831,9 @@ namespace VEPROMS.CSLA.Library
return dtext; return dtext;
} }
} }
//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
//Create cleaned version of variable for use in DisplaySearch
public string ShortSearchPath_clean => CleanSearchString(ShortSearchPath);
// B2021-076: Proms search results are not presented in order when printed to PDF // B2021-076: Proms search results are not presented in order when printed to PDF
internal string _SearchDefaultSort; internal string _SearchDefaultSort;
@ -4252,7 +4286,7 @@ namespace VEPROMS.CSLA.Library
tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph
_MyTab.Text = tstr; _MyTab.Text = tstr;
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled) if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
{ {
if (tstr.StartsWith(" ")) if (tstr.StartsWith(" "))
tstr = tstr.Substring(1); tstr = tstr.Substring(1);
@ -4350,7 +4384,7 @@ namespace VEPROMS.CSLA.Library
{ {
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub; string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub;
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_")) if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
{ {
if (tstr.StartsWith(" ")) if (tstr.StartsWith(" "))
tstr = tstr.Substring(1); tstr = tstr.Substring(1);
@ -4367,7 +4401,7 @@ namespace VEPROMS.CSLA.Library
{ {
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub + " "; string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_")) if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
{ {
if (tstr.StartsWith(" ")) if (tstr.StartsWith(" "))
tstr = tstr.Substring(1); tstr = tstr.Substring(1);
@ -4383,7 +4417,7 @@ namespace VEPROMS.CSLA.Library
string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub; string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub;
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
tmprnotab = tmprnotab.TrimStart(); tmprnotab = tmprnotab.TrimStart();
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_")) if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_"))
{ {
if (tmprnotab.StartsWith(" ")) if (tmprnotab.StartsWith(" "))
tmprnotab = tmprnotab.Substring(1); tmprnotab = tmprnotab.Substring(1);
@ -4401,7 +4435,7 @@ namespace VEPROMS.CSLA.Library
_MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText; _MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText;
_MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text; _MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text;
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_")) if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_"))
{ {
if (_MyTab.CleanText.StartsWith(" ")) if (_MyTab.CleanText.StartsWith(" "))
_MyTab.CleanText = _MyTab.CleanText.Substring(1); _MyTab.CleanText = _MyTab.CleanText.Substring(1);
@ -4749,7 +4783,7 @@ namespace VEPROMS.CSLA.Library
// Note could have modified logic for clock macro (above) but older logic uses the IdentEdit setting // Note could have modified logic for clock macro (above) but older logic uses the IdentEdit setting
// for CAS (Continuous Action Summary steps) that have a circle printed around the step number // for CAS (Continuous Action Summary steps) that have a circle printed around the step number
// this is the least impact of current code/formats // this is the least impact of current code/formats
if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag)) if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag))
{ {
int eidx = tbformat.IndexOf("}", macroindx); int eidx = tbformat.IndexOf("}", macroindx);
if (eidx > -1) if (eidx > -1)
@ -4772,12 +4806,14 @@ namespace VEPROMS.CSLA.Library
} }
} }
//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled) else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
{ {
if (cltext == null) if (cltext == null)
cltext = tbformat; cltext = tbformat;
if (cltext.StartsWith(" ")) if (cltext.StartsWith(" "))
cltext = cltext.Substring(1); cltext = cltext.Substring(1);
if (tbformat.StartsWith(" "))
tbformat = tbformat.Substring(1);
cltext = FormatStepData.TabData.MacroEditTag + cltext; cltext = FormatStepData.TabData.MacroEditTag + cltext;
} }
} }
@ -5586,7 +5622,7 @@ namespace VEPROMS.CSLA.Library
} }
//CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro //CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro
if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled) if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled)
addToList = false; addToList = false;
if (addToList) tmp.Add(macro); if (addToList) tmp.Add(macro);

46
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@ -676,37 +676,47 @@ namespace VEPROMS.CSLA.Library
} }
public void AppendPrefix() public void AppendPrefix()
{ {
if (HasText && Prefix != null) if (Prefix == null) return; // no Prefix text to add
if (HasText)
{ {
if (!_Results.ToString().EndsWith(_Prefix)) if (!_Results.ToString().EndsWith(_Prefix)) //existing transition text does not end with Prefix text, OK to append
_Results.Append(Prefix); _Results.Append(Prefix);
_Prefix = null; _Prefix = null;
} }
else if (_TranType == 4 && _ToItem.MoreThanOneStepSection()) else if (_TranType == 4 && _ToItem.MoreThanOneStepSection())
{ {
if (!HasText && Prefix != null && Prefix.ToUpper().StartsWith(", STEP") // WEP (Point Beach) is no longer a customer - commented out
&& _FromItem.ActiveFormat.Name.StartsWith("WEP")) //if (!HasText && Prefix.ToUpper().StartsWith(", STEP")
{ // && _FromItem.ActiveFormat.Name.StartsWith("WEP"))
Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name); //{
_Prefix = null; // Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
return; // _Prefix = null;
} // return;
_Results.Append(Prefix); //}
_Prefix = null;
}
else if (_TranType == 5 && Prefix != null)
{
if (!HasText && Prefix.StartsWith(", "))
_Results.Append(Prefix.TrimStart(", ".ToCharArray()));
else
_Results.Append(Prefix); _Results.Append(Prefix);
_Prefix = null; _Prefix = null;
} }
// If the prefix contains an open paren, we want to add the open paren regardless // If the prefix contains an open paren, we want to add the open paren regardless
// of whether there already is text in the resulting string. // of whether there already is text in the resulting string.
else if (!HasText && Prefix != null && Prefix.Contains("(")) else if (!HasText && Prefix.Contains("("))
{ {
_Results.Append(Prefix.TrimStart(" ".ToCharArray())); // since no text in result, trim starting space. _Results.Append(Prefix.TrimStart(" ".ToCharArray())); // since no text in result, trim starting space.
_Prefix = null;
}
else if (!HasText && Prefix.StartsWith(", "))
{
_Results.Append(Prefix.TrimStart(", ".ToCharArray()));// no preceeding text, remove comma and space
_Prefix = null;
}
else if (!HasText && Prefix.StartsWith(","))
{
_Results.Append(Prefix.TrimStart(",".ToCharArray())); // no preceeding text, remove comma
_Prefix = null;
}
else
{
_Results.Append(Prefix); // append prefix as is
_Prefix = null;
} }
} }
public string OverridePrefix public string OverridePrefix

6
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -6407,7 +6407,7 @@ public StepData Equation // equation has a parent of embedded object.
} }
public TransData(XmlNode xmlNode) : base(xmlNode) { } public TransData(XmlNode xmlNode) : base(xmlNode) { }
// a character that is placed before and after the title that's in the transition text // a character that is placed before and after the procedure title that's in the transition text
private LazyLoad<string> _DelimiterForTransitionTitle; private LazyLoad<string> _DelimiterForTransitionTitle;
public string DelimiterForTransitionTitle public string DelimiterForTransitionTitle
{ {
@ -6684,7 +6684,9 @@ public StepData Equation // equation has a parent of embedded object.
} }
} }
// holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers // Holdover from 16bit, used to define whether transitions are range (types 2 & 3).
// This is used in the logic for transitions with page numbers. This gets defined as "Type" in the code for the transition class.
// NOTE: the TransType you see in the code is actually the index into the list of transition definitions for given format.
private LazyLoad<int?> _Type; private LazyLoad<int?> _Type;
public int? Type public int? Type
{ {

6
PROMS/Volian.Controls.Library/DisplayApplicability.cs
View File

@ -236,7 +236,11 @@ namespace Volian.Controls.Library
else else
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.AppendLine("Changing the applicability for this step will invalidate a transition in the following steps..."); string tmpwrd = MyItemInfo.IsSection ? "section" : "step";
sb.AppendLine($"The applicability for this {tmpwrd} cannot be changed due to transition links.");
sb.AppendLine("Applicability settings will return to original settings when OK is selected.");
sb.AppendLine($"Changing the applicability for this {tmpwrd} will invalidate a transition in the following steps...");
sb.AppendLine(); sb.AppendLine();
// B2021-149: if step, put out line for every invalidTrans, if procedure only put out those that are external // B2021-149: if step, put out line for every invalidTrans, if procedure only put out those that are external
// determine this by looking strings for source and target (to), if procedure level and internal the target starts // determine this by looking strings for source and target (to), if procedure level and internal the target starts

10
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@ -66,7 +66,7 @@ namespace Volian.Controls.Library
private Color saveGrpPanSearchResults; private Color saveGrpPanSearchResults;
private ItemInfoList _SearchResults; private ItemInfoList _SearchResults;
private string _DisplayMember = "SearchPath"; private string _DisplayMember = "SearchPath_clean";
private bool _OpenDocFromSearch; private bool _OpenDocFromSearch;
private ROFSTLookup _MyROFSTLookup; private ROFSTLookup _MyROFSTLookup;
private bool _LoadingList = false; private bool _LoadingList = false;
@ -1745,7 +1745,7 @@ namespace Volian.Controls.Library
} }
// B2021-076: Proms search results are not presented in order when printed to PDF // B2021-076: Proms search results are not presented in order when printed to PDF
if (_DisplayMember == "SearchPath" || _DisplayMember == "ShortSearchPath") if (_DisplayMember == "SearchPath_clean" || _DisplayMember == "ShortSearchPath_clean")
{ {
cbSorted.Checked = false; cbSorted.Checked = false;
cbSorted.Enabled = false; cbSorted.Enabled = false;
@ -1880,10 +1880,10 @@ namespace Volian.Controls.Library
switch (cmbResultsStyle.Text) switch (cmbResultsStyle.Text)
{ {
case "Document Path": case "Document Path":
_DisplayMember = "SearchDVPath"; _DisplayMember = "SearchDVPath_clean";
break; break;
case "Step Path": case "Step Path":
_DisplayMember = "ShortSearchPath"; _DisplayMember = "ShortSearchPath_clean";
break; break;
case "Annotation Text": case "Annotation Text":
_DisplayMember = "SearchAnnotationText"; _DisplayMember = "SearchAnnotationText";
@ -1892,7 +1892,7 @@ namespace Volian.Controls.Library
_DisplayMember = "DisplayText"; _DisplayMember = "DisplayText";
break; break;
default: default:
_DisplayMember = "SearchPath"; _DisplayMember = "SearchPath_clean";
break; break;
} }
DisplayResults(); DisplayResults();

3
PROMS/Volian.Controls.Library/DisplayTags.Designer.cs generated
View File

@ -501,8 +501,7 @@ namespace Volian.Controls.Library
this.cbTCAS.Margin = new System.Windows.Forms.Padding(2); this.cbTCAS.Margin = new System.Windows.Forms.Padding(2);
this.cbTCAS.Name = "cbTCAS"; this.cbTCAS.Name = "cbTCAS";
this.cbTCAS.Size = new System.Drawing.Size(167, 15); this.cbTCAS.Size = new System.Drawing.Size(167, 15);
this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section\r\n\r\nkeyboard command: <Shift" + this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Time Critical Action Summary", "", "Include this in the Time Critical Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
"><F7>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbTCAS.TabIndex = 3; this.cbTCAS.TabIndex = 3;
this.cbTCAS.Text = "Time Critical Action Summary"; this.cbTCAS.Text = "Time Critical Action Summary";
this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged); this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged);

2
PROMS/Volian.Controls.Library/DisplayTags.cs
View File

@ -559,7 +559,7 @@ namespace Volian.Controls.Library
//CSM F2024 - 080: For South Texas (HLP formats), enable the initial line checkbox if it is in the formats //CSM F2024 - 080: For South Texas (HLP formats), enable the initial line checkbox if it is in the formats
//Also, they want disable being selected to impact substeps - so do not show toggle if selected on a parent step //Also, they want disable being selected to impact substeps - so do not show toggle if selected on a parent step
cbInitialLine.Visible = cbInitialLine.Enabled = false; cbInitialLine.Visible = cbInitialLine.Enabled = false;
if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData.TabData.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO)) if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData?.TabData?.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO))
{ {
cbInitialLine.Visible = cbInitialLine.Enabled = true; cbInitialLine.Visible = cbInitialLine.Enabled = true;
cbInitialLine.Checked = sc.Step_DisableInitialLine; cbInitialLine.Checked = sc.Step_DisableInitialLine;

92
PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs generated
View File

@ -30,25 +30,26 @@ namespace Volian.Controls.Library
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition));
this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel();
this.cbHoldProcSet = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.btnTranCancel = new DevComponents.DotNetBar.ButtonX(); this.btnTranCancel = new DevComponents.DotNetBar.ButtonX();
this.btnTranSave = new DevComponents.DotNetBar.ButtonX(); this.btnTranSave = new DevComponents.DotNetBar.ButtonX();
this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel();
this.listBoxTranFmt = new System.Windows.Forms.ListBox(); this.listBoxTranFmt = new System.Windows.Forms.ListBox();
this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel();
this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel();
this.cbTranProcs = new System.Windows.Forms.ComboBox(); this.cbTranProcs = new System.Windows.Forms.ComboBox();
this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel();
this.cbTranSects = new System.Windows.Forms.ComboBox(); this.cbTranSects = new System.Windows.Forms.ComboBox();
this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel(); this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel();
this.tvTran = new Volian.Controls.Library.vlnTreeView3();
this.pnlTranStepBtns = new System.Windows.Forms.Panel(); this.pnlTranStepBtns = new System.Windows.Forms.Panel();
this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX(); this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX();
this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX(); this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX();
this.btnUp1 = new DevComponents.DotNetBar.ButtonX(); this.btnUp1 = new DevComponents.DotNetBar.ButtonX();
this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip(); this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip();
this.tvTran = new Volian.Controls.Library.vlnTreeView3();
this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
this.groupPanelBtns.SuspendLayout(); this.groupPanelBtns.SuspendLayout();
this.groupPanelTranFmt.SuspendLayout(); this.groupPanelTranFmt.SuspendLayout();
this.groupPanelTransitionSets.SuspendLayout(); this.groupPanelTransitionSets.SuspendLayout();
@ -62,6 +63,7 @@ namespace Volian.Controls.Library
// //
this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control;
this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanelBtns.Controls.Add(this.cbHoldProcSet);
this.groupPanelBtns.Controls.Add(this.cbPageNum); this.groupPanelBtns.Controls.Add(this.cbPageNum);
this.groupPanelBtns.Controls.Add(this.btnTranCancel); this.groupPanelBtns.Controls.Add(this.btnTranCancel);
this.groupPanelBtns.Controls.Add(this.btnTranSave); this.groupPanelBtns.Controls.Add(this.btnTranSave);
@ -69,7 +71,7 @@ namespace Volian.Controls.Library
this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelBtns.Location = new System.Drawing.Point(0, 0); this.groupPanelBtns.Location = new System.Drawing.Point(0, 0);
this.groupPanelBtns.Name = "groupPanelBtns"; this.groupPanelBtns.Name = "groupPanelBtns";
this.groupPanelBtns.Size = new System.Drawing.Size(376, 58); this.groupPanelBtns.Size = new System.Drawing.Size(376, 82);
// //
// //
// //
@ -100,6 +102,23 @@ namespace Volian.Controls.Library
this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.groupPanelBtns.TabIndex = 25; this.groupPanelBtns.TabIndex = 25;
// //
// cbHoldProcSet
//
this.cbHoldProcSet.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.cbHoldProcSet.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.cbHoldProcSet.Location = new System.Drawing.Point(0, 54);
this.cbHoldProcSet.Margin = new System.Windows.Forms.Padding(2);
this.cbHoldProcSet.Name = "cbHoldProcSet";
this.cbHoldProcSet.Size = new System.Drawing.Size(214, 15);
this.cbHoldProcSet.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superToolTipDispTran.SetSuperTooltip(this.cbHoldProcSet, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbHoldProcSet.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbHoldProcSet.TabIndex = 27;
this.cbHoldProcSet.Text = "Hold Procedure Set / Procedure";
this.cbHoldProcSet.CheckedChanged += new System.EventHandler(this.cbHoldProcSet_CheckedChanged);
//
// cbPageNum // cbPageNum
// //
this.cbPageNum.BackColor = System.Drawing.Color.Transparent; this.cbPageNum.BackColor = System.Drawing.Color.Transparent;
@ -108,7 +127,7 @@ namespace Volian.Controls.Library
// //
this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.cbPageNum.Location = new System.Drawing.Point(0, 35); this.cbPageNum.Location = new System.Drawing.Point(0, 35);
this.cbPageNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbPageNum.Margin = new System.Windows.Forms.Padding(2);
this.cbPageNum.Name = "cbPageNum"; this.cbPageNum.Name = "cbPageNum";
this.cbPageNum.Size = new System.Drawing.Size(126, 15); this.cbPageNum.Size = new System.Drawing.Size(126, 15);
this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@ -123,7 +142,7 @@ namespace Volian.Controls.Library
this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right; this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right;
this.btnTranCancel.Location = new System.Drawing.Point(282, 0); this.btnTranCancel.Location = new System.Drawing.Point(282, 0);
this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2);
this.btnTranCancel.Name = "btnTranCancel"; this.btnTranCancel.Name = "btnTranCancel";
this.btnTranCancel.Size = new System.Drawing.Size(88, 36); this.btnTranCancel.Size = new System.Drawing.Size(88, 36);
this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" + this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" +
@ -154,7 +173,7 @@ namespace Volian.Controls.Library
this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt); this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt);
this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty;
this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 58); this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 82);
this.groupPanelTranFmt.Name = "groupPanelTranFmt"; this.groupPanelTranFmt.Name = "groupPanelTranFmt";
this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141); this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
// //
@ -208,7 +227,7 @@ namespace Volian.Controls.Library
this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets); this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets);
this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty;
this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 199); this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 223);
this.groupPanelTransitionSets.Name = "groupPanelTransitionSets"; this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48); this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
// //
@ -242,6 +261,18 @@ namespace Volian.Controls.Library
this.groupPanelTransitionSets.TabIndex = 31; this.groupPanelTransitionSets.TabIndex = 31;
this.groupPanelTransitionSets.Text = "Select Procedure Set"; this.groupPanelTransitionSets.Text = "Select Procedure Set";
// //
// vlnTreeComboSets
//
this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
this.vlnTreeComboSets.Name = "vlnTreeComboSets";
this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.vlnTreeComboSets.TabIndex = 33;
this.vlnTreeComboSets.Value = null;
this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
//
// groupPanelTransitionProcs // groupPanelTransitionProcs
// //
this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control;
@ -249,7 +280,7 @@ namespace Volian.Controls.Library
this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs); this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs);
this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty;
this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 247); this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 271);
this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs"; this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46); this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
// //
@ -302,7 +333,7 @@ namespace Volian.Controls.Library
this.groupPanelTransitionSect.Controls.Add(this.cbTranSects); this.groupPanelTransitionSect.Controls.Add(this.cbTranSects);
this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty;
this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 293); this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 317);
this.groupPanelTransitionSect.Name = "groupPanelTransitionSect"; this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49); this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
// //
@ -357,9 +388,9 @@ namespace Volian.Controls.Library
this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns); this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns);
this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty; this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty;
this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill; this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 342); this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 366);
this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps"; this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 334); this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 310);
// //
// //
// //
@ -391,6 +422,17 @@ namespace Volian.Controls.Library
this.groupPanelTranstionSteps.TabIndex = 34; this.groupPanelTranstionSteps.TabIndex = 34;
this.groupPanelTranstionSteps.Text = "Select Step"; this.groupPanelTranstionSteps.Text = "Select Step";
// //
// tvTran
//
this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
this.tvTran.HideSelection = false;
this.tvTran.Location = new System.Drawing.Point(0, 46);
this.tvTran.Name = "tvTran";
this.tvTran.Size = new System.Drawing.Size(370, 243);
this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.tvTran.TabIndex = 31;
this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
//
// pnlTranStepBtns // pnlTranStepBtns
// //
this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum); this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum);
@ -410,7 +452,7 @@ namespace Volian.Controls.Library
// //
this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.cbIncStepNum.Location = new System.Drawing.Point(8, 12); this.cbIncStepNum.Location = new System.Drawing.Point(8, 12);
this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2);
this.cbIncStepNum.Name = "cbIncStepNum"; this.cbIncStepNum.Name = "cbIncStepNum";
this.cbIncStepNum.Size = new System.Drawing.Size(126, 19); this.cbIncStepNum.Size = new System.Drawing.Size(126, 19);
this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@ -465,29 +507,6 @@ namespace Volian.Controls.Library
this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
// //
// tvTran
//
this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
this.tvTran.HideSelection = false;
this.tvTran.Location = new System.Drawing.Point(0, 46);
this.tvTran.Name = "tvTran";
this.tvTran.Size = new System.Drawing.Size(370, 267);
this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.tvTran.TabIndex = 31;
this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
//
// vlnTreeComboSets
//
this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
this.vlnTreeComboSets.Name = "vlnTreeComboSets";
this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.vlnTreeComboSets.TabIndex = 33;
this.vlnTreeComboSets.Value = null;
this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
//
// DisplayTransition // DisplayTransition
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -498,7 +517,7 @@ namespace Volian.Controls.Library
this.Controls.Add(this.groupPanelTransitionSets); this.Controls.Add(this.groupPanelTransitionSets);
this.Controls.Add(this.groupPanelTranFmt); this.Controls.Add(this.groupPanelTranFmt);
this.Controls.Add(this.groupPanelBtns); this.Controls.Add(this.groupPanelBtns);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "DisplayTransition"; this.Name = "DisplayTransition";
this.Size = new System.Drawing.Size(376, 676); this.Size = new System.Drawing.Size(376, 676);
this.groupPanelBtns.ResumeLayout(false); this.groupPanelBtns.ResumeLayout(false);
@ -535,5 +554,6 @@ namespace Volian.Controls.Library
private DevComponents.DotNetBar.SuperTooltip superToolTipDispTran; private DevComponents.DotNetBar.SuperTooltip superToolTipDispTran;
private DevComponents.DotNetBar.Controls.CheckBoxX cbIncStepNum; private DevComponents.DotNetBar.Controls.CheckBoxX cbIncStepNum;
private DevComponents.DotNetBar.Controls.CheckBoxX cbPageNum; private DevComponents.DotNetBar.Controls.CheckBoxX cbPageNum;
private DevComponents.DotNetBar.Controls.CheckBoxX cbHoldProcSet;
} }
} }

96
PROMS/Volian.Controls.Library/DisplayTransition.cs
View File

@ -27,7 +27,31 @@ namespace Volian.Controls.Library
set set
{ {
if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface
if (value == null) // Insert a transition //CSM-C2024-026 Evaluate the transitions panel
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
//HeldLinkText will store if a transition was manually selected
//to override defaulting the listboxes to the current step / selected transition
if (HeldLinkText != "" && value != null)
{
//handle case where is held text and click on an already existing transition so cannot save one on top of the other.
_CurTrans = value;
btnTranSave.Enabled = false;
btnTranCancel.Enabled = true;
return;
}
else if (HeldLinkText != "" && MyRTB.MyItemInfo.ActiveFormat.Name == HeldLink_CurItemFrom.ActiveFormat.Name)
{
//this else if will handle case of defaulting to held transition instead of what has been clicked on
//Note that if format is not the same, it will ignore the held item
//This is because if different format, then options / selections may be different so will need to refresh the lists
if (_CurTrans == value && _CurItemFrom == HeldLink_CurItemFrom) return;
_CurItemFrom = HeldLink_CurItemFrom;
_TranFmtIndx = HeldLink_TranFmtIndx;
bool isenh = MyRTB != null && HeldLink_CurItemFrom != null && HeldLink_CurItemFrom.IsEnhancedStep;
btnTranSave.Enabled = !isenh && UserInfo.CanEdit(MyUserInfo, Mydvi) && (value == null); //Can Insert Transitions
btnTranCancel.Enabled = true;
}
else if (value == null) // Insert a transition
{ {
if (MyRTB == null) return; if (MyRTB == null) return;
if (_CurTrans == value && _CurItemFrom == MyRTB.MyItemInfo) return; if (_CurTrans == value && _CurItemFrom == MyRTB.MyItemInfo) return;
@ -121,13 +145,7 @@ namespace Volian.Controls.Library
} }
void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args) void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args)
{ {
//if (_MyRTB.MyLinkText == null)
// CurTrans = null;
//else
//{
// StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e);
CurTrans = args.MyLinkText.MyTransitionInfo; CurTrans = args.MyLinkText.MyTransitionInfo;
//}
} }
private ItemInfo _CurrentItemProcedure; // the selected item's procedure private ItemInfo _CurrentItemProcedure; // the selected item's procedure
private ItemInfo _CurrentToProcedure; // the 'to' location's procedure (may be same as _CurrentItemProcedure) private ItemInfo _CurrentToProcedure; // the 'to' location's procedure (may be same as _CurrentItemProcedure)
@ -138,6 +156,12 @@ namespace Volian.Controls.Library
private Color _OrigGroupPanelProcs; private Color _OrigGroupPanelProcs;
private Color _OrigGroupPanelSects; private Color _OrigGroupPanelSects;
private Color _OrigGroupPanelSteps; private Color _OrigGroupPanelSteps;
//CSM-C2024-026 Evaluate the transitions panel
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
public string HeldLinkText { get; protected set; } = ""; //will hold link text to stay on
public int HeldLink_TranFmtIndx { get; protected set; } = 0; //this will hold transition format that was selected on held item
public ItemInfo HeldLink_CurItemFrom { get; protected set; } //this will hold item that transitioning from
#endregion #endregion
#region Constructors #region Constructors
public DisplayTransition() public DisplayTransition()
@ -237,7 +261,7 @@ namespace Volian.Controls.Library
if (selitm != null && selitm.MyContent.Type >= 20000) if (selitm != null && selitm.MyContent.Type >= 20000)
{ {
if (_DoingRange) if (_DoingRange && CurTrans != null)
{ {
tvInitHiliteRange(); //rangeSameLevel, stpitm, rngitm, (i1 < i2) ? i2 : i1); tvInitHiliteRange(); //rangeSameLevel, stpitm, rngitm, (i1 < i2) ? i2 : i1);
} }
@ -938,6 +962,17 @@ namespace Volian.Controls.Library
} }
_InitializingTrans = false; _InitializingTrans = false;
SaveCancelEnabling(); SaveCancelEnabling();
//CSM-C2024-026 Evaluate the transitions panel
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
//If checkbox is checked to enable holding an item,
//then store the first step in the currently selected item
if (cbHoldProcSet.Checked && secitm.Steps != null && secitm.Steps.Count > 0)
{
HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, secitm.Steps[0].ItemID);
HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
HeldLink_CurItemFrom = secitm.Steps[0];
}
} }
} }
// B2024-016 Hide the step tree when the transition definition does not include a step number {First Step} // B2024-016 Hide the step tree when the transition definition does not include a step number {First Step}
@ -1089,6 +1124,18 @@ namespace Volian.Controls.Library
return; return;
} }
SaveCancelEnabling(); SaveCancelEnabling();
//CSM-C2024-026 Evaluate the transitions panel
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
//If checkbox is checked to enable holding an item,
//then store the currently selected item
if (cbHoldProcSet.Checked)
{
HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
HeldLink_CurItemFrom = selii;
}
if (_DoingRange) if (_DoingRange)
{ {
if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null)) if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null))
@ -1370,6 +1417,13 @@ namespace Volian.Controls.Library
_MyLog.InfoFormat("ItemID {0}, LinkText '{1}'", MyRTB.MyItemInfo.ItemID, linkText); _MyLog.InfoFormat("ItemID {0}, LinkText '{1}'", MyRTB.MyItemInfo.ItemID, linkText);
int sel = MyRTB.SelectionStart + MyRTB.SelectionLength; int sel = MyRTB.SelectionStart + MyRTB.SelectionLength;
MyRTB.Select(sel, 0);// Move cursor to end of LINK MyRTB.Select(sel, 0);// Move cursor to end of LINK
//CSM-C2024-026 Evaluate the transitions panel
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
//After save a transition, set the Linktext / tab to go back to the held transition
//if none then this will refresh it to the currently selected item as it did before this csm
MyRTB.MyLinkText = HeldLinkText;
MyRTB.Focus(); MyRTB.Focus();
} }
#endregion #endregion
@ -1489,6 +1543,32 @@ namespace Volian.Controls.Library
btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons
} }
} }
//CSM-C2024-026 Evaluate the transitions panel
//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
//If checkbox is checked to enable holding an item,
//then store the currently selected item
//if checkbox becomes unchecked then clear item.
private void cbHoldProcSet_CheckedChanged(object sender, EventArgs e)
{
if (cbHoldProcSet.Checked)
{
VETreeNode vt = tvTran.SelectedNode as VETreeNode;
ItemInfo selii = vt.VEObject as ItemInfo;
if (selii != null)
{
HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
HeldLink_CurItemFrom = selii;
}
}
else
{
HeldLinkText = "";
HeldLink_CurItemFrom = null;
HeldLink_TranFmtIndx = 0;
}
}
} }
public class TransItem public class TransItem
{ {

13
PROMS/Volian.Controls.Library/DisplayTransition.resx
View File

@ -112,14 +112,21 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="superToolTipDispTran.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="superToolTipDispTran.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<data name="cbHoldProcSet.SuperTooltip" xml:space="preserve">
<value>By default, PROMS will load the Procedure Set/Procedure in this window for the step (or transition link within a step) that is selected with the mouse.
Selecting this checkbox temporarily disables that behavior so that clicking on various steps within the procedure will not move away from the Procedure Set/Procedure that has currently been selected in these windows.
Note: One exception to this is if you navigate to a Procedure set that has a different format. In that case, it will refresh these options based on that new format.</value>
</data>
<data name="vlnTreeComboSets.SuperTooltip" xml:space="preserve"> <data name="vlnTreeComboSets.SuperTooltip" xml:space="preserve">
<value>This allows you to select the procedure set that the transition points to, if the selected transition format allows for the transition to point to another set. If the format does NOT allow for pointing to another set, a selection will not be available.</value> <value>This allows you to select the procedure set that the transition points to, if the selected transition format allows for the transition to point to another set. If the format does NOT allow for pointing to another set, a selection will not be available.</value>
</data> </data>

10
PROMS/Volian.Controls.Library/FindReplace.Designer.cs generated
View File

@ -279,18 +279,24 @@ namespace Volian.Controls.Library
// //
// btnCmCut // btnCmCut
// //
this.btnCmCut.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.btnCmCut.Image = global::Volian.Controls.Library.Properties.Resources.Cut_Image;
this.btnCmCut.Name = "btnCmCut"; this.btnCmCut.Name = "btnCmCut";
this.btnCmCut.Text = "Cut"; this.btnCmCut.Text = "Cut";
this.btnCmCut.Click += new System.EventHandler(this.btnCmCut_Click); this.btnCmCut.Click += new System.EventHandler(this.btnCmCut_Click);
// //
// btnCmCopy // btnCmCopy
// //
this.btnCmCopy.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.btnCmCopy.Image = global::Volian.Controls.Library.Properties.Resources.Copy_Image;
this.btnCmCopy.Name = "btnCmCopy"; this.btnCmCopy.Name = "btnCmCopy";
this.btnCmCopy.Text = "Copy"; this.btnCmCopy.Text = "Copy";
this.btnCmCopy.Click += new System.EventHandler(this.btnCmCopy_Click); this.btnCmCopy.Click += new System.EventHandler(this.btnCmCopy_Click);
// //
// btnCmPaste // btnCmPaste
// //
this.btnCmPaste.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.btnCmPaste.Image = global::Volian.Controls.Library.Properties.Resources.PasteSmall_Image;
this.btnCmPaste.Name = "btnCmPaste"; this.btnCmPaste.Name = "btnCmPaste";
this.btnCmPaste.Text = "Paste"; this.btnCmPaste.Text = "Paste";
this.btnCmPaste.Click += new System.EventHandler(this.btnCmPaste_Click); this.btnCmPaste.Click += new System.EventHandler(this.btnCmPaste_Click);
@ -305,12 +311,16 @@ namespace Volian.Controls.Library
// //
// btnCmHardSp // btnCmHardSp
// //
this.btnCmHardSp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.btnCmHardSp.Image = global::Volian.Controls.Library.Properties.Resources.HardSpace_Image;
this.btnCmHardSp.Name = "btnCmHardSp"; this.btnCmHardSp.Name = "btnCmHardSp";
this.btnCmHardSp.Text = "Hard Space"; this.btnCmHardSp.Text = "Hard Space";
this.btnCmHardSp.Click += new System.EventHandler(this.btnCmHardSp_Click); this.btnCmHardSp.Click += new System.EventHandler(this.btnCmHardSp_Click);
// //
// btnCmSymbol // btnCmSymbol
// //
this.btnCmSymbol.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
this.btnCmSymbol.Image = global::Volian.Controls.Library.Properties.Resources.Symbol_Image;
this.btnCmSymbol.Name = "btnCmSymbol"; this.btnCmSymbol.Name = "btnCmSymbol";
this.btnCmSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnCmSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.galSymbols}); this.galSymbols});

10
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@ -1985,6 +1985,9 @@ namespace Volian.Controls.Library
case "Cont. Act\r\nSummary": case "Cont. Act\r\nSummary":
btnCASCreate_Click(sender, e); btnCASCreate_Click(sender, e);
break; break;
case "Time Crit\r\nSummary":
btnTCASCreate_Click(sender, e);
break;
} }
MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = 0; // unselect the unit (child) MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = 0; // unselect the unit (child)
} }
@ -1999,6 +2002,9 @@ namespace Volian.Controls.Library
btnCASCreate.SubItems.Clear(); btnCASCreate.SubItems.Clear();
btnCASCreate.Tag = null; btnCASCreate.Tag = null;
btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click); btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click);
btnTCASCreate.SubItems.Clear();
btnTCASCreate.Tag = null;
btnTCASCreate.Click -= new System.EventHandler(btnTCASCreate_Click);
btnReviewCreatePDF.SubItems.Clear(); btnReviewCreatePDF.SubItems.Clear();
btnReviewCreatePDF.Tag = null; btnReviewCreatePDF.Tag = null;
btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click); btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click);
@ -2025,6 +2031,9 @@ namespace Volian.Controls.Library
btnCASCreate.SubItems.Add(btn); btnCASCreate.SubItems.Add(btn);
btn = MakeSubMenuButton(s, k, miMultiUnit_Click); btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
btn.Enabled = procAppl; btn.Enabled = procAppl;
btnTCASCreate.SubItems.Add(btn);
btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
btn.Enabled = procAppl;
btnReviewPdfQuickCreate.SubItems.Add(btn); btnReviewPdfQuickCreate.SubItems.Add(btn);
} }
btnPdfCreate.AutoExpandOnClick = true; btnPdfCreate.AutoExpandOnClick = true;
@ -2032,6 +2041,7 @@ namespace Volian.Controls.Library
btnReviewCreatePDF.AutoExpandOnClick = true; btnReviewCreatePDF.AutoExpandOnClick = true;
btnReviewPdfQuickCreate.AutoExpandOnClick = true; btnReviewPdfQuickCreate.AutoExpandOnClick = true;
btnCASCreate.AutoExpandOnClick = true; btnCASCreate.AutoExpandOnClick = true;
btnTCASCreate.AutoExpandOnClick = true;
} }
private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler) private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler)
{ {

7
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -3781,7 +3781,12 @@ namespace Volian.Print.Library
else if (itemInfo.MyTab.AltPrintTab != null) else if (itemInfo.MyTab.AltPrintTab != null)
mytab = new vlnTab(cb, this, itemInfo.MyTab.AltPrintTab, itemInfo.MyTab.AltPrintTab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); mytab = new vlnTab(cb, this, itemInfo.MyTab.AltPrintTab, itemInfo.MyTab.AltPrintTab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
else else
mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, itemInfo.MyTab.CleanText, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); {
string clntxt = itemInfo.MyTab.CleanText;
if (!string.IsNullOrEmpty(itemInfo.FormatStepData?.TabData?.MacroEditTag) && itemInfo.FormatStepData.TabData.MacroEditTag == "_" && clntxt.StartsWith("_"))
clntxt = clntxt.Substring(1);
mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, clntxt, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
}
PartsLeft.Add(mytab); PartsLeft.Add(mytab);
if (mytab.MyMacro != null) PartsLeft.Add(mytab.MyMacro); if (mytab.MyMacro != null) PartsLeft.Add(mytab.MyMacro);
} }