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

F2018-025 Treat the HSL with a “.0’ as a section number/title and the first level substeps as high level steps, adjusting the tab numbering and positions accordingly through all the substep levels

Browse Source
This commit is contained in:
John Jenko 2018-04-11 19:44:37 +00:00
parent c93cee7f20
commit 89128764b7
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1665,8 +1665,8 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
if (ItemID == 95759 && _FromType == null) //if (ItemID == 95759 && _FromType == null)
Console.WriteLine("\"Null FromType\",{0},{1},\"{2}\",{3}", ItemID, MyContent.Type, DisplayNumber, MyItemInfoUnique); // Console.WriteLine("\"Null FromType\",{0},{1},\"{2}\",{3}", ItemID, MyContent.Type, DisplayNumber, MyItemInfoUnique);
return _FromType; return _FromType;
} }
set { _FromType = value; } set { _FromType = value; }
@ -3986,6 +3986,17 @@ namespace VEPROMS.CSLA.Library
localPrintLevel += 5; localPrintLevel += 5;
} }
int itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; int itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
// F2018-025 Westinghouse when a high level step is used as a section number/title,
// adjust the step/substep numbering where the first level substep uses the high level step tabbing format
// and the following sub-substeps tabbing format are "shifted" accordingly (ex should look like ASS-101 Attachment 1 section 4 tabbing)
if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
{
if (localPrintLevel > 1)
{
localPrintLevel--;
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
}
}
if (!tbformat.Contains(@"{!C")) if (!tbformat.Contains(@"{!C"))
tbformat = seqtabs[itmp].PrintTabFormat; // seqtab in 16bit, i.e. '. or )' etc. tbformat = seqtabs[itmp].PrintTabFormat; // seqtab in 16bit, i.e. '. or )' etc.
else else

3
PROMS/Volian.Controls.Library/EditItem.cs
View File

@ -2982,9 +2982,10 @@ namespace Volian.Controls.Library
} }
else else
{ {
if (MyItemInfo.FormatStepData.StepLayoutData.AlignWithParentTab) if (MyItemInfo.FormatStepData.StepLayoutData.AlignWithParentTab || (MyItemInfo.IsFirstSubStep && MyItemInfo.MyParent.IsHigh && MyItemInfo.MyParent.FormatStepData.AppendDotZero))
// Paul Linn made the request on 6/4/12 to align the Component Description & // Paul Linn made the request on 6/4/12 to align the Component Description &
// Required Position under the Component Number. // Required Position under the Component Number.
// F2018-025 added check for high level step being used as a section number/title (tab ends with ".0") for Westinghouse wst1 format step type 50
ItemLocation = new Point(_MyParentEditItem.ItemLocation.X, _MyParentEditItem.Bottom); ItemLocation = new Point(_MyParentEditItem.ItemLocation.X, _MyParentEditItem.Bottom);
// part of F2017-011, for enhanced backgrounds, always align the TitleWithTextRight and TitleWithTextBelow with the parent tab (on the screen) // part of F2017-011, for enhanced backgrounds, always align the TitleWithTextRight and TitleWithTextBelow with the parent tab (on the screen)
else if ((MyItemInfo.FormatStepData.Type == "TitleWithTextRight" || MyItemInfo.FormatStepData.Type == "TitleWithTextBelow") && ((MyItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds)) // align with parent tab if in background document else if ((MyItemInfo.FormatStepData.Type == "TitleWithTextRight" || MyItemInfo.FormatStepData.Type == "TitleWithTextBelow") && ((MyItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds)) // align with parent tab if in background document

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

@ -5893,6 +5893,19 @@ namespace Volian.Print.Library
XOffset = MyParent.XOffset; XOffset = MyParent.XOffset;
if (myTab != null) myTab.XOffset = (MyParent.MyTab != null ? MyParent.MyTab.XOffset : XOffset); if (myTab != null) myTab.XOffset = (MyParent.MyTab != null ? MyParent.MyTab.XOffset : XOffset);
} }
else if (itemInfo.IsSequential && itemInfo.MyHLS.FormatStepData.AppendDotZero)// F2018-025 shift first level substep to column position of high level step Westinghouse wst1 step type 50
{
if (itemInfo.MyParent.IsHigh)
{
XOffset = MyParent.XOffset;
if (myTab != null) myTab.XOffset = (MyParent.MyTab != null ? MyParent.MyTab.XOffset : XOffset);
}
else
{
myTab.XOffset = MyParent.XOffset;
XOffset = myTab.XOffset + MyTab.Width;
}
}
else if (myTab != null && itemInfo.IsSequential && formatInfo.PlantFormat.FormatData.SectData.UseMetaSections && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList.Count > 0) else if (myTab != null && itemInfo.IsSequential && formatInfo.PlantFormat.FormatData.SectData.UseMetaSections && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList.Count > 0)
{ {
int indxLevels = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel(); int indxLevels = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel();