diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 910aea97..79aaed01 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -128,7 +128,7 @@ namespace VEPROMS //cbxPDF.Text = string.Format(@"{0}\{1}.pdf", _PDFPath, _ProcNum); // General 2 settings //txbPDFLocation.Text = _PDFPath; - txbPDFName.Text = string.Format("{0}.pdf", ProcNum); + txbPDFName.Text = string.Format("{0}.pdf", ProcNum.Replace('/','_').Replace('\\','_')); ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig; if (pc != null) { @@ -290,7 +290,7 @@ namespace VEPROMS // Determine change bar settings. First get from config & then see if override from dialog. // Also check that format allows override. ChangeBarDefinition cbd = DetermineChangeBarSettings(); - frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, VlnSettings.OldPDFFolder, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked,PDFPath, cbd); + frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, VlnSettings.OldPDFFolder, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked,PDFPath, cbd, txbPDFName.Text); frmStatus.ShowDialog(); this.Close(); } diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index 1bd943d8..c09c6a0d 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -34,11 +34,11 @@ namespace VEPROMS get { return _OpenPDF; } set { _OpenPDF = value; } } - public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd) + public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd,string pdfFile) { OpenPDF = openPDF; InitializeComponent(); - MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false, overWrite, cbd);//openPDF); + MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false, overWrite, cbd, pdfFile);//openPDF); PDFPath = pdfPath; this.Text = "Creating PDF of " + myItem.DisplayNumber; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 7281135a..78742856 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -467,6 +467,7 @@ namespace VEPROMS.CSLA.Library private static int CountLevels(ItemInfo item) { int level = 0; + if (item.IsProcedure) return 0; int ignoreRNOs = item.ActiveSection.ColumnMode; while (item != null && !item.IsHigh) { @@ -896,12 +897,15 @@ namespace VEPROMS.CSLA.Library get { // check config value on my section, if null/default use Pmode of active format - SectionInfo si = SectionInfo.Get(ActiveSection.ItemID); //ActiveSection as SectionInfo; - if (si != null) + if (ActiveSection != null) { - // there is no longer a "default" ENUM item - SectionConfig will return format default if needed - //if (si.SectionConfig.Section_ColumnMode != SectionConfig.SectionColumnMode.Default) + SectionInfo si = SectionInfo.Get(ActiveSection.ItemID); //ActiveSection as SectionInfo; + if (si != null) + { + // there is no longer a "default" ENUM item - SectionConfig will return format default if needed + //if (si.SectionConfig.Section_ColumnMode != SectionConfig.SectionColumnMode.Default) return (int)si.SectionConfig.Section_ColumnMode - 1; + } } return (ActiveFormat.MyStepSectionLayoutData.PMode ?? 2) -1; } @@ -1011,7 +1015,9 @@ namespace VEPROMS.CSLA.Library ItemInfo temp = FirstSibling; if(temp.ActiveParent.GetType() == typeof(VEPROMS.CSLA.Library.DocVersionInfo))return false; if (temp.MyParent.IsSection) return false; // already at hls - while (((ItemInfo)temp.ActiveParent).IsHigh == false) temp = ((ItemInfo)temp.ActiveParent).FirstSibling; + if (temp.IsProcedure || temp.IsSection) return false; + while (((ItemInfo)temp.ActiveParent).IsHigh == false) + temp = ((ItemInfo)temp.ActiveParent).FirstSibling; return temp.IsStepPart; } } @@ -1142,10 +1148,10 @@ namespace VEPROMS.CSLA.Library { get { return _SearchPath; } } - public string ShortSearchPath - { - get { return ConvertToDisplayText(Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07")); } - } + public string ShortSearchPath + { + get { return ConvertToDisplayText(Regex.Replace(_SearchPath ?? "", "\x11.*?\x07", "\x07")); } + } internal int _SearchAnnotationID; public int SearchAnnotationID { @@ -1686,7 +1692,8 @@ namespace VEPROMS.CSLA.Library if (IsHigh) _MyHLS = this; else { - _MyHLS = ((ItemInfo)MyActiveParent).MyHLS; + if(MyActiveParent is ItemInfo) + _MyHLS = ((ItemInfo)MyActiveParent).MyHLS; } } return _MyHLS; @@ -1785,7 +1792,7 @@ namespace VEPROMS.CSLA.Library { get { - if (_MyDocStyle == null) + if (_MyDocStyle == null && ActiveSection != null) { int typ = (int)ActiveSection.MyContent.Type; int subtyp = typ % 10000;