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

B2019-043 Added checks for being in design mode during initialization of variables

Browse Source 
B2019-043 Added checks for being in design mode during initialization of variables.  Also needed to remove the parameter from the constructor
This commit is contained in:
John Jenko 2019-03-22 15:19:19 +00:00
parent 94f18653eb
commit b29176f636
11 changed files with 112 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
PROMS/Volian.Controls.Library/AnnotationDetails.Designer.cs generated
View File

@ -67,11 +67,11 @@ namespace Volian.Controls.Library
| System.Windows.Forms.AnchorStyles.Right)));
this.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.rtxbComment.Location = new System.Drawing.Point(87, 33);
this.rtxbComment.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.rtxbComment.Location = new System.Drawing.Point(65, 27);
this.rtxbComment.Margin = new System.Windows.Forms.Padding(2);
this.rtxbComment.Name = "rtxbComment";
this.rtxbComment.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
this.rtxbComment.Size = new System.Drawing.Size(489, 292);
this.rtxbComment.Size = new System.Drawing.Size(368, 237);
this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.rtxbComment.TabIndex = 1;
this.rtxbComment.Text = "";
@ -82,10 +82,10 @@ namespace Volian.Controls.Library
//
this.btnSaveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnSaveAnnotation.Enabled = false;
this.btnSaveAnnotation.Location = new System.Drawing.Point(491, 4);
this.btnSaveAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnSaveAnnotation.Location = new System.Drawing.Point(368, 3);
this.btnSaveAnnotation.Margin = new System.Windows.Forms.Padding(2);
this.btnSaveAnnotation.Name = "btnSaveAnnotation";
this.btnSaveAnnotation.Size = new System.Drawing.Size(71, 25);
this.btnSaveAnnotation.Size = new System.Drawing.Size(53, 20);
this.superTooltip1.SetSuperTooltip(this.btnSaveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Save Changes", "", "This will save the new annotation or changes made to an existing annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnSaveAnnotation.TabIndex = 9;
this.btnSaveAnnotation.Text = "Save";
@ -95,10 +95,10 @@ namespace Volian.Controls.Library
//
this.btnCancelAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnCancelAnnoation.Enabled = false;
this.btnCancelAnnoation.Location = new System.Drawing.Point(401, 4);
this.btnCancelAnnoation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnCancelAnnoation.Location = new System.Drawing.Point(301, 3);
this.btnCancelAnnoation.Margin = new System.Windows.Forms.Padding(2);
this.btnCancelAnnoation.Name = "btnCancelAnnoation";
this.btnCancelAnnoation.Size = new System.Drawing.Size(69, 25);
this.btnCancelAnnoation.Size = new System.Drawing.Size(52, 20);
this.superTooltip1.SetSuperTooltip(this.btnCancelAnnoation, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This will cancel the changes made to the annotation text and type selection", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(145, 100)));
this.btnCancelAnnoation.TabIndex = 8;
this.btnCancelAnnoation.Text = "Cancel";
@ -113,11 +113,11 @@ namespace Volian.Controls.Library
this.cbGridAnnoType.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbGridAnnoType.ForeColor = System.Drawing.SystemColors.WindowText;
this.cbGridAnnoType.ItemHeight = 17;
this.cbGridAnnoType.Location = new System.Drawing.Point(133, 4);
this.cbGridAnnoType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbGridAnnoType.Location = new System.Drawing.Point(100, 3);
this.cbGridAnnoType.Margin = new System.Windows.Forms.Padding(2);
this.cbGridAnnoType.Name = "cbGridAnnoType";
this.cbGridAnnoType.PreventEnterBeep = true;
this.cbGridAnnoType.Size = new System.Drawing.Size(244, 23);
this.cbGridAnnoType.Size = new System.Drawing.Size(184, 23);
this.superTooltip1.SetSuperTooltip(this.cbGridAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "This drop down list contains the possible annotation types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbGridAnnoType.TabIndex = 7;
this.cbGridAnnoType.WatermarkBehavior = DevComponents.DotNetBar.eWatermarkBehavior.HideNonEmpty;
@ -127,10 +127,10 @@ namespace Volian.Controls.Library
// btnRemoveAnnotation
//
this.btnRemoveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnRemoveAnnotation.Location = new System.Drawing.Point(5, 34);
this.btnRemoveAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnRemoveAnnotation.Location = new System.Drawing.Point(4, 28);
this.btnRemoveAnnotation.Margin = new System.Windows.Forms.Padding(2);
this.btnRemoveAnnotation.Name = "btnRemoveAnnotation";
this.btnRemoveAnnotation.Size = new System.Drawing.Size(71, 25);
this.btnRemoveAnnotation.Size = new System.Drawing.Size(53, 20);
this.superTooltip1.SetSuperTooltip(this.btnRemoveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnRemoveAnnotation.TabIndex = 4;
this.btnRemoveAnnotation.Text = "Remove";
@ -139,10 +139,10 @@ namespace Volian.Controls.Library
// btnAddAnnotation
//
this.btnAddAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnAddAnnotation.Location = new System.Drawing.Point(5, 4);
this.btnAddAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnAddAnnotation.Location = new System.Drawing.Point(4, 3);
this.btnAddAnnotation.Margin = new System.Windows.Forms.Padding(2);
this.btnAddAnnotation.Name = "btnAddAnnotation";
this.btnAddAnnotation.Size = new System.Drawing.Size(71, 25);
this.btnAddAnnotation.Size = new System.Drawing.Size(53, 20);
this.superTooltip1.SetSuperTooltip(this.btnAddAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Add New Annotation", "", "This button will create a new annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnAddAnnotation.TabIndex = 3;
this.btnAddAnnotation.Text = "Add";
@ -159,10 +159,10 @@ namespace Volian.Controls.Library
this.pannelAnnoEdit.Controls.Add(this.panelAnnoEditBtns);
this.pannelAnnoEdit.DisabledBackColor = System.Drawing.Color.Empty;
this.pannelAnnoEdit.Dock = System.Windows.Forms.DockStyle.Fill;
this.pannelAnnoEdit.Location = new System.Drawing.Point(548, 0);
this.pannelAnnoEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pannelAnnoEdit.Location = new System.Drawing.Point(411, 0);
this.pannelAnnoEdit.Margin = new System.Windows.Forms.Padding(2);
this.pannelAnnoEdit.Name = "pannelAnnoEdit";
this.pannelAnnoEdit.Size = new System.Drawing.Size(576, 325);
this.pannelAnnoEdit.Size = new System.Drawing.Size(432, 264);
this.pannelAnnoEdit.Style.Alignment = System.Drawing.StringAlignment.Center;
this.pannelAnnoEdit.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.pannelAnnoEdit.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -182,10 +182,10 @@ namespace Volian.Controls.Library
//
this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX1.Location = new System.Drawing.Point(93, 7);
this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.labelX1.Location = new System.Drawing.Point(70, 6);
this.labelX1.Margin = new System.Windows.Forms.Padding(2);
this.labelX1.Name = "labelX1";
this.labelX1.Size = new System.Drawing.Size(35, 17);
this.labelX1.Size = new System.Drawing.Size(29, 14);
this.labelX1.TabIndex = 10;
this.labelX1.Text = "Type:";
//
@ -197,9 +197,9 @@ namespace Volian.Controls.Library
this.panelAnnoEditBtns.DisabledBackColor = System.Drawing.Color.Empty;
this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left;
this.panelAnnoEditBtns.Location = new System.Drawing.Point(0, 0);
this.panelAnnoEditBtns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panelAnnoEditBtns.Margin = new System.Windows.Forms.Padding(2);
this.panelAnnoEditBtns.Name = "panelAnnoEditBtns";
this.panelAnnoEditBtns.Size = new System.Drawing.Size(87, 325);
this.panelAnnoEditBtns.Size = new System.Drawing.Size(65, 264);
this.panelAnnoEditBtns.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelAnnoEditBtns.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.panelAnnoEditBtns.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -234,10 +234,10 @@ namespace Volian.Controls.Library
this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
this.expandableSplitter4.Location = new System.Drawing.Point(545, 0);
this.expandableSplitter4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.expandableSplitter4.Location = new System.Drawing.Point(409, 0);
this.expandableSplitter4.Margin = new System.Windows.Forms.Padding(2);
this.expandableSplitter4.Name = "expandableSplitter4";
this.expandableSplitter4.Size = new System.Drawing.Size(3, 325);
this.expandableSplitter4.Size = new System.Drawing.Size(2, 264);
this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
this.expandableSplitter4.TabIndex = 15;
this.expandableSplitter4.TabStop = false;
@ -249,9 +249,9 @@ namespace Volian.Controls.Library
this.pannelAnnoGrid.DisabledBackColor = System.Drawing.Color.Empty;
this.pannelAnnoGrid.Dock = System.Windows.Forms.DockStyle.Left;
this.pannelAnnoGrid.Location = new System.Drawing.Point(0, 0);
this.pannelAnnoGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pannelAnnoGrid.Margin = new System.Windows.Forms.Padding(2);
this.pannelAnnoGrid.Name = "pannelAnnoGrid";
this.pannelAnnoGrid.Size = new System.Drawing.Size(545, 325);
this.pannelAnnoGrid.Size = new System.Drawing.Size(409, 264);
this.pannelAnnoGrid.Style.Alignment = System.Drawing.StringAlignment.Center;
this.pannelAnnoGrid.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.pannelAnnoGrid.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -287,7 +287,7 @@ namespace Volian.Controls.Library
this.dgAnnotations.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.dgAnnotations.HighlightSelectedColumnHeaders = false;
this.dgAnnotations.Location = new System.Drawing.Point(0, 0);
this.dgAnnotations.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.dgAnnotations.Margin = new System.Windows.Forms.Padding(2);
this.dgAnnotations.MultiSelect = false;
this.dgAnnotations.Name = "dgAnnotations";
this.dgAnnotations.RowHeadersVisible = false;
@ -296,7 +296,7 @@ namespace Volian.Controls.Library
this.dgAnnotations.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.dgAnnotations.SelectAllSignVisible = false;
this.dgAnnotations.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgAnnotations.Size = new System.Drawing.Size(545, 325);
this.dgAnnotations.Size = new System.Drawing.Size(409, 264);
this.dgAnnotations.TabIndex = 1;
this.dgAnnotations.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgAnnotations_CellClick);
//
@ -305,21 +305,21 @@ namespace Volian.Controls.Library
this.myAnnotationTypeDataGridViewTextBoxColumn.DataPropertyName = "MyAnnotationType";
this.myAnnotationTypeDataGridViewTextBoxColumn.HeaderText = "Type";
this.myAnnotationTypeDataGridViewTextBoxColumn.Name = "myAnnotationTypeDataGridViewTextBoxColumn";
this.myAnnotationTypeDataGridViewTextBoxColumn.Width = 69;
this.myAnnotationTypeDataGridViewTextBoxColumn.Width = 56;
//
// dTSDataGridViewTextBoxColumn
//
this.dTSDataGridViewTextBoxColumn.DataPropertyName = "DTS";
this.dTSDataGridViewTextBoxColumn.HeaderText = "Date";
this.dTSDataGridViewTextBoxColumn.Name = "dTSDataGridViewTextBoxColumn";
this.dTSDataGridViewTextBoxColumn.Width = 67;
this.dTSDataGridViewTextBoxColumn.Width = 55;
//
// userIDDataGridViewTextBoxColumn
//
this.userIDDataGridViewTextBoxColumn.DataPropertyName = "UserID";
this.userIDDataGridViewTextBoxColumn.HeaderText = "User";
this.userIDDataGridViewTextBoxColumn.Name = "userIDDataGridViewTextBoxColumn";
this.userIDDataGridViewTextBoxColumn.Width = 67;
this.userIDDataGridViewTextBoxColumn.Width = 54;
//
// searchTextDataGridViewTextBoxColumn
//
@ -334,14 +334,14 @@ namespace Volian.Controls.Library
//
// AnnotationDetails
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.pannelAnnoEdit);
this.Controls.Add(this.expandableSplitter4);
this.Controls.Add(this.pannelAnnoGrid);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "AnnotationDetails";
this.Size = new System.Drawing.Size(1124, 325);
this.Size = new System.Drawing.Size(843, 264);
this.pannelAnnoEdit.ResumeLayout(false);
this.pannelAnnoEdit.PerformLayout();
this.panelAnnoEditBtns.ResumeLayout(false);

69
PROMS/Volian.Controls.Library/AnnotationDetails.cs
View File

@ -28,9 +28,12 @@ namespace Volian.Controls.Library
get { return _ProcItem; }
set
{
//if (_ProcItem == value) return; // Jeff (Westinghouse) requested list to be provided every time fixes both C2016-007 and B2016-097
_ProcItem = value;
if (ExeType > 0) CreateProcList();
if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface
{
//if (_ProcItem == value) return; // Jeff (Westinghouse) requested list to be provided every time fixes both C2016-007 and B2016-097
_ProcItem = value;
if (ExeType > 0) CreateProcList();
}
}
}
@ -93,12 +96,15 @@ namespace Volian.Controls.Library
get { return _CurrentItem; }
set
{
_CurrentItem = value;
SetupCurrentItemValues();
SetupConfigEdit();
// B2017-126 Only turn-on NamedPipe if Command Line parameter /NamedPipe is used.
// This eliminates waiting for the Pipe if the command line parameter is not used.
if (ExeType > 0 && Volian.Base.Library.VlnSettings.GetCommandFlag("NamedPipe")) SendPromsAnnotationData();
if (!DesignMode && value != null) // B2019-043 need to check if we are just saving changes to the user interface
{
_CurrentItem = value;
SetupCurrentItemValues();
SetupConfigEdit();
// B2017-126 Only turn-on NamedPipe if Command Line parameter /NamedPipe is used.
// This eliminates waiting for the Pipe if the command line parameter is not used.
if (ExeType > 0 && Volian.Base.Library.VlnSettings.GetCommandFlag("NamedPipe")) SendPromsAnnotationData();
}
}
}
private int _FromType;
@ -124,7 +130,7 @@ namespace Volian.Controls.Library
}
private void SetupConfigEdit()
{
if (ExeType == 0) ; // initialize ExeType
//if (ExeType == 0) ; // initialize ExeType
}
private string _ExePath;
private string _PipeOut;
@ -135,7 +141,7 @@ namespace Volian.Controls.Library
{
get
{
if (_ExeType == 0)
if (!DesignMode && _ExeType == 0) // B2019-043 need to check if we are just saving changes to the user interface
{
_ExeType = -1;
foreach (AnnotationTypeInfo ati in AnnotationTypeInfoList.Get())
@ -163,9 +169,12 @@ namespace Volian.Controls.Library
{
get { return _Annotations; }
set
{
_Annotations = value;
itemAnnotationsBindingSource.DataSource = _Annotations;
{
if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface
{
_Annotations = value;
itemAnnotationsBindingSource.DataSource = _Annotations;
}
}
}
@ -175,6 +184,7 @@ namespace Volian.Controls.Library
get { return _CurrentAnnotation; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
if (_CurrentAnnotation == null && value == null) return; // No Change
if (_CurrentAnnotation != null && value != null)
if (_CurrentAnnotation.AnnotationID == value.AnnotationID) return; // No Change
@ -207,9 +217,12 @@ namespace Volian.Controls.Library
get { return rtxbComment.Text; }
set
{
rtxbComment.Text = value;
if (rtxbComment.Text != string.Empty)
rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text
if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface
{
rtxbComment.Text = value;
if (rtxbComment.Text != string.Empty)
rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text
}
}
}
@ -218,9 +231,12 @@ namespace Volian.Controls.Library
get { return rtxbComment.Rtf; }
set
{
rtxbComment.Rtf = value;
if (rtxbComment.Rtf != string.Empty)
rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text
if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface
{
rtxbComment.Rtf = value;
if (rtxbComment.Rtf != string.Empty)
rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text
}
}
}
private UserInfo _MyUserInfo;
@ -413,13 +429,16 @@ namespace Volian.Controls.Library
private void StartClientProcess()
{
_ClientProcess = Process.Start(_ExePath);
_ClientProcess.WaitForInputIdle();
_ClientProcess.Exited += ClientProcess_Exited;
if (_ExePath != null) // B2019-043 if we are just saving changes to the user interface don't do anything
{
_ClientProcess = Process.Start(_ExePath);
_ClientProcess.WaitForInputIdle();
_ClientProcess.Exited += ClientProcess_Exited;
}
}
private void SendPromsAnnotationData()
{
Console.WriteLine("Send {0}", CurrentItem);
//Console.WriteLine("Send {0}", CurrentItem);
XmlDocument xdMessage = new XmlDocument();
xdMessage.LoadXml("<PromsToClient Mode='AnnotationSetup'><PromsAnnotationConfig/></PromsToClient>");
// Add Steps Data
@ -496,7 +515,7 @@ namespace Volian.Controls.Library
private void ProcessMessage(string message)
{
Console.WriteLine(message);
//Console.WriteLine(message);
XmlDocument xd = new XmlDocument();
xd.LoadXml(message);
string Mode = GetAttribute(xd, "ClientToProms", "Mode");

2
PROMS/Volian.Controls.Library/DisplayApplicability.cs
View File

@ -25,6 +25,7 @@ namespace Volian.Controls.Library
get { return _MyDisplayTabItem; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
_MyDisplayTabItem = value;
gpMode.Controls.Clear();
gpItem.Controls.Clear();
@ -269,6 +270,7 @@ namespace Volian.Controls.Library
get { return _MyItemInfo; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
if (_MyItemInfo != null)
{
MyApplicability = string.Empty;

7
PROMS/Volian.Controls.Library/DisplayFoldoutMaint.cs
View File

@ -17,6 +17,7 @@ namespace Volian.Controls.Library
get { return _MyItemInfo; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
_MyItemInfo = value;
_MainStepSection = null;
FillInControls();
@ -27,7 +28,7 @@ namespace Volian.Controls.Library
{
get
{
if (_MainStepSection == null)
if (!DesignMode && _MainStepSection == null) // B2019-043 need to check if we are just saving changes to the user interface
{
foreach (SectionInfo si in MyItemInfo.MyProcedure.Sections)
{
@ -38,8 +39,8 @@ namespace Volian.Controls.Library
return _MainStepSection;
}
}
private ItemInfo _firstStep;
private ItemInfo _lastStep;
//private ItemInfo _firstStep;
//private ItemInfo _lastStep;
private bool _Initializing;
public DisplayFoldoutMaint()

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

@ -53,6 +53,7 @@ namespace Volian.Controls.Library
get { return _MyProcedureInfo; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
if (value is ProcedureInfo && _MyProcedureInfo is ProcedureInfo && value.ItemID == _MyProcedureInfo.ItemID)
return;
_MyProcedureInfo = value;
@ -73,6 +74,7 @@ namespace Volian.Controls.Library
get { return _MyItemInfo; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
if (value is ItemInfo && _MyItemInfo is ItemInfo && value.ItemID == _MyItemInfo.ItemID)
return;
_MyItemInfo = value;
@ -94,7 +96,8 @@ namespace Volian.Controls.Library
{
get { return _MyEditItem; }
set
{
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
_MyEditItem = value;
if (value != null)
MyItemInfo = value.MyItemInfo;

11
PROMS/Volian.Controls.Library/DisplayRO.cs
View File

@ -34,7 +34,7 @@ namespace Volian.Controls.Library
{
get { return _MyROFSTLookup; }
set
{
{
_MyROFSTLookup = value;
LoadTree();
}
@ -81,8 +81,8 @@ namespace Volian.Controls.Library
get { return _MyRTB; }
set
{
int origRoDbId = -1;
if (!Visible) return;
int origRoDbId = -1;
if (_MyRTB != null)
{
_MyRTB.LinkChanged -= new StepRTBLinkEvent(MyRTB_LinkChanged);
@ -197,10 +197,13 @@ namespace Volian.Controls.Library
#endregion
#region Constructors
public DisplayRO(DisplayTabControl tc)// Added DisplayTabControl to the constructor to assure that it is set
public DisplayRO() // B2019-043 jsj 2019Mar21 - Removed the DisplayTabControl parameter from the constructor
{
InitializeComponent();
TabControl = tc;// B2017-074 Added DisplayTabControl to the constructor to assure that it is set
// jsj 2019Mar21 - This is initialized in frmVEPROMS.Designer.cs and in frmVEPROMS.cs in the constructor after the call to InitializeComponent()
// When we had passed in the DisplayTabControl as a parameter, "DisplayRO(DisplayTabControl tc)", the frmVEPROMS designer would not include a NEW call for DisplayRO
// in the "Windows Form Designer generated code" Region and thus cause the design view to no longer appear.
//TabControl = tc;// B2017-074 Added DisplayTabControl to the constructor to assure that it is set
_ProgressBar = null;
panelRoValue.BackColor = Color.Cornsilk;
panelValue.BackColor = Color.Cornsilk;

2
PROMS/Volian.Controls.Library/DisplayReports.cs
View File

@ -55,6 +55,7 @@ namespace Volian.Controls.Library
get { return _MyDocVersion; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
_MyDocVersion = value;
if (_MyDocVersion != null)
{
@ -80,6 +81,7 @@ namespace Volian.Controls.Library
get { return _MyROFSTLookup; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
//if (!Visible) return; // don't reset anything if the form is invisible.
_MyROFSTLookup = value; // define the tree nodes based on this rofst
advTreeROFillIn(true);

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

@ -51,6 +51,7 @@ namespace Volian.Controls.Library
get { return _SearchResults; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
_SearchResults = value;
if (value != null) // Don't select an item from the list when it is updated
_SearchResults.ListChanged += new ListChangedEventHandler(_SearchResults_ListChanged);
@ -82,6 +83,7 @@ namespace Volian.Controls.Library
get { return _MyDocVersion; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
_MyDocVersion = value;
if (_MyDocVersion != null)
{
@ -110,6 +112,7 @@ namespace Volian.Controls.Library
get { return _MyROFSTLookup; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
bool beforeIsNotNull = _MyROFSTLookup != null;
bool afterIsNotNull = value != null;
//if (!Visible) return; // don't reset anything if the form is invisible.

1
PROMS/Volian.Controls.Library/DisplayTabControl.cs
View File

@ -910,6 +910,7 @@ namespace Volian.Controls.Library
get { return _SelectedDisplayTabItem; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
if (_SelectedDisplayTabItem != value)
{
if (_SelectedDisplayTabItem != null && _SelectedDisplayTabItem.MyDSOTabPanel != null)

4
PROMS/Volian.Controls.Library/DisplayTags.cs
View File

@ -34,7 +34,8 @@ namespace Volian.Controls.Library
{
get { return _NotVisibleEditItem; }
set
{
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
_NotVisibleEditItem = null;
if (value != null && value.MyItemInfo != null && value.MyItemInfo.IsStep)
_NotVisibleEditItem = value; // Only visible for steps
@ -46,6 +47,7 @@ namespace Volian.Controls.Library
get { return _MyEditItem; }
set
{
if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
if (!Visible)
{
NotVisibleEditItem = value;

6
PROMS/Volian.Controls.Library/DisplayTransition.cs
View File

@ -26,7 +26,7 @@ namespace Volian.Controls.Library
get { return _CurTrans; }
set
{
if (!Visible) return;
if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface
if (value == null) // Insert a transition
{
if (MyRTB == null) return;
@ -106,7 +106,7 @@ namespace Volian.Controls.Library
get { return _MyRTB; }
set
{
if (!Visible) return;
if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface
// add or remove events for
if (_MyRTB != null)
_MyRTB.LinkChanged -= new StepRTBLinkEvent(_MyRTB_LinkChanged);
@ -532,7 +532,7 @@ namespace Volian.Controls.Library
tvTran.ItemHeight++;
tvTran.ItemHeight--;
}
private int savSecStart;
//private int savSecStart;
private void cbTranSectsFillIn(ItemInfo secitm, int secstart, bool clear)
{
if (clear) cbTranSects.Items.Clear();