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

Use config data to determine whether a step is enhanced rather than format flag EnhancedLinkedStep

Browse Source 
Remove EnhancedLinkedStep format flag
Remove unnecessary comments
This commit is contained in:
Kathy Ruffing
2016-05-19 12:57:29 +00:00
parent 8a43e3d5dc
commit 7f38f14657
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1960,11 +1960,9 @@ namespace VEPROMS.CSLA.Library
{ {
get get
{ {
if (FormatStepData != null) if (!IsStep) return false;
{ StepConfig sc = MyConfig as StepConfig;
E_AccStep? actable = FormatStepData.StepEditData.AcTable; if (sc.MyEnhancedDocuments != null && sc.MyEnhancedDocuments.Count == 1 && sc.MyEnhancedDocuments[0].Type == 0) return true;
return (actable != null && MyActiveSection != null && MyActiveSection.IsEnhancedSection && ((actable & E_AccStep.EnhancedLinkedStep) != 0));
}
return false; return false;
} }
} }

1
PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
View File

@@ -188,7 +188,6 @@ namespace VEPROMS.CSLA.Library
AddingTable = 16, AddingTable = 16,
AddingNext = 32, AddingNext = 32,
AddingPrev = 64, AddingPrev = 64,
EnhancedLinkedStep = 128 // this will flag that this is a linked step & should not allow inserts/deletes
} }
[Flags] [Flags]
public enum E_ReplaceFlags : uint public enum E_ReplaceFlags : uint

5
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@@ -1508,10 +1508,9 @@ namespace Volian.Controls.Library
StepData sd = MyItemInfo.FormatStepData; StepData sd = MyItemInfo.FormatStepData;
actable = sd.StepEditData.AcTable; actable = sd.StepEditData.AcTable;
if (actable == null) actable = 0; if (actable == null) actable = 0;
//btnInsHLS.Enabled = !MyItemInfo.IsEnhancedStep && MyItemInfo.MyHLS != null && !MyItemInfo.MyHLS.IsEnhancedStep; // (actable & E_AccStep.EnhancedLinkedStep) == 0; btnInsHLS.Enabled = MyItemInfo.MyHLS != null;
btnInsHLS.Enabled = MyItemInfo.MyHLS != null; // (actable & E_AccStep.EnhancedLinkedStep) == 0;
btnInsCaut.Enabled = ((actable & E_AccStep.AddingCaution) > 0) && !MyItemInfo.IsEnhancedStep; // ((actable & E_AccStep.AddingCaution) > 0) && ((actable & E_AccStep.EnhancedLinkedStep) == 0); btnInsCaut.Enabled = ((actable & E_AccStep.AddingCaution) > 0) && !MyItemInfo.IsEnhancedStep;
btnInsNote.Enabled = ((actable & E_AccStep.AddingNote) > 0) && !MyItemInfo.IsEnhancedStep; btnInsNote.Enabled = ((actable & E_AccStep.AddingNote) > 0) && !MyItemInfo.IsEnhancedStep;
btnInsRNO.Enabled = (actable & E_AccStep.AddingRNO) > 0; btnInsRNO.Enabled = (actable & E_AccStep.AddingRNO) > 0;
btnInsFig.Enabled = (actable & E_AccStep.AddingTable) > 0; btnInsFig.Enabled = (actable & E_AccStep.AddingTable) > 0;