pearl-public/igor-public
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

distro release 2.1.1

Browse Source
This commit is contained in:
muntwiler_m
2020-06-09 12:31:05 +02:00
parent b7390cb46f
commit ef9d08e5f5
168 changed files with 3286 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pearl/pearl-elog.ipf
View File

@ -272,14 +272,14 @@ function elog_init_pearl_templates()
// attributes (persistent)
// available attributes
string /g attributes = "author;project;sample;source;task;technique;file;valid;"
string /g attributes = "author;project;p-group;sample;source;task;technique;file;valid;"
// controls corresponding to attributes
// prefix determines the control type: sv_ = setvariable (string), pm_ = popup menu, cb = check box
string /g controls = "sv_author;sv_project;sv_sample;pm_source;pm_task;pm_technique;sv_file;cb_valid;"
string /g controls = "sv_author;sv_project;sv_pgroup;sv_sample;pm_source;pm_task;pm_technique;sv_file;cb_valid;"
// attributes with fixed options, value item declares the options string
string /g options = "source=sources;task=tasks;technique=techniques"
// attributes which must be defined
string /g required_attributes = "author;project;sample;source;task;technique;valid"
string /g required_attributes = "author;project;p-group;sample;source;task;technique;valid"
// option lists
string /g sources = "Manual Entry;PShell;Scienta Data;SScan Data;Prosilica Data;OTF Data;Beamline Status;LEED Data;QMS Data;Matrix Data;Igor Pro;Other"
@ -292,10 +292,10 @@ function elog_init_pearl_templates()
// attributes (persistent)
// available attributes
string /g attributes = "author;project;sample;program;revision;machine;job;experiment;source path;result path;valid"
string /g attributes = "author;project;p-group;sample;program;revision;machine;job;experiment;source path;result path;valid"
// controls corresponding to attributes
// prefix determines the control type: sv_ = setvariable (string), pm_ = popup menu, cb = check box
string /g controls = "sv_author;sv_project;sv_sample;pm_program;sv_revision;pm_machine;sv_job;sv_experiment;sv_sourcepath;sv_resultpath;cb_valid"
string /g controls = "sv_author;sv_project;sv_pgroup;sv_sample;pm_program;sv_revision;pm_machine;sv_job;sv_experiment;sv_sourcepath;sv_resultpath;cb_valid"
// attributes with fixed options, value item declares the options string
string /g options = "program=programs;machine=machines"
// attributes which must be defined
@ -322,7 +322,7 @@ function elog_init_pearl_templates()
// option lists
string /g types = "Installation;Repair;Maintenance;Test;Commissioning;Bakeout;Incident;Cool-down;Warm-up;Storage;Other"
string /g systems = "Vacuum;Control System;BL;XA;XP;SA;SP;T;LL;Monochromator;Carving;Scienta;STM;PC-Scienta;PC-Matrix;PC-Console;PC-Console-Win;PC-XP;EPS;LAC;Desiccator"
string /g systems = "Vacuum;Control System;BL;XA;XP;SA;SP;T;LL;Monochromator;Carving;Scienta;STM;PC-Scienta;PC-Matrix;PC-Console;PC-Console-Win;PC-XP;EPS;LAC;Desiccator;Other"
string /g sources = "Manual Entry;PShell;Scienta Data;SScan Data;Prosilica Data;OTF Data;Beamline Status;LEED Data;QMS Data;Matrix Data;Igor Pro;Other"
setdatafolder savedf
@ -1298,7 +1298,8 @@ function /s PearlElogPanel(logbook)
break
endswitch
endfor
ypos = max(ypos, 80)
TitleBox t_attach, win=$win_name, pos={308,5}, size={70,14}, title="Attachments", frame=0
height = ypos - 21 - 4
ListBox lb_attach, win=$win_name, pos={308,21}, size={264,height}
@ -1819,6 +1820,12 @@ static function /s set_panel_attributes(windowname, attributes, [clear])
endif
string path
string logbook = GetUserData(windowname, "", "logbook")
dfref df_persistent = get_elog_df(logbook, kdfPersistent)
string persistent_path = GetDataFolder(1, df_persistent)
svar /sdfr=df_persistent options
string options_path
string controls = ControlNameList(windowname, ";")
string control
@ -1845,7 +1852,12 @@ static function /s set_panel_attributes(windowname, attributes, [clear])
endif
break
case 3: // popupmenu
PopupMenu $control, popvalue=value, win=$windowname
options_path = persistent_path + StringByKey(attribute, options, "=", ";")
svar values = $options_path
numval = WhichListItem(value, values, ";") + 1
if (numval >= 1)
PopupMenu $control, mode=numval, win=$windowname
endif
break
case 5: // setvariable
SetVariable /z $control, value= _STR:value, win=$windowname