This commit is contained in:
John Jenko 2010-08-12 16:05:52 +00:00
parent f91459b9f0
commit 0849b002b4
18 changed files with 231 additions and 212 deletions

View File

@ -62,7 +62,7 @@
</logger> </logger>
</log4net> </log4net>
<appSettings> <appSettings>
<add key ="Debug" value ="true"/> <add key ="Debug" value ="false"/>
<add key="CslaAuthentication" value="Windows" /> <add key="CslaAuthentication" value="Windows" />
<!-- <!--
<add key="CslaDataPortalProxy" <add key="CslaDataPortalProxy"

View File

@ -32,7 +32,6 @@ namespace VEPROMS
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DlgPrintProcedure)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DlgPrintProcedure));
this.tabControl1 = new DevComponents.DotNetBar.TabControl(); this.tabControl1 = new DevComponents.DotNetBar.TabControl();
this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
this.lblStatus = new DevComponents.DotNetBar.LabelX();
this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX(); this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX();
this.btnSelect = new DevComponents.DotNetBar.ButtonX(); this.btnSelect = new DevComponents.DotNetBar.ButtonX();
this.cbxOpenAfterCreate2 = new System.Windows.Forms.CheckBox(); this.cbxOpenAfterCreate2 = new System.Windows.Forms.CheckBox();
@ -117,7 +116,6 @@ namespace VEPROMS
// tabControlPanel3 // tabControlPanel3
// //
this.tabControlPanel3.AutoScroll = true; this.tabControlPanel3.AutoScroll = true;
this.tabControlPanel3.Controls.Add(this.lblStatus);
this.tabControlPanel3.Controls.Add(this.txbPDFLocation); this.tabControlPanel3.Controls.Add(this.txbPDFLocation);
this.tabControlPanel3.Controls.Add(this.btnSelect); this.tabControlPanel3.Controls.Add(this.btnSelect);
this.tabControlPanel3.Controls.Add(this.cbxOpenAfterCreate2); this.tabControlPanel3.Controls.Add(this.cbxOpenAfterCreate2);
@ -147,19 +145,6 @@ namespace VEPROMS
this.tabControlPanel3.TabIndex = 3; this.tabControlPanel3.TabIndex = 3;
this.tabControlPanel3.TabItem = this.tbGeneral; this.tabControlPanel3.TabItem = this.tbGeneral;
// //
// lblStatus
//
//
//
//
this.lblStatus.BackgroundStyle.Class = "";
this.lblStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.lblStatus.Location = new System.Drawing.Point(31, 210);
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(601, 23);
this.lblStatus.TabIndex = 97;
this.lblStatus.Text = "labelX1";
//
// txbPDFLocation // txbPDFLocation
// //
this.txbPDFLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.txbPDFLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@ -991,7 +976,6 @@ namespace VEPROMS
private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label11;
private System.Windows.Forms.BindingSource docVersionConfigBindingSource; private System.Windows.Forms.BindingSource docVersionConfigBindingSource;
private DevComponents.DotNetBar.Controls.TextBoxX txbPDFLocation; private DevComponents.DotNetBar.Controls.TextBoxX txbPDFLocation;
private DevComponents.DotNetBar.LabelX lblStatus;
private System.Windows.Forms.CheckBox cbxDebug; private System.Windows.Forms.CheckBox cbxDebug;
} }
} }

View File

@ -8,6 +8,8 @@ using System.Windows.Forms;
using System.IO; using System.IO;
using VEPROMS.CSLA.Library; using VEPROMS.CSLA.Library;
using Volian.Print.Library; using Volian.Print.Library;
//using Volian.Controls.Library;
using Volian.Base.Library;
namespace VEPROMS namespace VEPROMS
{ {
@ -59,6 +61,10 @@ namespace VEPROMS
_MyProcedure = pi; _MyProcedure = pi;
GetDocVersionSettings(); GetDocVersionSettings();
// set to a default PDF location if non was specified in the DocVersions property
if (txbPDFLocation.Text == null || txbPDFLocation.Text.Length == 0 || !Directory.Exists(txbPDFLocation.Text))
txbPDFLocation.Text = VlnSettings.TemporaryFolder;
} }
private void GetDocVersionSettings() private void GetDocVersionSettings()
@ -87,7 +93,8 @@ namespace VEPROMS
btnDuplxOff.PerformClick(); btnDuplxOff.PerformClick();
else else
btnDuplxOn.PerformClick(); btnDuplxOn.PerformClick();
// default to print Debug info if App.config is set to debug mode
cbxDebug.Checked = VlnSettings.DebugMode;
} }
@ -310,7 +317,7 @@ namespace VEPROMS
//this.Cursor = Cursors.WaitCursor; //this.Cursor = Cursors.WaitCursor;
//ProcedureConfig.PrintWatermark pw = MyProcedure.ProcedureConfig.Print_Watermark; //ProcedureConfig.PrintWatermark pw = MyProcedure.ProcedureConfig.Print_Watermark;
PrintWatermark pw = (PrintWatermark)cbxWaterMark.SelectedValue; PrintWatermark pw = (PrintWatermark)cbxWaterMark.SelectedValue;
frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate.ToShortDateString(), pw.ToString(), cbxDebug.Checked, @"C:\TEMP\16Bit", cbxOpenAfterCreate2.Checked, PDFPath); frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate.ToShortDateString(), pw.ToString(), cbxDebug.Checked, VlnSettings.OldPDFFolder, cbxOpenAfterCreate2.Checked, PDFPath);
frmStatus.Show(); frmStatus.Show();
this.Close(); this.Close();
@ -338,6 +345,7 @@ namespace VEPROMS
CreatePDF(); CreatePDF();
} }
//private void txbRevNum_TextChanged(object sender, EventArgs e) //private void txbRevNum_TextChanged(object sender, EventArgs e)
//{ //{
// RevNum = txbRevNum.Text; // RevNum = txbRevNum.Text;

View File

@ -33,6 +33,8 @@ namespace VEPROMS
this.lblStatus = new DevComponents.DotNetBar.LabelX(); this.lblStatus = new DevComponents.DotNetBar.LabelX();
this.pb = new DevComponents.DotNetBar.Controls.ProgressBarX(); this.pb = new DevComponents.DotNetBar.Controls.ProgressBarX();
this.tmrRun = new System.Windows.Forms.Timer(this.components); this.tmrRun = new System.Windows.Forms.Timer(this.components);
this.btnOpenFolder = new DevComponents.DotNetBar.ButtonX();
this.btnOpenPDF = new DevComponents.DotNetBar.ButtonX();
this.SuspendLayout(); this.SuspendLayout();
// //
// lblStatus // lblStatus
@ -65,11 +67,39 @@ namespace VEPROMS
// //
this.tmrRun.Tick += new System.EventHandler(this.tmrRun_Tick); this.tmrRun.Tick += new System.EventHandler(this.tmrRun_Tick);
// //
// btnOpenFolder
//
this.btnOpenFolder.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnOpenFolder.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnOpenFolder.Location = new System.Drawing.Point(658, 28);
this.btnOpenFolder.Name = "btnOpenFolder";
this.btnOpenFolder.Size = new System.Drawing.Size(75, 23);
this.btnOpenFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnOpenFolder.TabIndex = 2;
this.btnOpenFolder.Text = "Open Folder";
this.btnOpenFolder.Visible = false;
this.btnOpenFolder.Click += new System.EventHandler(this.btnOpenFolder_Click);
//
// btnOpenPDF
//
this.btnOpenPDF.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnOpenPDF.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnOpenPDF.Location = new System.Drawing.Point(568, 28);
this.btnOpenPDF.Name = "btnOpenPDF";
this.btnOpenPDF.Size = new System.Drawing.Size(75, 23);
this.btnOpenPDF.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnOpenPDF.TabIndex = 3;
this.btnOpenPDF.Text = "Open PDF";
this.btnOpenPDF.Visible = false;
this.btnOpenPDF.Click += new System.EventHandler(this.btnOpenPDF_Click);
//
// frmPDFStatusForm // frmPDFStatusForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(745, 104); this.ClientSize = new System.Drawing.Size(745, 104);
this.Controls.Add(this.btnOpenPDF);
this.Controls.Add(this.btnOpenFolder);
this.Controls.Add(this.pb); this.Controls.Add(this.pb);
this.Controls.Add(this.lblStatus); this.Controls.Add(this.lblStatus);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@ -87,5 +117,7 @@ namespace VEPROMS
private DevComponents.DotNetBar.LabelX lblStatus; private DevComponents.DotNetBar.LabelX lblStatus;
private DevComponents.DotNetBar.Controls.ProgressBarX pb; private DevComponents.DotNetBar.Controls.ProgressBarX pb;
private System.Windows.Forms.Timer tmrRun; private System.Windows.Forms.Timer tmrRun;
private DevComponents.DotNetBar.ButtonX btnOpenFolder;
private DevComponents.DotNetBar.ButtonX btnOpenPDF;
} }
} }

View File

@ -27,10 +27,18 @@ namespace VEPROMS
set { _MyPromsPrinter = value; } set { _MyPromsPrinter = value; }
} }
private bool _OpenPDF;
public bool OpenPDF
{
get { return _OpenPDF; }
set { _OpenPDF = value; }
}
public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, string pdfPath) public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, string pdfPath)
{ {
OpenPDF = openPDF;
InitializeComponent(); InitializeComponent();
MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, openPDF); MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false);//openPDF);
PDFPath = pdfPath; PDFPath = pdfPath;
this.Text = "Creating PDF of " + myItem.DisplayNumber; this.Text = "Creating PDF of " + myItem.DisplayNumber;
@ -60,16 +68,36 @@ namespace VEPROMS
tmrRun.Enabled = true; tmrRun.Enabled = true;
} }
private string _PdfFile;
private void tmrRun_Tick(object sender, EventArgs e) private void tmrRun_Tick(object sender, EventArgs e)
{ {
tmrRun.Enabled = false; tmrRun.Enabled = false;
MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged);
DateTime tStart = DateTime.Now; DateTime tStart = DateTime.Now;
string pdfFile = MyPromsPrinter.Print(PDFPath); _PdfFile = MyPromsPrinter.Print(PDFPath);
DateTime tEnd = DateTime.Now; DateTime tEnd = DateTime.Now;
MyStatus = pdfFile + " created."; MyStatus = _PdfFile + " created.";
MyStatus = string.Format("{0} created in {1:0.} milliseconds", pdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds)); MyStatus = string.Format("{0} created in {1:0.} milliseconds", _PdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds));
if (OpenPDF)
{
System.Diagnostics.Process.Start(_PdfFile);
this.Close();
return;
}
btnOpenFolder.Visible = btnOpenPDF.Visible = true;
}
private void btnOpenPDF_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start(_PdfFile);
this.Close();
}
private void btnOpenFolder_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("Explorer", "/select," + _PdfFile);
this.Close();
} }
} }

View File

@ -17,6 +17,7 @@ using DevComponents.DotNetBar.Rendering;
using VEPROMS.Properties; using VEPROMS.Properties;
using Volian.Controls.Library; using Volian.Controls.Library;
using DescriptiveEnum; using DescriptiveEnum;
using Volian.Base.Library;
[assembly: log4net.Config.XmlConfigurator(Watch = true)] [assembly: log4net.Config.XmlConfigurator(Watch = true)]
@ -88,7 +89,7 @@ namespace VEPROMS
#endregion #endregion
public frmVEPROMS() public frmVEPROMS()
{ {
if (vlnStackTrace.DebugMode) if (VlnSettings.DebugMode)
{ {
//use local data (for development/debug mode) //use local data (for development/debug mode)
if (Environment.MachineName == "RMARK-PC") if (Environment.MachineName == "RMARK-PC")
@ -113,7 +114,7 @@ namespace VEPROMS
// When creating an XY Plot, a System.Drawing.Graphics is needed and it requires a form. Use the main // When creating an XY Plot, a System.Drawing.Graphics is needed and it requires a form. Use the main
// form. // form.
if (vlnStackTrace.DebugMode) if (VlnSettings.DebugMode)
MSWordToPDF.OverrideColor = Color.Red; MSWordToPDF.OverrideColor = Color.Red;
MSWordToPDF.FormForPlotGraphics = this; MSWordToPDF.FormForPlotGraphics = this;
@ -184,7 +185,7 @@ namespace VEPROMS
private void frmVEPROMS_Load(object sender, EventArgs e) private void frmVEPROMS_Load(object sender, EventArgs e)
{ {
string debugMode = ConfigurationManager.AppSettings["Debug"]; string debugMode = ConfigurationManager.AppSettings["Debug"];
vlnStackTrace.DebugMode = bool.Parse(debugMode); // set debug for the Volian.Controls.Library VlnSettings.DebugMode = bool.Parse(debugMode); // set debug for the Volian.Controls.Library
// get the saved location and size of the VE-PROMS appication for this user // get the saved location and size of the VE-PROMS appication for this user
if (Settings.Default["Location"] != null) this.Location = Settings.Default.Location; if (Settings.Default["Location"] != null) this.Location = Settings.Default.Location;
if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size; if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size;
@ -204,7 +205,7 @@ namespace VEPROMS
} }
private void SetupButtons() private void SetupButtons()
{ {
if (!vlnStackTrace.DebugMode) if (!VlnSettings.DebugMode)
{ {
lblItemID.Visible = false; lblItemID.Visible = false;
btnItemInfo.Visible = false; btnItemInfo.Visible = false;
@ -559,7 +560,7 @@ namespace VEPROMS
/// <param name="args"></param> /// <param name="args"></param>
void tn_LoadingChildernDone(object sender, VETreeNodeEventArgs args) void tn_LoadingChildernDone(object sender, VETreeNodeEventArgs args)
{ {
if (vlnStackTrace.DebugMode) if (VlnSettings.DebugMode)
ProgBarText = args.Info + " Seconds"; ProgBarText = args.Info + " Seconds";
else else
ProgBarText = ""; ProgBarText = "";

View File

@ -709,9 +709,9 @@ namespace VEPROMS.CSLA.Library
{ {
string s = _Xp["PrintSettings", "AlwaysOverwritePDF"]; string s = _Xp["PrintSettings", "AlwaysOverwritePDF"];
// If there is no value, then default to false // If there is no value, then default to true
if (s == string.Empty) if (s == string.Empty)
s = "false"; // default s = "true"; // default
return bool.Parse(s); return bool.Parse(s);
} }
@ -737,9 +737,9 @@ namespace VEPROMS.CSLA.Library
{ {
string s = _Xp["PrintSettings", "AlwaysViewPDFAfterCreate"]; string s = _Xp["PrintSettings", "AlwaysViewPDFAfterCreate"];
// If there is no value, then default to false // If there is no value, then default to true
if (s == string.Empty) if (s == string.Empty)
s = "false"; // default s = "true"; // default
return bool.Parse(s); return bool.Parse(s);
} }

View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.ComponentModel; using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.Text.RegularExpressions;
namespace VEPROMS.CSLA.Library namespace VEPROMS.CSLA.Library
{ {
@ -83,6 +84,24 @@ namespace VEPROMS.CSLA.Library
OnPropertyChanged("Printing_Length"); OnPropertyChanged("Printing_Length");
} }
} }
private static Regex byARGB = new Regex(@"Color \[A=([0-9]*), R=([0-9]*), G=([0-9]*), B=([0-9]*)\]");
private static Regex byName = new Regex(@"Color \[(.*)\]");
public static Color ColorFromString(string sColor)
{
Match myMatch = byARGB.Match(sColor);
if (myMatch.Groups.Count == 5)
return Color.FromArgb(int.Parse(myMatch.Groups[1].Value), int.Parse(myMatch.Groups[2].Value), int.Parse(myMatch.Groups[3].Value), int.Parse(myMatch.Groups[4].Value));
myMatch = byName.Match(sColor);
if (myMatch.Groups.Count == 2)
return Color.FromName(myMatch.Groups[1].Value);
if (sColor[0] == '[')
{
string[] parts = sColor.Substring(1, sColor.Length - 2).Split(",".ToCharArray());
return Color.FromArgb(Int32.Parse(parts[0]), Int32.Parse(parts[1]), Int32.Parse(parts[2]), Int32.Parse(parts[3]));
}
else return Color.FromName(sColor);
}
[Category("Printing")] [Category("Printing")]
[DisplayName("Color")] [DisplayName("Color")]
[Description("Color of Document Text")] [Description("Color of Document Text")]
@ -91,21 +110,11 @@ namespace VEPROMS.CSLA.Library
get get
{ {
string sColor = _Xp["Printing", "Color"]; string sColor = _Xp["Printing", "Color"];
if (sColor == string.Empty) sColor = "Transparent"; return ColorFromString(sColor);
if (sColor[0] == '[')
{
string[] parts = sColor.Substring(1, sColor.Length - 2).Split(",".ToCharArray());
return Color.FromArgb(Int32.Parse(parts[0]), Int32.Parse(parts[1]), Int32.Parse(parts[2]), Int32.Parse(parts[3]));
}
else return Color.FromName(sColor);
} }
set set
{ {
if (value.IsNamedColor) _Xp["Printing", "Color"] = value.Name; _Xp["Printing", "Color"] = value.ToString();
else
{
_Xp["Printing", "Color"] = string.Format("[{0},{1},{2},{3}]", value.A, value.R, value.G, value.B);
}
OnPropertyChanged("Printing_Color"); OnPropertyChanged("Printing_Color");
} }
} }

View File

@ -227,103 +227,103 @@ namespace VEPROMS.CSLA.Library
} }
} }
#endregion #endregion
#region ColorCategory // From veproms.ini //#region ColorCategory // From veproms.ini
// ** Note that not all possibilities from 16-bit will be added here, until //// ** Note that not all possibilities from 16-bit will be added here, until
// ** it is determined how these will be used //// ** it is determined how these will be used
// ** If this is used (unhidden), then we need to add logic to blank setting if the value //// ** If this is used (unhidden), then we need to add logic to blank setting if the value
// ** we are saving is the same as the parent's value. //// ** we are saving is the same as the parent's value.
//PROPGRID: Hide Editor Color for ROs ////PROPGRID: Hide Editor Color for ROs
[Category("Editor Settings")] //[Category("Editor Settings")]
[Browsable(false)] //[Browsable(false)]
[DisplayName("Step Editor Colors - Referenced Objects")] //[DisplayName("Step Editor Colors - Referenced Objects")]
[RefreshProperties(RefreshProperties.All)] //[RefreshProperties(RefreshProperties.All)]
[Description("Color used to highlight an RO in procedure text")] //[Description("Color used to highlight an RO in procedure text")]
public string Color_ro //public string Color_ro
{ //{
get // get
{ // {
return _Xp["Color", "ro"]; // return _Xp["Color", "ro"];
} // }
set // set
{ // {
_Xp["Color", "ro"] = value; // _Xp["Color", "ro"] = value;
OnPropertyChanged("Color_ro"); // OnPropertyChanged("Color_ro");
} // }
} //}
//PROPGRID: Hide Editor Color for Transitions ////PROPGRID: Hide Editor Color for Transitions
[Category("Editor Settings")] //[Category("Editor Settings")]
[Browsable(false)] //[Browsable(false)]
[DisplayName("Step Editor Colors - Transitions")] //[DisplayName("Step Editor Colors - Transitions")]
[RefreshProperties(RefreshProperties.All)] //[RefreshProperties(RefreshProperties.All)]
[Description("Color used to highlight a Transition in procedure text")] //[Description("Color used to highlight a Transition in procedure text")]
public string Color_transition //public string Color_transition
{ //{
get // get
{ // {
return _Xp["Color", "transition"]; // return _Xp["Color", "transition"];
} // }
set // set
{ // {
_Xp["Color", "transition"] = value; // _Xp["Color", "transition"] = value;
OnPropertyChanged("Color_transition"); // OnPropertyChanged("Color_transition");
} // }
} //}
//PROPGRID: Hide Active Text Background Color ////PROPGRID: Hide Active Text Background Color
[Category("Editor Settings")] //[Category("Editor Settings")]
[Browsable(false)] //[Browsable(false)]
[DisplayName("Step Editor Colors - Active Background")] //[DisplayName("Step Editor Colors - Active Background")]
[RefreshProperties(RefreshProperties.All)] //[RefreshProperties(RefreshProperties.All)]
[Description("editbackground")] //[Description("editbackground")]
public string Color_editbackground //public string Color_editbackground
{ //{
get // get
{ // {
return _Xp["Color", "editbackground"]; // return _Xp["Color", "editbackground"];
} // }
set // set
{ // {
_Xp["Color", "editbackground"] = value; // _Xp["Color", "editbackground"] = value;
OnPropertyChanged("Color_editbackground"); // OnPropertyChanged("Color_editbackground");
} // }
} //}
//PROPGRID: Hide color setting for Black ////PROPGRID: Hide color setting for Black
[Category("Color")] //[Category("Color")]
[Browsable(false)] //[Browsable(false)]
[DisplayName("black")] //[DisplayName("black")]
[RefreshProperties(RefreshProperties.All)] //[RefreshProperties(RefreshProperties.All)]
[Description("black")] //[Description("black")]
public string Color_black //public string Color_black
{ //{
get // get
{ // {
return _Xp["Color", "black"]; // return _Xp["Color", "black"];
} // }
set // set
{ // {
_Xp["Color", "black"] = value; // _Xp["Color", "black"] = value;
OnPropertyChanged("Color_black"); // OnPropertyChanged("Color_black");
} // }
} //}
//PROPGRID: Hide Color Setting for Blue ////PROPGRID: Hide Color Setting for Blue
[Category("Color")] //[Category("Color")]
[Browsable(false)] //[Browsable(false)]
[DisplayName("blue")] //[DisplayName("blue")]
[RefreshProperties(RefreshProperties.All)] //[RefreshProperties(RefreshProperties.All)]
[Description("blue")] //[Description("blue")]
public string Color_blue //public string Color_blue
{ //{
get // get
{ // {
return _Xp["Color", "blue"]; // return _Xp["Color", "blue"];
} // }
set // set
{ // {
_Xp["Color", "blue"] = value; // _Xp["Color", "blue"] = value;
OnPropertyChanged("Color_blue"); // OnPropertyChanged("Color_blue");
} // }
} //}
#endregion // From veproms.ini //#endregion // From veproms.ini
#region SystemPrintCategory // From veproms.ini #region SystemPrintCategory // From veproms.ini
[Category("Print Settings")] [Category("Print Settings")]
[DisplayName("Override Underline Thickness (dots)")] [DisplayName("Override Underline Thickness (dots)")]

View File

@ -11,7 +11,7 @@ using System.Drawing;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using LBWordLibrary; using LBWordLibrary;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using Volian.Base.Library;
namespace VEPROMS.CSLA.Library namespace VEPROMS.CSLA.Library
{ {
@ -179,29 +179,11 @@ namespace VEPROMS.CSLA.Library
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
#region Fields #region Fields
private bool _IsDisposed; private bool _IsDisposed;
private static string _TemporaryFolder = null;
private DocumentInfo _MyDocument = null; private DocumentInfo _MyDocument = null;
private FileInfo _MyFile = null; private FileInfo _MyFile = null;
private string _Extension = "DOC"; private string _Extension = "DOC";
#endregion #endregion
#region Properties #region Properties
public static string TemporaryFolder
{
get
{
if (_TemporaryFolder == null)
{
// This will create a Temp\VE-PROMS folder in the LocalSettings Folder.
//XP - C:\Documents and Settings\{user}\Local Settings\Application Data\Temp\VE-PROMS
//Vista - C:\Users\{user}\AppData\Local\Temp\VE-PROMS
_TemporaryFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Temp";
if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
_TemporaryFolder += @"\VE-PROMS";
if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
}
return _TemporaryFolder;
}
}
public DocumentInfo MyDocument public DocumentInfo MyDocument
{ {
get { return _MyDocument; } get { return _MyDocument; }
@ -268,7 +250,7 @@ namespace VEPROMS.CSLA.Library
{ {
if (_MyDocument != null) if (_MyDocument != null)
{ {
_MyFile = new FileInfo(string.Format(@"{0}\tmp_{1}{2}{3}", TemporaryFolder, MyDocument.DocID, Unique, MyDocument.FileExtension)); _MyFile = new FileInfo(string.Format(@"{0}\tmp_{1}{2}{3}", VlnSettings.TemporaryFolder, MyDocument.DocID, Unique, MyDocument.FileExtension));
FileStream fs = _MyFile.Create(); FileStream fs = _MyFile.Create();
if(MyDocument.DocContent != null)fs.Write(MyDocument.DocContent, 0, MyDocument.DocContent.Length); if(MyDocument.DocContent != null)fs.Write(MyDocument.DocContent, 0, MyDocument.DocContent.Length);
fs.Close(); fs.Close();
@ -502,7 +484,7 @@ namespace VEPROMS.CSLA.Library
sel.Text = ""; sel.Text = "";
//float width = 72 * Int32.Parse(vals[3], System.Globalization.NumberStyles.AllowHexSpecifier) / 12.0F; //float width = 72 * Int32.Parse(vals[3], System.Globalization.NumberStyles.AllowHexSpecifier) / 12.0F;
//float height = 72 * lines / 6.0F; //float height = 72 * lines / 6.0F;
string pngFile = @"C:\Temp\XYPlot1.png"; string pngFile = VlnSettings.TemporaryFolder + @"\XYPlot1.png"; //@"C:\Temp\XYPlot1.png";
RectangleF plotRect = CreatePlot(pngFile, val, 600F, FormForPlotGraphics); RectangleF plotRect = CreatePlot(pngFile, val, 600F, FormForPlotGraphics);
//LBShape shape = myDoc.Shapes.AddPicture(@"C:\Temp\XYPlot.png", 0, 0, sel.Range); //LBShape shape = myDoc.Shapes.AddPicture(@"C:\Temp\XYPlot.png", 0, 0, sel.Range);
float x = (float)sel.get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage); float x = (float)sel.get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage);
@ -513,6 +495,7 @@ namespace VEPROMS.CSLA.Library
float xAdjust = -29.3F; // TODO: Check this value float xAdjust = -29.3F; // TODO: Check this value
float yAdjust = 9.1F; // TODO: Check this value float yAdjust = 9.1F; // TODO: Check this value
LBShape shape = myDoc.Shapes.AddPicture(pngFile, x + xAdjust + plotRect.X, yAdjust + y - yTop + plotRect.Y, sel.Range); LBShape shape = myDoc.Shapes.AddPicture(pngFile, x + xAdjust + plotRect.X, yAdjust + y - yTop + plotRect.Y, sel.Range);
File.Delete(pngFile);
//Console.WriteLine(",{0},{1},{2},{3}", x, y - yTop, xAdjust,yAdjust); //Console.WriteLine(",{0},{1},{2},{3}", x, y - yTop, xAdjust,yAdjust);
shape.LockAspectRatio = LBMsoTriState.msoTrue; shape.LockAspectRatio = LBMsoTriState.msoTrue;
//shape.Width = .89F * shape.Width; //shape.Width = .89F * shape.Width;
@ -576,7 +559,7 @@ namespace VEPROMS.CSLA.Library
grfx.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; grfx.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
grfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; grfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
grfx.Clear(System.Drawing.Color.Transparent); grfx.Clear(System.Drawing.Color.Transparent);
XYPlots.XYPlot.BlackColor = System.Drawing.Color.Red; XYPlots.XYPlot.BlackColor = VlnSettings.DebugMode ? System.Drawing.Color.Red : System.Drawing.Color.Black;
XYPlots.XYPlot myPlot = new XYPlots.XYPlot(xyPlot); XYPlots.XYPlot myPlot = new XYPlots.XYPlot(xyPlot);
myPlot.SetMargins(0, 0, 0, 0); myPlot.SetMargins(0, 0, 0, 0);
myPlot.Process(new VG.VGOut_Graphics(grfx)); myPlot.Process(new VG.VGOut_Graphics(grfx));
@ -657,7 +640,8 @@ namespace VEPROMS.CSLA.Library
} }
private static string CreatePDF(string fileName, bool openPdf) private static string CreatePDF(string fileName, bool openPdf)
{ {
return MyApp.CreatePDF(@"C:\Temp\" + fileName + ".pdf", openPdf); //return MyApp.CreatePDF(@"C:\Temp\" + fileName + ".pdf", openPdf);
return MyApp.CreatePDF(VlnSettings.TemporaryFolder + "\\" + fileName + ".pdf", openPdf);
} }
} }

View File

@ -6,6 +6,7 @@ using System.Data.SqlClient;
using Csla; using Csla;
using Csla.Data; using Csla.Data;
using System.IO; using System.IO;
using Volian.Base.Library;
namespace VEPROMS.CSLA.Library namespace VEPROMS.CSLA.Library
{ {
@ -88,26 +89,9 @@ namespace VEPROMS.CSLA.Library
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
#region Fields #region Fields
private bool _IsDisposed; private bool _IsDisposed;
private static string _TemporaryFolder = null; //private static string _TemporaryFolder = null;
#endregion #endregion
#region Properties #region Properties
public static string TemporaryFolder
{
get
{
if (_TemporaryFolder == null)
{
// This will create a Temp\VE-PROMS folder in the LocalSettings Folder.
//XP - C:\Documents and Settings\{user}\Local Settings\Application Data\Temp\VE-PROMS
//Vista - C:\Users\{user}\AppData\Local\Temp\VE-PROMS
_TemporaryFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Temp";
if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
_TemporaryFolder += @"\VE-PROMS";
if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
}
return _TemporaryFolder;
}
}
private ROImageInfo _MyROImage = null; private ROImageInfo _MyROImage = null;
public ROImageInfo MyROImage public ROImageInfo MyROImage
{ {
@ -177,7 +161,7 @@ namespace VEPROMS.CSLA.Library
{ {
if (_MyROImage != null) if (_MyROImage != null)
{ {
_MyFile = new FileInfo(string.Format(@"{0}\tmp_{1}{2}", TemporaryFolder, Unique, MyROImage.FileName)); _MyFile = new FileInfo(string.Format(@"{0}\tmp_{1}{2}", VlnSettings.TemporaryFolder, Unique, MyROImage.FileName));
FileStream fs = _MyFile.Create(); FileStream fs = _MyFile.Create();
fs.Write(MyROImage.Content, 0, MyROImage.Content.Length); fs.Write(MyROImage.Content, 0, MyROImage.Content.Length);
fs.Close(); fs.Close();

View File

@ -9,6 +9,7 @@ using VEPROMS.CSLA.Library;
using System.IO; using System.IO;
using Volian.Svg.Library; using Volian.Svg.Library;
using Volian.Print.Library; using Volian.Print.Library;
using Volian.Base.Library;
namespace PrintMSWord namespace PrintMSWord
{ {
@ -55,7 +56,7 @@ namespace PrintMSWord
private void CreatePDF(ProcedureInfo myProcedure, bool openPdf) private void CreatePDF(ProcedureInfo myProcedure, bool openPdf)
{ {
PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, tbRevDate.Text, cbWatermark.Text, cbDebugOutput.Checked, @"C:\TEMP\16Bit",openPdf); PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, tbRevDate.Text, cbWatermark.Text, cbDebugOutput.Checked, VlnSettings.OldPDFFolder ,openPdf);
pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged);
_ElapsedTime = new Dictionary<PromsPrinterStatusType, TimeSpan>(); _ElapsedTime = new Dictionary<PromsPrinterStatusType, TimeSpan>();
DateTime tStart = DateTime.Now; DateTime tStart = DateTime.Now;

View File

@ -6,6 +6,7 @@ using System.Data;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using VEPROMS.CSLA.Library; using VEPROMS.CSLA.Library;
using Volian.Base.Library;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@ -307,10 +308,10 @@ namespace Volian.Controls.Library
} }
#endregion #endregion
private void AnnotationDetails_Resize(object sender, EventArgs e) //private void AnnotationDetails_Resize(object sender, EventArgs e)
{ //{
vlnStackTrace.ShowStackLocal(string.Format("Resize - Height = {0}",Height),3,4); // vlnStackTrace.ShowStackLocal(string.Format("Resize - Height = {0}", Height), 3, 4);
//vlnStackTrace.ShowStack(string.Format("Resize - Height = {0}", Height)); // //vlnStackTrace.ShowStack(string.Format("Resize - Height = {0}", Height));
} //}
} }
} }

View File

@ -344,9 +344,10 @@ namespace Volian.Controls.Library
try try
{ {
_MyDSOFramer.Save(); _MyDSOFramer.Save();
LBDocumentClass doc = new LBDocumentClass(_MyDSOFramer.ActiveDocument); // These are handled in the method above
MyDSOFile.FullName = GetReflectiveProperty(_MyDSOFramer.ActiveDocument, "FullName"); //LBDocumentClass doc = new LBDocumentClass(_MyDSOFramer.ActiveDocument);
MyDSOFile.SaveFile(doc.Length, doc.Ascii); //MyDSOFile.FullName = GetReflectiveProperty(_MyDSOFramer.ActiveDocument, "FullName");
//MyDSOFile.SaveFile(doc.Length, doc.Ascii);
} }
catch (Exception ex) catch (Exception ex)
{ {

View File

@ -10,6 +10,7 @@ using VEPROMS.CSLA.Library;
using XYPlots; using XYPlots;
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Volian.Base.Library;
//using VG; //using VG;
namespace Volian.Controls.Library namespace Volian.Controls.Library
@ -672,24 +673,6 @@ namespace Volian.Controls.Library
return outstr; return outstr;
} }
private static string _TemporaryFolder = null;
public static string TemporaryFolder
{
get
{
if (_TemporaryFolder == null)
{
// This will create a Temp\VE-PROMS folder in the LocalSettings Folder.
//XP - C:\Documents and Settings\{user}\Local Settings\Application Data\Temp\VE-PROMS
//Vista - C:\Users\{user}\AppData\Local\Temp\VE-PROMS
_TemporaryFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Temp";
if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
_TemporaryFolder += @"\VE-PROMS";
if (!Directory.Exists(TemporaryFolder)) Directory.CreateDirectory(TemporaryFolder);
}
return _TemporaryFolder;
}
}
/// <summary> /// <summary>
/// Keep trying to delete the given file until successful OR until MaxMinutes has elasped /// Keep trying to delete the given file until successful OR until MaxMinutes has elasped

View File

@ -8,6 +8,7 @@ using System.Windows.Forms;
using VEPROMS.CSLA.Library; using VEPROMS.CSLA.Library;
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
using DevComponents.AdvTree; using DevComponents.AdvTree;
using Volian.Base.Library;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@ -946,7 +947,7 @@ namespace Volian.Controls.Library
{ {
Cursor = savcursor; Cursor = savcursor;
} }
if (vlnStackTrace.DebugMode) if (VlnSettings.DebugMode)
MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds)); MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds));
} }

View File

@ -7,6 +7,7 @@ using System.Windows.Forms;
using VEPROMS.CSLA.Library; using VEPROMS.CSLA.Library;
using System.Drawing; using System.Drawing;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Volian.Base.Library;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@ -232,7 +233,7 @@ namespace Volian.Controls.Library
private void SetupStepPanel() private void SetupStepPanel()
{ {
this.BackColorChanged += new EventHandler(StepPanel_BackColorChanged); this.BackColorChanged += new EventHandler(StepPanel_BackColorChanged);
if (vlnStackTrace.DebugMode) if (VlnSettings.DebugMode)
{ {
_InactiveColor = Color.Linen; _InactiveColor = Color.Linen;
_TabColor = Color.Beige; _TabColor = Color.Beige;

View File

@ -9,6 +9,7 @@ using System.Windows.Forms;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using VEPROMS.CSLA.Library; using VEPROMS.CSLA.Library;
using Volian.Base.Library;
namespace Volian.Controls.Library namespace Volian.Controls.Library
{ {
@ -208,7 +209,7 @@ namespace Volian.Controls.Library
Font = formatFont; Font = formatFont;
else else
{ {
if (vlnStackTrace.DebugMode) if (VlnSettings.DebugMode)
Font = new Font(_MyFontFamily == null ? formatFont.FontFamily : _MyFontFamily, formatFont.Size, formatFont.Style); Font = new Font(_MyFontFamily == null ? formatFont.FontFamily : _MyFontFamily, formatFont.Size, formatFont.Style);
else else
Font = new Font("Bookman Old Style", formatFont.Size, formatFont.Style); Font = new Font("Bookman Old Style", formatFont.Size, formatFont.Style);