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

BGE: Fixed RNO Tab from AER that is bullet

Browse Source 
B2014-072: Do not display Page Number checkbox, transitions with page number are included in list of transition types
B2014-070: Fix null reference access if editing a procedure step title in the step editor when format uses change ids
BGE: RNO X-offset location and note/caution y-offset improvements
This commit is contained in:
Kathy Ruffing
2014-06-05 12:52:29 +00:00
parent 7ea6df9049
commit f675e6c866
4 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -589,16 +589,7 @@ namespace Volian.Controls.Library
(_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[indx].Type == 1 ||
_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[indx].Type == 2 ||
_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[indx].Type == 4);
if (_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
{
if (listBoxTranFmt.SelectedIndex >=0 && listBoxTranFmt.SelectedIndex <= listBoxTranFmt.Items.Count)
{
// see if format for this particular transition does page number:
if (_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[indx].TransFormat.Contains("{Page Num}"))
cbPageNum.Visible = true;
}
}
cbPageNum.Checked = false;
if (cbPageNum.Visible)
{

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

@@ -678,7 +678,7 @@ namespace Volian.Controls.Library
// if the plant has the change id option, the change id was entered when the program started.
// this should be saved for every piece of edited data. Note that the set of config
// item Step_MultipleChangeID has the save built in to it.
if (MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChgBarMessageFromEdit)
if (MyStepRTB.MyItemInfo.IsStep && MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChgBarMessageFromEdit)
{
StepConfig sc = MyStepRTB.MyItemInfo.MyConfig as StepConfig;
sc.Step_ChangeID = this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.ChgId;