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

Process pagenum transitions for BGE

Browse Source 
Added unit number config item to user interface for printing pagelist items for BGE
Added Print_UnitNumberForPageList config item
BGE: don’t remove ‘.’ At end of tab when making a section/step tab
Check for pagenum transitions for resolving transition text (the type BGE has)
Added UnitNumber, Level0Big and UseSpecificTransitionModifier flags
This commit is contained in:
Kathy Ruffing 2014-04-04 13:13:31 +00:00
parent 055d550a74
commit a61dabd52e
8 changed files with 546 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
View File

@ -586,7 +586,7 @@ namespace VEPROMS
pbPDFsStatus.Value = i; pbPDFsStatus.Value = i;
// this.Text = string.Format("Create PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); // this.Text = string.Format("Create PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n);
// RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered. // RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered.
if (MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier) if (MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave); MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave);
else else
MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID); MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID);
@ -652,7 +652,7 @@ namespace VEPROMS
// Determine change bar settings. First get from config & then see if override from dialog. // Determine change bar settings. First get from config & then see if override from dialog.
// Also check that format allows override. // Also check that format allows override.
ChangeBarDefinition cbd = DetermineChangeBarSettings(); ChangeBarDefinition cbd = DetermineChangeBarSettings();
if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier) if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave); MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave);
else else
MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID); MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID);

865
PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

15
PROMS/VEPROMS User Interface/frmVersionsProperties.cs
View File

@ -138,6 +138,8 @@ namespace VEPROMS
} }
} }
} }
_DocVersionConfig.Print_UnitNumberForPageList = ppTxbxUnitNum.Text;
docVersionConfigBindingSource.EndEdit(); docVersionConfigBindingSource.EndEdit();
// Save Default settings for User // Save Default settings for User
// //
@ -293,6 +295,19 @@ namespace VEPROMS
ppCmbxProcSetType.ValueMember = "EValue"; ppCmbxProcSetType.ValueMember = "EValue";
ppCmbxProcSetType.Enabled = false; // maybe enable this if used for version creation ppCmbxProcSetType.Enabled = false; // maybe enable this if used for version creation
// check active format to see if the unit number text box on the format tab is visible.
if (_DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.PlantFormat.FormatData.PrintData.UnitNumber)
{
ppLblUnitNum.Visible = true;
ppTxbxUnitNum.Visible = true;
ppTxbxUnitNum.Text = _DocVersionConfig.Print_UnitNumberForPageList;
}
else
{
ppLblUnitNum.Visible = false;
ppTxbxUnitNum.Visible = false;
}
documentInfoListBindingSource.DataSource = DocumentInfoList.GetLibraries(false); documentInfoListBindingSource.DataSource = DocumentInfoList.GetLibraries(false);
ppBtnRoDbBrowse.Visible = cmbRoDb.Visible = _DocVersionConfig.MyDocVersion.DocVersionAssociationCount == 0; ppBtnRoDbBrowse.Visible = cmbRoDb.Visible = _DocVersionConfig.MyDocVersion.DocVersionAssociationCount == 0;

30
PROMS/VEPROMS User Interface/frmVersionsProperties.resx
View File

@ -123,12 +123,6 @@
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value> <value>415, 17</value>
</metadata> </metadata>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value>
</metadata>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>643, 17</value>
</metadata>
<data name="ppCmbxFormat.SuperTooltip" xml:space="preserve"> <data name="ppCmbxFormat.SuperTooltip" xml:space="preserve">
<value>Allows you to specify the default format to use for all procedures in this set. <value>Allows you to specify the default format to use for all procedures in this set.
@ -196,6 +190,15 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
<metadata name="dlgROFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="dlgROFolder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>237, 56</value> <value>237, 56</value>
</metadata> </metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="documentInfoListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>357, 56</value>
</metadata>
<data name="btnRoDbProperties.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnRoDbProperties.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -212,21 +215,6 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
vkpiAWfjAAAAAElFTkSuQmCC vkpiAWfjAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<metadata name="documentInfoListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>357, 56</value>
</metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ROPrefixBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ROPrefixBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>238, 17</value> <value>238, 17</value>
</metadata> </metadata>

26
PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs
View File

@ -838,6 +838,32 @@ namespace VEPROMS.CSLA.Library
} }
} }
} }
[Category("Print Settings")]
[DisplayName("UnitNumberForPageList")]
[RefreshProperties(RefreshProperties.All)]
[Description("For Printing of Unit 1, 2 or 1 & 2 on cover page and in header of other pages")]
public string Print_UnitNumberForPageList
{
get
{
string s = _Xp["PrintSettings", "UnitNumberForPageList"];
// If there is no value, then default to "1", i.e. Unit 1.
if (s == string.Empty) s = "1"; // default
return s;
}
set
{
if (_SaveChangesToDocVersionConfig)
{
string parval = _Xp.ParentValue("PrintSettings", "UnitNumberForPageList");
_Xp["PrintSettings", "UnitNumberForPageList"] = value;
OnPropertyChanged("Print_UnitNumberForPageList");
}
}
}
#endregion #endregion
#region Unit // From PROC.INI #region Unit // From PROC.INI
//MultiUnitCount //MultiUnitCount

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

@ -5069,6 +5069,11 @@ namespace VEPROMS.CSLA.Library
else else
return DisplayNumber; return DisplayNumber;
} }
// if displaynumber ends with a '.', don't worry about catching the condition that a tab can be made such as
// 'x. x', i.e. space between the . and the rest of tab. This was added for BGEEOPs.
if (DisplayNumber.LastIndexOf('.') == DisplayNumber.Length - 1) return DisplayNumber;
string retStr = null; string retStr = null;
string ch = DisplayNumber != null && DisplayNumber != "" ? DisplayNumber.Substring(0,1) : null; string ch = DisplayNumber != null && DisplayNumber != "" ? DisplayNumber.Substring(0,1) : null;
int Snum = GetSectionNum(); int Snum = GetSectionNum();

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

@ -97,7 +97,8 @@ namespace VEPROMS.CSLA.Library
ItemInfo myItemToID = MyItemToID; ItemInfo myItemToID = MyItemToID;
if (tranLookup.ContainsKey(item.ItemID)) item = tranLookup[item.ItemID]; if (tranLookup.ContainsKey(item.ItemID)) item = tranLookup[item.ItemID];
bool hasPageNum = false; bool hasPageNum = false;
if (item.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier) if (item.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier ||
item.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier)
{ {
TransitionConfig tc = new TransitionConfig(Config); TransitionConfig tc = new TransitionConfig(Config);
if (tc != null && tc.Transition_Formatted.ToUpper() == "TRUE") hasPageNum = true; if (tc != null && tc.Transition_Formatted.ToUpper() == "TRUE") hasPageNum = true;

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

@ -689,6 +689,22 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _RevDateWithForwardSlash, "@RevDateWithForwardSlash"); return LazyLoad(ref _RevDateWithForwardSlash, "@RevDateWithForwardSlash");
} }
} }
private LazyLoad<bool> _UnitNumber;
public bool UnitNumber
{
get
{
return LazyLoad(ref _UnitNumber, "@UnitNumber");
}
}
private LazyLoad<bool> _SpecialCaseCalvert;
public bool SpecialCaseCalvert
{
get
{
return LazyLoad(ref _SpecialCaseCalvert, "@SpecialCaseCalvert");
}
}
private LazyLoad<bool> _SpecialStepsFoldout; private LazyLoad<bool> _SpecialStepsFoldout;
public bool SpecialStepsFoldout public bool SpecialStepsFoldout
{ {
@ -1768,6 +1784,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Just, "@Just"); return LazyLoad(ref _Just, "@Just");
} }
} }
private LazyLoad<bool> _Level0Big;
public bool Level0Big
{
get
{
return LazyLoad(ref _Level0Big, "@Level0Big");
}
}
private VE_Font _Font; private VE_Font _Font;
public VE_Font Font public VE_Font Font
{ {
@ -1800,6 +1824,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Just, "@Just"); return LazyLoad(ref _Just, "@Just");
} }
} }
private LazyLoad<bool> _Level0Big;
public bool Level0Big
{
get
{
return LazyLoad(ref _Level0Big, "@Level0Big");
}
}
private VE_Font _Font; private VE_Font _Font;
public VE_Font Font public VE_Font Font
{ {
@ -5292,6 +5324,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _UseTransitionModifier, "@UseTransitionModifier"); return LazyLoad(ref _UseTransitionModifier, "@UseTransitionModifier");
} }
} }
private LazyLoad<bool> _UseSpecificTransitionModifier;
public bool UseSpecificTransitionModifier
{
get
{
return LazyLoad(ref _UseSpecificTransitionModifier, "@UseSpecificTransitionModifier");
}
}
private LazyLoad<bool> _UseSecTitles; private LazyLoad<bool> _UseSecTitles;
public bool UseSecTitles public bool UseSecTitles
{ {