Compare commits
No commits in common. "master" and "B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search" have entirely different histories.
master
...
B2022-031-
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -547,17 +547,6 @@ namespace VEPROMS.CSLA.Library
|
||||
return LazyLoad(ref _AdjSectTitleLoc, "@AdjSectTitleLoc");
|
||||
}
|
||||
}
|
||||
|
||||
// this will add additional spacing between the Section Numbers and Titles
|
||||
private LazyLoad<float?> _SectTitleOffsetOverride;
|
||||
public float? SectTitleOffsetOverride
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _SectTitleOffsetOverride, "@SectTitleOffsetOverride");
|
||||
}
|
||||
}
|
||||
|
||||
#endregion AdjSectTitleLoc
|
||||
|
||||
#region ShowAlarmPointWindowInfo
|
||||
@ -664,21 +653,6 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AltMultiUnitWording
|
||||
[Category("Miscellaneous")]
|
||||
[Description("Alternate Wording for Printing when MultiUnit")]
|
||||
|
||||
// this will utilize Alternate Wording for Printing when MultiUnit and PrintCommonForZeroUnit is set
|
||||
private LazyLoad<string> _AltMultiUnitWording;
|
||||
public string AltMultiUnitWording
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _AltMultiUnitWording, "@AltMultiUnitWording");
|
||||
}
|
||||
}
|
||||
#endregion IncludeInTOC
|
||||
public override string ToString()
|
||||
{
|
||||
return String.Format("{0:D2} - {1}", Index, Name);
|
||||
|
@ -400,7 +400,7 @@ namespace Volian.Controls.Library
|
||||
this.superTooltip1.SetSuperTooltip(this.cbxProcSectSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
|
||||
"text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
|
||||
this.cbxProcSectSrch.TabIndex = 5;
|
||||
this.cbxProcSectSrch.Text = "Ignore Procedure and Section Titles";
|
||||
this.cbxProcSectSrch.Text = "Ignore Procedure and Section titles";
|
||||
//
|
||||
// cbxCaseSensitive
|
||||
//
|
||||
|
@ -1761,16 +1761,6 @@ i = 0;
|
||||
case "[HEADER4]":
|
||||
case "{HEADER5}":
|
||||
case "[HEADER5]":
|
||||
case "{HEADER6}":
|
||||
case "[HEADER6]":
|
||||
case "{HEADER7}":
|
||||
case "[HEADER7]":
|
||||
case "{HEADER8}":
|
||||
case "[HEADER8]":
|
||||
case "{HEADER9}":
|
||||
case "[HEADER9]":
|
||||
case "{HEADER10}":
|
||||
case "[HEADER10]":
|
||||
case "{BOX1}":
|
||||
case "[BOX1]":
|
||||
case "{BOX2}":
|
||||
@ -2109,12 +2099,7 @@ i = 0;
|
||||
case "[UNITNUMBER]":
|
||||
string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number;
|
||||
if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0")
|
||||
{
|
||||
if (String.IsNullOrEmpty(MySection.MyDocStyle.AltMultiUnitWording))
|
||||
plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
|
||||
else
|
||||
plstr = MySection.MyDocStyle.AltMultiUnitWording; // for Comanche Peak Abnormal, replace "Unit 0" with "UNIT 1 AND 2"
|
||||
}
|
||||
plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
|
||||
else
|
||||
plstr = plstr.Replace(token, unbr);
|
||||
break;
|
||||
|
@ -6199,12 +6199,6 @@ namespace Volian.Print.Library
|
||||
XOffset += (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[level].SecTitlePositionAdj;
|
||||
XOffset -= xMetaAdj;
|
||||
}
|
||||
|
||||
if (itemInfo.MyDocStyle.SectTitleOffsetOverride != null)
|
||||
{
|
||||
XOffset += (float)itemInfo.MyDocStyle.SectTitleOffsetOverride;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else if (formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Just == "PSCenter")
|
||||
|
Loading…
x
Reference in New Issue
Block a user