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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS User Interface/App.config
View File

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

16
PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs generated
View File

@ -32,7 +32,6 @@ namespace VEPROMS
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DlgPrintProcedure));
this.tabControl1 = new DevComponents.DotNetBar.TabControl();
this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
this.lblStatus = new DevComponents.DotNetBar.LabelX();
this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX();
this.btnSelect = new DevComponents.DotNetBar.ButtonX();
this.cbxOpenAfterCreate2 = new System.Windows.Forms.CheckBox();
@ -117,7 +116,6 @@ namespace VEPROMS
// tabControlPanel3
//
this.tabControlPanel3.AutoScroll = true;
this.tabControlPanel3.Controls.Add(this.lblStatus);
this.tabControlPanel3.Controls.Add(this.txbPDFLocation);
this.tabControlPanel3.Controls.Add(this.btnSelect);
this.tabControlPanel3.Controls.Add(this.cbxOpenAfterCreate2);
@ -147,19 +145,6 @@ namespace VEPROMS
this.tabControlPanel3.TabIndex = 3;
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
//
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.BindingSource docVersionConfigBindingSource;
private DevComponents.DotNetBar.Controls.TextBoxX txbPDFLocation;
private DevComponents.DotNetBar.LabelX lblStatus;
private System.Windows.Forms.CheckBox cbxDebug;
}
}

12
PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
View File

@ -8,6 +8,8 @@ using System.Windows.Forms;
using System.IO;
using VEPROMS.CSLA.Library;
using Volian.Print.Library;
//using Volian.Controls.Library;
using Volian.Base.Library;
namespace VEPROMS
{
@ -59,6 +61,10 @@ namespace VEPROMS
_MyProcedure = pi;
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()
@ -87,7 +93,8 @@ namespace VEPROMS
btnDuplxOff.PerformClick();
else
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;
//ProcedureConfig.PrintWatermark pw = MyProcedure.ProcedureConfig.Print_Watermark;
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();
this.Close();
@ -338,6 +345,7 @@ namespace VEPROMS
CreatePDF();
}
//private void txbRevNum_TextChanged(object sender, EventArgs e)
//{
// RevNum = txbRevNum.Text;

32
PROMS/VEPROMS User Interface/frmPDFStatusForm.Designer.cs generated
View File

@ -33,6 +33,8 @@ namespace VEPROMS
this.lblStatus = new DevComponents.DotNetBar.LabelX();
this.pb = new DevComponents.DotNetBar.Controls.ProgressBarX();
this.tmrRun = new System.Windows.Forms.Timer(this.components);
this.btnOpenFolder = new DevComponents.DotNetBar.ButtonX();
this.btnOpenPDF = new DevComponents.DotNetBar.ButtonX();
this.SuspendLayout();
//
// lblStatus
@ -65,11 +67,39 @@ namespace VEPROMS
//
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
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.lblStatus);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@ -87,5 +117,7 @@ namespace VEPROMS
private DevComponents.DotNetBar.LabelX lblStatus;
private DevComponents.DotNetBar.Controls.ProgressBarX pb;
private System.Windows.Forms.Timer tmrRun;
private DevComponents.DotNetBar.ButtonX btnOpenFolder;
private DevComponents.DotNetBar.ButtonX btnOpenPDF;
}
}

36
PROMS/VEPROMS User Interface/frmPDFStatusForm.cs
View File

@ -27,10 +27,18 @@ namespace VEPROMS
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)
{
OpenPDF = openPDF;
InitializeComponent();
MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, openPDF);
MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false);//openPDF);
PDFPath = pdfPath;
this.Text = "Creating PDF of " + myItem.DisplayNumber;
@ -60,16 +68,36 @@ namespace VEPROMS
tmrRun.Enabled = true;
}
private string _PdfFile;
private void tmrRun_Tick(object sender, EventArgs e)
{
tmrRun.Enabled = false;
MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged);
DateTime tStart = DateTime.Now;
string pdfFile = MyPromsPrinter.Print(PDFPath);
_PdfFile = MyPromsPrinter.Print(PDFPath);
DateTime tEnd = DateTime.Now;
MyStatus = pdfFile + " created.";
MyStatus = string.Format("{0} created in {1:0.} milliseconds", pdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds));
MyStatus = _PdfFile + " created.";
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();
}
}

11
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -17,6 +17,7 @@ using DevComponents.DotNetBar.Rendering;
using VEPROMS.Properties;
using Volian.Controls.Library;
using DescriptiveEnum;
using Volian.Base.Library;
[assembly: log4net.Config.XmlConfigurator(Watch = true)]
@ -88,7 +89,7 @@ namespace VEPROMS
#endregion
public frmVEPROMS()
{
if (vlnStackTrace.DebugMode)
if (VlnSettings.DebugMode)
{
//use local data (for development/debug mode)
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
// form.
if (vlnStackTrace.DebugMode)
if (VlnSettings.DebugMode)
MSWordToPDF.OverrideColor = Color.Red;
MSWordToPDF.FormForPlotGraphics = this;
@ -184,7 +185,7 @@ namespace VEPROMS
private void frmVEPROMS_Load(object sender, EventArgs e)
{
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
if (Settings.Default["Location"] != null) this.Location = Settings.Default.Location;
if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size;
@ -204,7 +205,7 @@ namespace VEPROMS
}
private void SetupButtons()
{
if (!vlnStackTrace.DebugMode)
if (!VlnSettings.DebugMode)
{
lblItemID.Visible = false;
btnItemInfo.Visible = false;
@ -559,7 +560,7 @@ namespace VEPROMS
/// <param name="args"></param>
void tn_LoadingChildernDone(object sender, VETreeNodeEventArgs args)
{
if (vlnStackTrace.DebugMode)
if (VlnSettings.DebugMode)
ProgBarText = args.Info + " Seconds";
else
ProgBarText = "";

8
PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs
View File

@ -709,9 +709,9 @@ namespace VEPROMS.CSLA.Library
{
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)
s = "false"; // default
s = "true"; // default
return bool.Parse(s);
}
@ -737,9 +737,9 @@ namespace VEPROMS.CSLA.Library
{
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)
s = "false"; // default
s = "true"; // default
return bool.Parse(s);
}

33
PROMS/VEPROMS.CSLA.Library/Config/DocumentConfig.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.ComponentModel;
using System.Drawing;
using System.Text.RegularExpressions;
namespace VEPROMS.CSLA.Library
{
@ -83,6 +84,24 @@ namespace VEPROMS.CSLA.Library
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")]
[DisplayName("Color")]
[Description("Color of Document Text")]
@ -91,21 +110,11 @@ namespace VEPROMS.CSLA.Library
get
{
string sColor = _Xp["Printing", "Color"];
if (sColor == string.Empty) sColor = "Transparent";
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);
return ColorFromString(sColor);
}
set
{
if (value.IsNamedColor) _Xp["Printing", "Color"] = value.Name;
else
{
_Xp["Printing", "Color"] = string.Format("[{0},{1},{2},{3}]", value.A, value.R, value.G, value.B);
}
_Xp["Printing", "Color"] = value.ToString();
OnPropertyChanged("Printing_Color");
}
}

192
PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs
View File

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

30
PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
View File

@ -11,7 +11,7 @@ using System.Drawing;
using System.Text.RegularExpressions;
using LBWordLibrary;
using System.Drawing.Imaging;
using Volian.Base.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);
#region Fields
private bool _IsDisposed;
private static string _TemporaryFolder = null;
private DocumentInfo _MyDocument = null;
private FileInfo _MyFile = null;
private string _Extension = "DOC";
#endregion
#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
{
get { return _MyDocument; }
@ -268,7 +250,7 @@ namespace VEPROMS.CSLA.Library
{
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();
if(MyDocument.DocContent != null)fs.Write(MyDocument.DocContent, 0, MyDocument.DocContent.Length);
fs.Close();
@ -502,7 +484,7 @@ namespace VEPROMS.CSLA.Library
sel.Text = "";
//float width = 72 * Int32.Parse(vals[3], System.Globalization.NumberStyles.AllowHexSpecifier) / 12.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);
//LBShape shape = myDoc.Shapes.AddPicture(@"C:\Temp\XYPlot.png", 0, 0, sel.Range);
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 yAdjust = 9.1F; // TODO: Check this value
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);
shape.LockAspectRatio = LBMsoTriState.msoTrue;
//shape.Width = .89F * shape.Width;
@ -576,7 +559,7 @@ namespace VEPROMS.CSLA.Library
grfx.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
grfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
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);
myPlot.SetMargins(0, 0, 0, 0);
myPlot.Process(new VG.VGOut_Graphics(grfx));
@ -657,7 +640,8 @@ namespace VEPROMS.CSLA.Library
}
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);
}
}

22
PROMS/VEPROMS.CSLA.Library/Extension/ROImageExt.cs
View File

@ -6,6 +6,7 @@ using System.Data.SqlClient;
using Csla;
using Csla.Data;
using System.IO;
using Volian.Base.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);
#region Fields
private bool _IsDisposed;
private static string _TemporaryFolder = null;
//private static string _TemporaryFolder = null;
#endregion
#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;
public ROImageInfo MyROImage
{
@ -177,7 +161,7 @@ namespace VEPROMS.CSLA.Library
{
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();
fs.Write(MyROImage.Content, 0, MyROImage.Content.Length);
fs.Close();

3
PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs
View File

@ -9,6 +9,7 @@ using VEPROMS.CSLA.Library;
using System.IO;
using Volian.Svg.Library;
using Volian.Print.Library;
using Volian.Base.Library;
namespace PrintMSWord
{
@ -55,7 +56,7 @@ namespace PrintMSWord
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);
_ElapsedTime = new Dictionary<PromsPrinterStatusType, TimeSpan>();
DateTime tStart = DateTime.Now;

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

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

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

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

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

@ -10,6 +10,7 @@ using VEPROMS.CSLA.Library;
using XYPlots;
using DevComponents.DotNetBar;
using System.Text.RegularExpressions;
using Volian.Base.Library;
//using VG;
namespace Volian.Controls.Library
@ -672,24 +673,6 @@ namespace Volian.Controls.Library
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>
/// Keep trying to delete the given file until successful OR until MaxMinutes has elasped

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

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

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

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

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

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