From 46ff7a513d6dafafb8d9b77b95adadb4e39eed91 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 14 May 2015 14:35:01 +0000 Subject: [PATCH] Proms Express: display format tab for top folder if not using default format Use generic Specific Information field processing --- PROMS/VEPROMS User Interface/frmFolderProperties.cs | 11 +++++++++-- PROMS/VEPROMS User Interface/frmPSI.cs | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs index 996af975..f9de03bd 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.cs @@ -179,14 +179,21 @@ namespace VEPROMS { // if we are at the top node of the tree, remove the Folder Property page tabs // that do not pertain to this level (top of tree) - this.tcFolder.Tabs.Remove(tiFmtSettings); this.tcFolder.Tabs.Remove(tiOutputSettings); this.tcFolder.Tabs.Remove(tiEditSettings); + // for format settings, include it if the top node's format is NOT the base, i.e. formatid != 1. + // this is done so that PROMS EXPRESS folder specific info can be displayed/used for the top + // node of the tree. The formatid for the top folder for PROMS EXPRESS databases must be + // set manually to the PROMS EXPRESS format. + if (_FolderConfig.MyFolder.MyFormat.FormatID == 1) + { + this.tcFolder.Tabs.Remove(tiFmtSettings); + this.btnFormatSettings.Visible = false; + } //this.tcFolder.Tabs.Remove(tiAnnoTypes); // TEMPORARY - JSJ //this.tcFolder.Tabs.Remove(tiApprvStages);// TEMPORARY - JSJ //this.btnAnnoTypes.Visible = false; // TEMPORARY - JSJ //this.btnApprvStages.Visible = false; // TEMPORARY - JSJ - this.btnFormatSettings.Visible = false; this.btnOutputSettings.Visible = false; this.btnEdSettings.Visible = false; ppLblDefSettingsInfo.Visible = false; diff --git a/PROMS/VEPROMS User Interface/frmPSI.cs b/PROMS/VEPROMS User Interface/frmPSI.cs index afb2ed6e..5970079c 100644 --- a/PROMS/VEPROMS User Interface/frmPSI.cs +++ b/PROMS/VEPROMS User Interface/frmPSI.cs @@ -36,7 +36,7 @@ namespace VEPROMS int xB4Scroll = 900; int yB4Scroll = 630; this.panelPSI.AutoScroll = false; - foreach (PsiLabel lbl in psiDialogDef.LabelList) + foreach (SILabel lbl in psiDialogDef.LabelList) { Label wlbl = new Label(); wlbl.Text = lbl.text; @@ -49,7 +49,7 @@ namespace VEPROMS maxy = ((int)lbl.y * 2 + (int)lbl.height * 2) > maxy ? ((int)lbl.y * 2 + (int)lbl.height * 2) : maxy; } ProcedureConfig procConfig = pi.MyConfig as ProcedureConfig; - foreach (PsiField fld in psiDialogDef.FieldList) + foreach (SIField fld in psiDialogDef.FieldList) { if (fld.type.ToLower() == "text") { @@ -124,7 +124,7 @@ namespace VEPROMS // loop through all of the fields (Text & logical) bool isDirty = false; - foreach (PsiField fld in psiDialogDef.FieldList) + foreach (SIField fld in psiDialogDef.FieldList) { if (fld.type.ToLower() == "text") {