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

Added “(red ? in the editor)” to the Include Missing ROs checkbox label. Default the checkbox to be unchecked, and added anApplication.DoEvents()

Browse Source 
Fixed the preview of images containing more than one sample layer (iTextSharp error)
Fixed the printing of images containing more than one sample layer (iTextSharp error), added better error handling, added an Error bookmark group.
This commit is contained in:
John Jenko
2015-01-30 20:14:46 +00:00
parent 3ba1e71b4b
commit af99b05c2c
6 changed files with 272 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -722,10 +722,13 @@ namespace Volian.Controls.Library
{
string fname = selectedChld.value.Substring(0, selectedChld.value.IndexOf('\n'));
int thedot = fname.LastIndexOf('.');
ROImageInfo tmp = null;
if (thedot == -1 || (thedot != (fname.Length - 4)))
{
tmp = ROImageInfo.GetByROFstID_FileName(MyROFST.ROFstID, fname);
fname += string.Format(".{0}", MyROFST.MyRODb.RODbConfig.GetDefaultGraphicExtension());
ROImageInfo tmp = ROImageInfo.GetByROFstID_FileName(MyROFST.ROFstID, fname);
}
if (tmp == null) tmp = ROImageInfo.GetByROFstID_FileName(MyROFST.ROFstID, fname);
if (tmp !=null)
{
ROImageConfig rc = new ROImageConfig(tmp);

8
PROMS/Volian.Controls.Library/DisplayReports.Designer.cs generated
View File

@@ -57,6 +57,7 @@ namespace Volian.Controls.Library
this.nodeConnector1 = new DevComponents.AdvTree.NodeConnector();
this.btnPrintReport = new DevComponents.DotNetBar.ButtonX();
this.xpSelROs = new DevComponents.DotNetBar.ExpandablePanel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
((System.ComponentModel.ISupportInitialize)(this.tctrlReports)).BeginInit();
this.tctrlReports.SuspendLayout();
this.tabControlPanel2.SuspendLayout();
@@ -143,10 +144,10 @@ namespace Volian.Controls.Library
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.Size = new System.Drawing.Size(241, 23);
this.cbxIncldMissingROs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.cbxIncldMissingROs.TabIndex = 10;
this.cbxIncldMissingROs.Text = "Include Missing ROs";
this.cbxIncldMissingROs.Text = "Include Missing ROs (a red ? in the editor)";
//
// cbxSummary
//
@@ -399,7 +400,7 @@ namespace Volian.Controls.Library
this.xpSetToReport.TitleStyle.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.xpSetToReport.TitleStyle.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.xpSetToReport.TitleStyle.GradientAngle = 90;
this.xpSetToReport.TitleText = "Select Procedures";
this.xpSetToReport.TitleText = "Select Procedure Set";
//
// advTreeProcSets
//
@@ -545,5 +546,6 @@ namespace Volian.Controls.Library
private DevComponents.DotNetBar.ExpandablePanel xpSelROs;
private DevComponents.DotNetBar.PanelEx panelEx1;
private DevComponents.DotNetBar.Controls.CheckBoxX cbxIncldMissingROs;
private System.Windows.Forms.ToolTip toolTip1;
}
}

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

@@ -195,10 +195,10 @@ namespace Volian.Controls.Library
cbxComplete.Enabled = true;
cbxSummary.Enabled = true;
if (cbxROUsage.Checked)
cbxIncldMissingROs.Text = "Include Missing ROs";
cbxIncldMissingROs.Text = "Include Missing ROs (red ? in the editor)";
else if (cbxComplete.Checked)
cbxIncldMissingROs.Text = "Include Empty RO Fields";
cbxIncldMissingROs.Checked = !cbxSummary.Checked;
cbxIncldMissingROs.Checked = false;// !cbxSummary.Checked;
cbxIncldMissingROs.Visible = cbxROUsage.Checked || cbxComplete.Checked;
}
@@ -247,10 +247,10 @@ namespace Volian.Controls.Library
break;
}
if (cbxROUsage.Checked)
cbxIncldMissingROs.Text = "Include Missing ROs";
cbxIncldMissingROs.Text = "Include Missing ROs (red ? in the editor)";
else if (cbxComplete.Checked)
cbxIncldMissingROs.Text = "Include Empty RO Fields";
cbxIncldMissingROs.Checked = cbxROUsage.Checked || cbxComplete.Checked;
//cbxIncldMissingROs.Checked = cbxROUsage.Checked || cbxComplete.Checked;
cbxIncldMissingROs.Visible = cbxROUsage.Checked || cbxComplete.Checked;
}
@@ -270,6 +270,7 @@ namespace Volian.Controls.Library
cmbxROUsageSort.Enabled = cbxROUsage.Checked;
xpSelROs.Enabled = true;
xpSelROs.Expanded = true;
cbxIncldMissingROs.Checked = false;// !cbxSummary.Checked;
EnableOrDisablePrintButton();
}
@@ -281,6 +282,7 @@ namespace Volian.Controls.Library
// reset the RO tree and clear anything that was selected
advTreeROFillIn(true);
lstCheckedROs.Clear();
cbxIncldMissingROs.Checked = false;// !cbxSummary.Checked;
EnableOrDisablePrintButton();
}
#region Procedure List
@@ -774,6 +776,7 @@ namespace Volian.Controls.Library
private void cbxComplete_CheckedChanged(object sender, EventArgs e)
{
cbxIncldMissingROs.Checked = false;// !cbxSummary.Checked;
EnableOrDisablePrintButton();
}
@@ -827,6 +830,7 @@ namespace Volian.Controls.Library
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
Application.DoEvents();
}
catch (Exception ex)
{

3
PROMS/Volian.Controls.Library/DisplayReports.resx
View File

@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>