Compare commits
5 Commits
B2026-001-
...
B2026-006
| Author | SHA1 | Date | |
|---|---|---|---|
| 43a27c16a6 | |||
| d186e2702c | |||
| aee478114b | |||
| 6220530855 | |||
| 69ae37021c |
Binary file not shown.
Binary file not shown.
@@ -4745,6 +4745,19 @@ namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
_MyTab.Text = _MyTab.Text.Substring(1);
|
||||
}
|
||||
// C2026-003 Vogtle Continuous Action high level RNO (AER is not continuous action)
|
||||
if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
|
||||
IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null)
|
||||
{
|
||||
StepConfig sc = MyConfig as StepConfig;
|
||||
if (sc != null && sc.Step_CAS == "True")
|
||||
{
|
||||
if (FormatStepData.TabData.CASPrintMacro != null)
|
||||
_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text;
|
||||
if (FormatStepData.TabData.CASEditTag != null)
|
||||
_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
|
||||
}
|
||||
}
|
||||
_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
|
||||
if (((ItemInfo)ActiveParent).MyTab.Offset != 0) _MyTab.Offset = ((ItemInfo)ActiveParent).MyTab.Offset;
|
||||
if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros)
|
||||
|
||||
@@ -3814,6 +3814,18 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
}
|
||||
|
||||
// C2026-003 (for Vogtle Units 3&4) Adds the continuous action tag to a high level RNO
|
||||
// only when it as a tab and the parent is an AER step that is not tagged as a continuous action
|
||||
// Use this with the setting of CASPrintMacro and CASEditTag on the RNO step type TabData definition
|
||||
private LazyLoad<bool> _AddContActTagToHighLevelRNOWhenIncludedOnCAS;
|
||||
public bool AddContActTagToHighLevelRNOWhenIncludedOnCAS
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _AddContActTagToHighLevelRNOWhenIncludedOnCAS, "@AddContActTagToHighLevelRNOWhenIncludedOnCAS");
|
||||
}
|
||||
}
|
||||
|
||||
// treat sub-sections and High Level Steps as if they are at the same procedure structure level. This is used with the TieTabToLevel flag
|
||||
private LazyLoad<bool> _SubSectAndHighSameLevel;
|
||||
public bool SubSectAndHighSameLevel
|
||||
@@ -5708,6 +5720,30 @@ public StepData Equation // equation has a parent of embedded object.
|
||||
return LazyLoad(ref _RNOIdentPrint, "TabData/@RNOIdent");
|
||||
}
|
||||
}
|
||||
// Adds a print macro for the high level RNO when the user want it to be a Continuous Action
|
||||
// while the corresponding AER is not a continuous action
|
||||
// C2026-003 used in RNO step definition for Vogtle 3&4 two column format
|
||||
// use with AddContActTagToHighLevelRNOWhenIncludedOnCAS set to True in the format file's StpSectLayData
|
||||
private LazyLoad<string> _CASPrintMacro;
|
||||
public string CASPrintMacro
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _CASPrintMacro, "TabData/@CASPrintMacro");
|
||||
}
|
||||
}
|
||||
// Adds a character indicator in the step editor for the high level RNO when the user want it to be a Continuous Action
|
||||
// while the corresponding AER is not a continuous action
|
||||
// C2026-003 used in RNO step definition for Vogtle 3&4 two colmn format
|
||||
// use with AddContActTagToHighLevelRNOWhenIncludedOnCAS set to True in the format file's StpSectLayData
|
||||
private LazyLoad<string> _CASEditTag;
|
||||
public string CASEditTag
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _CASEditTag, "TabData/@CASEditTag");
|
||||
}
|
||||
}
|
||||
|
||||
// don't use the defined macro when creating a step tab for the step type's RNO
|
||||
private LazyLoad<bool> _RNOExcludeMacros;
|
||||
|
||||
@@ -11,7 +11,7 @@ using System.Text.RegularExpressions;
|
||||
using JR.Utils.GUI.Forms;
|
||||
using Volian.Base.Library;
|
||||
using System.Linq;
|
||||
|
||||
|
||||
namespace Volian.Controls.Library
|
||||
{
|
||||
public partial class DisplayHistory : UserControl
|
||||
|
||||
BIN
PROMS/Volian.Controls.Library/DisplayHistory.designer.cs
generated
BIN
PROMS/Volian.Controls.Library/DisplayHistory.designer.cs
generated
Binary file not shown.
@@ -112,13 +112,13 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<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 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>
|
||||
<data name="myVFG.MyBorderDetailString" xml:space="preserve">
|
||||
<value><?xml version="1.0" encoding="utf-8"?>
|
||||
<value><?xml version="1.0" encoding="utf-16"?>
|
||||
<VlnBorders Rows="4" Columns="3">
|
||||
<VerticalLines Rows="4" Columns="4">
|
||||
<Lines>
|
||||
@@ -161,7 +161,31 @@
|
||||
</HorizontalLines>
|
||||
</VlnBorders></value>
|
||||
</data>
|
||||
<data name="myVFG.StyleInfo" xml:space="preserve">
|
||||
<value>Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;} Alternate{BackColor:White;} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:LightCyan;ForeColor:Black;} Focus{BackColor:LightCyan;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{} </value>
|
||||
<data name="myVFG.MyShadingDetailString" xml:space="preserve">
|
||||
<value><?xml version="1.0" encoding="utf-16"?>
|
||||
<VlnGridCellShading Rows="4" Columns="3">
|
||||
<TableShadingInfo Rows="4" Columns="3">
|
||||
<CellShadingColor>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
<string>[A=255, R=255, G=255, B=255]</string>
|
||||
</CellShadingColor>
|
||||
</TableShadingInfo>
|
||||
</VlnGridCellShading></value>
|
||||
</data>
|
||||
<data name="myVFG.StyleInfo" xml:space="preserve">
|
||||
<value>Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;} Alternate{BackColor:White;} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:LightCyan;ForeColor:Black;} Focus{BackColor:LightCyan;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} FrozenAlternate{} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{} </value>
|
||||
</data>
|
||||
<metadata name="myTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -647,6 +647,10 @@ namespace Volian.Controls.Library
|
||||
MyEditItem.ChangeBarForConfigItemChange = false;
|
||||
sc.Step_CAS = (cbCAS.Checked) ? "True" : "False";
|
||||
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||
// C2026-003 (put in for Vogtle 3&4) refresh the RNO step tab if including it on the Continuous Action Summary
|
||||
if (MyEditItem.MyItemInfo.ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
|
||||
MyEditItem.MyItemInfo.IsInRNO && !MyEditItem.MyItemInfo.MyParent.IsInRNO)
|
||||
MyEditItem.RefreshTab();
|
||||
}
|
||||
private void cbTCAS_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
@@ -460,6 +460,7 @@
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DisplayHistory.resx">
|
||||
<DependentUpon>DisplayHistory.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="DisplayLibDocs.resx">
|
||||
<DependentUpon>DisplayLibDocs.cs</DependentUpon>
|
||||
|
||||
Reference in New Issue
Block a user