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

Proms Express: display format tab for top folder if not using default format

Browse Source 
Use generic Specific Information field processing
This commit is contained in:
Kathy Ruffing 2015-05-14 14:35:01 +00:00
parent 977b748548
commit 46ff7a513d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,14 +179,21 @@ namespace VEPROMS
{ {
// if we are at the top node of the tree, remove the Folder Property page tabs // 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) // that do not pertain to this level (top of tree)
this.tcFolder.Tabs.Remove(tiFmtSettings);
this.tcFolder.Tabs.Remove(tiOutputSettings); this.tcFolder.Tabs.Remove(tiOutputSettings);
this.tcFolder.Tabs.Remove(tiEditSettings); 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(tiAnnoTypes); // TEMPORARY - JSJ
//this.tcFolder.Tabs.Remove(tiApprvStages);// TEMPORARY - JSJ //this.tcFolder.Tabs.Remove(tiApprvStages);// TEMPORARY - JSJ
//this.btnAnnoTypes.Visible = false; // TEMPORARY - JSJ //this.btnAnnoTypes.Visible = false; // TEMPORARY - JSJ
//this.btnApprvStages.Visible = false; // TEMPORARY - JSJ //this.btnApprvStages.Visible = false; // TEMPORARY - JSJ
this.btnFormatSettings.Visible = false;
this.btnOutputSettings.Visible = false; this.btnOutputSettings.Visible = false;
this.btnEdSettings.Visible = false; this.btnEdSettings.Visible = false;
ppLblDefSettingsInfo.Visible = false; ppLblDefSettingsInfo.Visible = false;

6
PROMS/VEPROMS User Interface/frmPSI.cs
View File

@ -36,7 +36,7 @@ namespace VEPROMS
int xB4Scroll = 900; int xB4Scroll = 900;
int yB4Scroll = 630; int yB4Scroll = 630;
this.panelPSI.AutoScroll = false; this.panelPSI.AutoScroll = false;
foreach (PsiLabel lbl in psiDialogDef.LabelList) foreach (SILabel lbl in psiDialogDef.LabelList)
{ {
Label wlbl = new Label(); Label wlbl = new Label();
wlbl.Text = lbl.text; 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; 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; ProcedureConfig procConfig = pi.MyConfig as ProcedureConfig;
foreach (PsiField fld in psiDialogDef.FieldList) foreach (SIField fld in psiDialogDef.FieldList)
{ {
if (fld.type.ToLower() == "text") if (fld.type.ToLower() == "text")
{ {
@ -124,7 +124,7 @@ namespace VEPROMS
// loop through all of the fields (Text & logical) // loop through all of the fields (Text & logical)
bool isDirty = false; bool isDirty = false;
foreach (PsiField fld in psiDialogDef.FieldList) foreach (SIField fld in psiDialogDef.FieldList)
{ {
if (fld.type.ToLower() == "text") if (fld.type.ToLower() == "text")
{ {