diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 4175c90e..ed41b796 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -1234,7 +1234,7 @@ namespace VEPROMS.CSLA.Library string fileName = VlnSettings.TemporaryFolder + @"\Doc " + sect.MyContent.MyEntry.DocID.ToString(); // +" " + (sect.DisplayNumber == "" ? sect.DisplayText : sect.DisplayNumber); return fileName; } - private static RectangleF CreatePlot(string pngFile, string xyPlot, float resolution, System.Windows.Forms.Form myForm) + public static RectangleF CreatePlot(string pngFile, string xyPlot, float resolution, System.Windows.Forms.Form myForm) { RectangleF retval = new RectangleF(0, 0, 0, 0); //Form frm = Application.OpenForms[0]; diff --git a/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs b/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs index 90ce4f07..e1765e7d 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs @@ -30,13 +30,9 @@ namespace Volian.Controls.Library { this.components = new System.ComponentModel.Container(); this.tctrlReports = new DevComponents.DotNetBar.TabControl(); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.cbxTransToProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxTransFromProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.tabTransitionReports = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.panRORpts = new DevComponents.DotNetBar.PanelEx(); + this.cbxIncldMissingROs = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxSummary = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxROUsage = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxComplete = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -45,6 +41,11 @@ namespace Volian.Controls.Library this.cbiRO = new DevComponents.Editors.ComboItem(); this.cbiProc = new DevComponents.Editors.ComboItem(); this.tabROReports = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.cbxTransToProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxTransFromProcs = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.tabTransitionReports = new DevComponents.DotNetBar.TabItem(this.components); this.advTreeRO = new DevComponents.AdvTree.AdvTree(); this.elementStyle2 = new DevComponents.DotNetBar.ElementStyle(); this.node2 = new DevComponents.AdvTree.Node(); @@ -56,13 +57,12 @@ namespace Volian.Controls.Library this.nodeConnector1 = new DevComponents.AdvTree.NodeConnector(); this.btnPrintReport = new DevComponents.DotNetBar.ButtonX(); this.xpSelROs = new DevComponents.DotNetBar.ExpandablePanel(); - this.cbxIncldMissingROs = new DevComponents.DotNetBar.Controls.CheckBoxX(); ((System.ComponentModel.ISupportInitialize)(this.tctrlReports)).BeginInit(); this.tctrlReports.SuspendLayout(); - this.tabControlPanel1.SuspendLayout(); - this.panelEx1.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.panRORpts.SuspendLayout(); + this.tabControlPanel1.SuspendLayout(); + this.panelEx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.advTreeRO)).BeginInit(); this.xpSetToReport.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit(); @@ -74,8 +74,8 @@ namespace Volian.Controls.Library this.tctrlReports.CanReorderTabs = false; this.tctrlReports.CloseButtonOnTabsAlwaysDisplayed = false; this.tctrlReports.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; - this.tctrlReports.Controls.Add(this.tabControlPanel2); this.tctrlReports.Controls.Add(this.tabControlPanel1); + this.tctrlReports.Controls.Add(this.tabControlPanel2); this.tctrlReports.Dock = System.Windows.Forms.DockStyle.Top; this.tctrlReports.Location = new System.Drawing.Point(0, 0); this.tctrlReports.Margin = new System.Windows.Forms.Padding(2); @@ -93,88 +93,6 @@ namespace Volian.Controls.Library this.tctrlReports.Text = "tabControl1"; this.tctrlReports.ThemeAware = true; // - // tabControlPanel1 - // - this.tabControlPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Windows7; - this.tabControlPanel1.Controls.Add(this.panelEx1); - this.tabControlPanel1.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel1.Name = "tabControlPanel1"; - this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(261, 82); - this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel1.Style.GradientAngle = 90; - this.tabControlPanel1.TabIndex = 1; - this.tabControlPanel1.TabItem = this.tabTransitionReports; - // - // panelEx1 - // - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.panelEx1.Controls.Add(this.cbxTransToProcs); - this.panelEx1.Controls.Add(this.cbxTransFromProcs); - this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; - this.panelEx1.Location = new System.Drawing.Point(1, 1); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(259, 81); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.TabIndex = 2; - this.panelEx1.ThemeAware = true; - // - // cbxTransToProcs - // - this.cbxTransToProcs.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxTransToProcs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxTransToProcs.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbxTransToProcs.Checked = true; - this.cbxTransToProcs.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbxTransToProcs.CheckValue = "Y"; - this.cbxTransToProcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTransToProcs.Location = new System.Drawing.Point(3, 3); - this.cbxTransToProcs.Name = "cbxTransToProcs"; - this.cbxTransToProcs.Size = new System.Drawing.Size(257, 23); - this.cbxTransToProcs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cbxTransToProcs.TabIndex = 0; - this.cbxTransToProcs.Text = "Transitions To Selected Procedure(s)"; - this.cbxTransToProcs.CheckedChanged += new System.EventHandler(this.cbxTransToProcs_CheckedChanged); - // - // cbxTransFromProcs - // - this.cbxTransFromProcs.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxTransFromProcs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxTransFromProcs.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbxTransFromProcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTransFromProcs.Location = new System.Drawing.Point(2, 32); - this.cbxTransFromProcs.Name = "cbxTransFromProcs"; - this.cbxTransFromProcs.Size = new System.Drawing.Size(257, 23); - this.cbxTransFromProcs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cbxTransFromProcs.TabIndex = 1; - this.cbxTransFromProcs.Text = "Transitions From Selected Procedure(s)"; - this.cbxTransFromProcs.CheckedChanged += new System.EventHandler(this.cbxTransFromProcs_CheckedChanged); - // - // tabTransitionReports - // - this.tabTransitionReports.AttachedControl = this.tabControlPanel1; - this.tabTransitionReports.Name = "tabTransitionReports"; - this.tabTransitionReports.Text = "Transitions"; - this.tabTransitionReports.Click += new System.EventHandler(this.tabTransitionReports_Click); - // // tabControlPanel2 // this.tabControlPanel2.Controls.Add(this.panRORpts); @@ -217,6 +135,19 @@ namespace Volian.Controls.Library this.panRORpts.TabIndex = 10; this.panRORpts.ThemeAware = true; // + // cbxIncldMissingROs + // + // + // + // + this.cbxIncldMissingROs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxIncldMissingROs.Location = new System.Drawing.Point(7, 61); + this.cbxIncldMissingROs.Name = "cbxIncldMissingROs"; + this.cbxIncldMissingROs.Size = new System.Drawing.Size(138, 23); + this.cbxIncldMissingROs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbxIncldMissingROs.TabIndex = 10; + this.cbxIncldMissingROs.Text = "Include Missing ROs"; + // // cbxSummary // this.cbxSummary.BackColor = System.Drawing.Color.Transparent; @@ -226,7 +157,7 @@ namespace Volian.Controls.Library this.cbxSummary.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxSummary.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxSummary.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxSummary.Location = new System.Drawing.Point(142, 3); + this.cbxSummary.Location = new System.Drawing.Point(151, 3); this.cbxSummary.Name = "cbxSummary"; this.cbxSummary.Size = new System.Drawing.Size(74, 23); this.cbxSummary.TabIndex = 1; @@ -311,6 +242,88 @@ namespace Volian.Controls.Library this.tabROReports.Text = "Referenced Objects"; this.tabROReports.Click += new System.EventHandler(this.tabROReports_Click); // + // tabControlPanel1 + // + this.tabControlPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Windows7; + this.tabControlPanel1.Controls.Add(this.panelEx1); + this.tabControlPanel1.Location = new System.Drawing.Point(0, 22); + this.tabControlPanel1.Name = "tabControlPanel1"; + this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel1.Size = new System.Drawing.Size(261, 82); + this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel1.Style.GradientAngle = 90; + this.tabControlPanel1.TabIndex = 1; + this.tabControlPanel1.TabItem = this.tabTransitionReports; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.panelEx1.Controls.Add(this.cbxTransToProcs); + this.panelEx1.Controls.Add(this.cbxTransFromProcs); + this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; + this.panelEx1.Location = new System.Drawing.Point(1, 1); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(259, 81); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 2; + this.panelEx1.ThemeAware = true; + // + // cbxTransToProcs + // + this.cbxTransToProcs.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxTransToProcs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxTransToProcs.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbxTransToProcs.Checked = true; + this.cbxTransToProcs.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbxTransToProcs.CheckValue = "Y"; + this.cbxTransToProcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxTransToProcs.Location = new System.Drawing.Point(3, 3); + this.cbxTransToProcs.Name = "cbxTransToProcs"; + this.cbxTransToProcs.Size = new System.Drawing.Size(257, 23); + this.cbxTransToProcs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbxTransToProcs.TabIndex = 0; + this.cbxTransToProcs.Text = "Transitions To Selected Procedure(s)"; + this.cbxTransToProcs.CheckedChanged += new System.EventHandler(this.cbxTransToProcs_CheckedChanged); + // + // cbxTransFromProcs + // + this.cbxTransFromProcs.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxTransFromProcs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxTransFromProcs.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbxTransFromProcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxTransFromProcs.Location = new System.Drawing.Point(2, 32); + this.cbxTransFromProcs.Name = "cbxTransFromProcs"; + this.cbxTransFromProcs.Size = new System.Drawing.Size(257, 23); + this.cbxTransFromProcs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbxTransFromProcs.TabIndex = 1; + this.cbxTransFromProcs.Text = "Transitions From Selected Procedure(s)"; + this.cbxTransFromProcs.CheckedChanged += new System.EventHandler(this.cbxTransFromProcs_CheckedChanged); + // + // tabTransitionReports + // + this.tabTransitionReports.AttachedControl = this.tabControlPanel1; + this.tabTransitionReports.Name = "tabTransitionReports"; + this.tabTransitionReports.Text = "Transitions"; + this.tabTransitionReports.Click += new System.EventHandler(this.tabTransitionReports_Click); + // // advTreeRO // this.advTreeRO.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline; @@ -476,19 +489,6 @@ namespace Volian.Controls.Library this.xpSelROs.TitleStyle.GradientAngle = 90; this.xpSelROs.TitleText = "Select Referenced Objects"; // - // cbxIncldMissingROs - // - // - // - // - this.cbxIncldMissingROs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxIncldMissingROs.Location = new System.Drawing.Point(7, 61); - this.cbxIncldMissingROs.Name = "cbxIncldMissingROs"; - this.cbxIncldMissingROs.Size = new System.Drawing.Size(138, 23); - this.cbxIncldMissingROs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cbxIncldMissingROs.TabIndex = 10; - this.cbxIncldMissingROs.Text = "Include Missing ROs"; - // // DisplayReports // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -503,10 +503,10 @@ namespace Volian.Controls.Library this.Size = new System.Drawing.Size(261, 676); ((System.ComponentModel.ISupportInitialize)(this.tctrlReports)).EndInit(); this.tctrlReports.ResumeLayout(false); - this.tabControlPanel1.ResumeLayout(false); - this.panelEx1.ResumeLayout(false); this.tabControlPanel2.ResumeLayout(false); this.panRORpts.ResumeLayout(false); + this.tabControlPanel1.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.advTreeRO)).EndInit(); this.xpSetToReport.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit(); diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index 50106a8b..b7b96d0a 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -192,10 +192,14 @@ namespace Volian.Controls.Library EnableOrDisablePrintButton(); cmbxROUsageSort.SelectedIndex = 0; tabTransitionReports.Visible = false; - cbxComplete.Enabled = false; + cbxComplete.Enabled = true; cbxSummary.Enabled = true; - cbxIncldMissingROs.Checked = true; - cbxIncldMissingROs.Enabled = cbxROUsage.Checked; + if (cbxROUsage.Checked) + cbxIncldMissingROs.Text = "Include Missing ROs"; + else if (cbxComplete.Checked) + cbxIncldMissingROs.Text = "Include Empty RO Fields"; + cbxIncldMissingROs.Checked = !cbxSummary.Checked; + cbxIncldMissingROs.Visible = cbxROUsage.Checked || cbxComplete.Checked; } public void SelectReferencedObjectTab() @@ -242,6 +246,12 @@ namespace Volian.Controls.Library btnPrintReport.Enabled = ((cbxComplete.Checked || cbxSummary.Checked) && lstCheckedROs.Count > 0); break; } + if (cbxROUsage.Checked) + cbxIncldMissingROs.Text = "Include Missing ROs"; + else if (cbxComplete.Checked) + cbxIncldMissingROs.Text = "Include Empty RO Fields"; + cbxIncldMissingROs.Checked = cbxROUsage.Checked || cbxComplete.Checked; + cbxIncldMissingROs.Visible = cbxROUsage.Checked || cbxComplete.Checked; } private void tabTransitionReports_Click(object sender, EventArgs e) @@ -258,7 +268,6 @@ namespace Volian.Controls.Library xpSetToReport.Enabled = cbxROUsage.Checked; xpSetToReport.Expanded = cbxROUsage.Checked; cmbxROUsageSort.Enabled = cbxROUsage.Checked; - cbxIncldMissingROs.Enabled = cbxROUsage.Checked; xpSelROs.Enabled = true; xpSelROs.Expanded = true; EnableOrDisablePrintButton(); @@ -269,7 +278,6 @@ namespace Volian.Controls.Library xpSetToReport.Enabled = cbxROUsage.Checked; xpSetToReport.Expanded = cbxROUsage.Checked; cmbxROUsageSort.Enabled = cbxROUsage.Checked; - cbxIncldMissingROs.Enabled = cbxROUsage.Checked; // reset the RO tree and clear anything that was selected advTreeROFillIn(true); lstCheckedROs.Clear(); @@ -392,8 +400,6 @@ namespace Volian.Controls.Library { foreach (DocVersionInfo dv in fi.FolderDocVersions) { - //if ((VersionTypeEnum)dv.VersionType == VersionTypeEnum.WorkingDraft) - //{ DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); newnode.Text = dv.ToString(); newnode.Tag = dv; @@ -403,7 +409,6 @@ namespace Volian.Controls.Library newnode.CheckBoxThreeState = false; newnode.CheckBoxVisible = true; par.Nodes.Add(newnode); - //} } } } @@ -418,7 +423,6 @@ namespace Volian.Controls.Library if (lstCheckedDocVersions.Count == 1)//Mydocversion == null) { Mydocversion = (DocVersionInfo)n.Tag; - //advTreeStepTypesFillIn(); } } else @@ -430,7 +434,6 @@ namespace Volian.Controls.Library if (Mydocversion != lstCheckedDocVersions[0]) { Mydocversion = lstCheckedDocVersions[0]; - //advTreeStepTypesFillIn(); } } else @@ -460,21 +463,12 @@ namespace Volian.Controls.Library private void advTreeProcSets_AfterNodeSelect(object sender, AdvTreeNodeEventArgs e) { DevComponents.AdvTree.Node n = advTreeProcSets.SelectedNode; - //if (advTreeStepTypes.Nodes.Count == 1 && n.Checked) - //{ - // Mydocversion = (DocVersionInfo)n.Tag; - // advTreeStepTypesFillIn(); - //} } private void advTreeProcSetsPreSelect() { bool keeplooking = true; //build a stack (bread crumb trail) of where is procedure set came from within the tree. Stack crumbs = new Stack(); - //crumbs.Push(Mydocversion.Name); // ex: "working draft" - //crumbs.Push(Mydocversion.MyFolder.Name); // ex: "Emergency Procedures" - //crumbs.Push(Mydocversion.MyFolder.MyParent.Name); // ex: "STPNOC-South Texas" - //crumbs.Push(advTreeProcSets.Nodes[0].Text); //top node of my tree crumbs.Push(Mydocversion.Name); // ex: "working draft" crumbs.Push(Mydocversion.MyFolder.Name); // ex: "Emergency Procedures" @@ -524,19 +518,14 @@ namespace Volian.Controls.Library public void advTreeROFillIn(bool blSeachTabClicked) { DevComponents.AdvTree.Node topnode = null; - int cntnd = 0; - //VETreeNode vtn = VETreeNode.GetFolder(1); - //FolderInfo fi = vtn.VEObject as FolderInfo; - //int fiCount = fi.ChildFolderCount; advTreeRO.Nodes.Clear(); if (_MyROFSTLookup == null) return; advTreeRO.BeforeExpand +=new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand); advTreeRO.AfterExpand += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); advTreeRO.AfterCollapse += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse); - //lstCheckedDocVersions.Clear(); topnode = new DevComponents.AdvTree.Node(); topnode.Text = "All Referenced Objects"; - topnode.Tag = null;//fi; + topnode.Tag = null; topnode.CheckBoxVisible = true; advTreeRO.Nodes.Add(topnode); @@ -547,7 +536,6 @@ namespace Volian.Controls.Library tn.Tag = _MyROFSTLookup.myHdr.myDbs[i]; tn.CheckBoxVisible = true; topnode.Nodes.Add(tn); - //cmboTreeROs.Nodes.Add(tn); AddDummyGroup(_MyROFSTLookup.myHdr.myDbs[i], tn); } @@ -649,7 +637,6 @@ namespace Volian.Controls.Library tmp.CheckBoxVisible = true; int index = FindIndex(tn.Nodes, tmp.Text); tn.Nodes.Insert(index, tmp); - //tn.Nodes.Add(tmp); DevComponents.AdvTree.Node sub = new DevComponents.AdvTree.Node(); sub.Text = "VLN_DUMMY_FOR_TREE"; tmp.Nodes.Add(sub); @@ -662,7 +649,6 @@ namespace Volian.Controls.Library tmp.CheckBoxVisible = true; int index = FindIndex(tn.Nodes, tmp.Text); tn.Nodes.Insert(index, tmp); - //tn.Nodes.Add(tmp); } } } @@ -817,16 +803,30 @@ namespace Volian.Controls.Library MessageBox.Show("Could not find associated path for ro data.","No RO Data", MessageBoxButtons.OK, MessageBoxIcon.Information); return ""; } - string roloc = "\"" + MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath + "\" " + "\"" + ROList + "\""; + //string roloc = "\"" + MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath + "\" " + "\"" + ROList + "\""; if (!Directory.Exists(MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath)) { MessageBox.Show(string.Format("RO Database directory does not exist: {0}", MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath)); return ""; } string cmpRptExePath = roapp.Substring(0, roapp.LastIndexOf("\\")) + "\\CmpRpt.exe "; + roDataFile = MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath + "\\" + roDataFile; try { - System.Diagnostics.Process.Start(cmpRptExePath, roloc); + + if (File.Exists(roDataFile)) File.Delete(roDataFile); + Application.DoEvents(); + string fname = VlnSettings.TemporaryFolder + "\\ROCompleteRprt.txt"; + FileInfo fi = new FileInfo(fname); + using (StreamWriter sw = fi.CreateText()) + { + sw.Write(ROList); + sw.Close(); + } + string roloc = "\"" + MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath + "\" \"/f=" + fname + "\""; + System.Diagnostics.Process p = System.Diagnostics.Process.Start(cmpRptExePath, roloc); + // need to wait, sometimes the Print.tmp file that is generated is not available + p.WaitForExit(); // without arguments, this will wait indefinately } catch (Exception ex) { @@ -835,7 +835,6 @@ namespace Volian.Controls.Library string tmpmsg = ex.Message; MessageBox.Show(tmpmsg, "RO Report Error: " + ex.GetType().Name); } - roDataFile = MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath + "\\" + roDataFile; return roDataFile; } private void btnPrintReport_Click(object sender, EventArgs e) @@ -852,7 +851,7 @@ namespace Volian.Controls.Library GenerateROList(); string ROList = GetListOfROs(false);//don't include the RODbID in the RO list string roDataFile = BuildRODataFile(ROList); - OnPrintRequest(new DisplayReportsEventArgs("Complete RO Report", "Complete RO Report", roDataFile, cbxComplete.Checked)); + OnPrintRequest(new DisplayReportsEventArgs("Complete RO Report", "Complete RO Report", roDataFile, MyROFSTLookup, cbxComplete.Checked, this.Mydocversion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, cbxIncldMissingROs.Checked)); } else if (cbxROUsage.Checked) { @@ -860,7 +859,6 @@ namespace Volian.Controls.Library GenerateROList(); string SearchString = GetListOfROs(true);// Include the RODbID in the RO list ItemInfoList SearchResults = ItemInfoList.GetListFromROReport(DocVersionList, "", SearchString, ""); - //OnPrintRequest(new DisplaySearchEventArgs(ReportTitle, TypesSelected, SearchString, lbSrchResults.DataSource as ICollection)); if (!usageSortedByProcedure) // sort on ROs { Csla.SortedBindingList sortedResults = new Csla.SortedBindingList(SearchResults); @@ -938,6 +936,20 @@ namespace Volian.Controls.Library get { return _IncludeMissingROs; } set { _IncludeMissingROs = value; } } + private bool _ConvertCaretToDelta = true; + + public bool ConvertCaretToDelta + { + get { return _ConvertCaretToDelta; } + set { _ConvertCaretToDelta = value; } + } + private bool _IncludeEmptyROFields = true; + + public bool IncludeEmptyROFields + { + get { return _IncludeEmptyROFields; } + set { _IncludeEmptyROFields = value; } + } public DisplayReportsEventArgs(string reportTitle, string typesSelected, ICollection myItemInfoList, bool sortByProcedure, bool includeMissingROs) { // RO Usage Report @@ -948,12 +960,15 @@ namespace Volian.Controls.Library _IncludeMissingROs = includeMissingROs; } - public DisplayReportsEventArgs(string reportTitle, string typesSelected, string roDataFile, bool completeROReport) + public DisplayReportsEventArgs(string reportTitle, string typesSelected, string roDataFile, ROFSTLookup rofstLookUp, bool completeROReport, bool convertCaretToDelta, bool includeEmptyROFields) { _ReportTitle = reportTitle; _TypesSelected = typesSelected; _RODataFile = roDataFile; _CompleteROReport = completeROReport; + _ConvertCaretToDelta = convertCaretToDelta; + _rofstLookup = rofstLookUp; + _IncludeEmptyROFields = includeEmptyROFields; } public DisplayReportsEventArgs(string reportTitle, string typesSelected, ROFSTLookup rofstLookUp, List roListForReport) {