Use variable names to store variables in the filesystem (vs. VariablesRecord).

diff --git a/igor/packed.py b/igor/packed.py
index f6c8adfe2a52a81d4b7708249a675feef4516db6..baad25ed193fa804ac2acb8b478426a67f604b15 100644 (file)
--- a/igor/packed.py
+++ b/igor/packed.py
@@ -71,6 +71,11 @@ def load(filename, strict=True, ignore_unknown=True):
         if not hasattr(filename, 'read'):
             f.close()
 
+    filesystem = _build_filesystem(records)
+
+    return (records, filesystem)
+
+def _build_filesystem(records):
     # From PTN003:
     """The name must be a valid Igor data folder name. See Object
     Names in the Igor Reference help file for name rules.
@@ -117,17 +122,40 @@ def load(filename, strict=True, ignore_unknown=True):
             dir_stack.pop()
         elif isinstance(record, (_VariablesRecord, _WaveRecord)):
             if isinstance(record, _VariablesRecord):
+                _add_variables(dir_stack, cwd, record)
                 # start with an invalid character to avoid collisions
                 # with folder names
-                filename = ':variables'
-            else:
+                #filename = ':variables'
+                #_check_filename(dir_stack, filename)
+                #cwd[filename] = record
+            else:  # WaveRecord
                 filename = ''.join(c for c in record.wave_info['bname']
                                    ).split('\x00', 1)[0]
-            if filename in cwd:
-                raise ValueError('collision on name {} in {}'.format(
-                        filename, ':'.join(d for d,cwd in dir_stack)))
-            else:
+                _check_filename(dir_stack, filename)
                 cwd[filename] = record
+    return filesystem
 
-    return (records, filesystem)
+def _check_filename(dir_stack, filename):
+    cwd = dir_stack[-1][-1]
+    if filename in cwd:
+        raise ValueError('collision on name {} in {}'.format(
+                filename, ':'.join(d for d,cwd in dir_stack)))
 
+def _add_variables(dir_stack, cwd, record):
+    if len(dir_stack) == 1:
+        # From PTN003:
+        """When reading a packed file, any system variables
+        encountered while the current data folder is not the root
+        should be ignored.
+        """
+        for i,value in enumerate(record.variables['sysVars']):
+            name = 'K{}'.format(i)
+            _check_filename(dir_stack, name)
+            cwd[name] = value
+    for name,value in (
+        record.variables['userVars'].items() +
+        record.variables['userStrs'].items()):
+        _check_filename(dir_stack, name)
+        cwd[name] = value
+    if record.variables['header']['version'] == 2:
+        raise NotImplementedError('add dependent variables to filesystem')

diff --git a/test/test.py b/test/test.py
index c2911f750ef0ccf4f43037fa0c2b20e4eb3cbf93..af65c79c2fd7534c0b6b47dffa15d9514265ed9d 100644 (file)
--- a/test/test.py
+++ b/test/test.py
@@ -1328,9 +1328,71 @@ record 50:
 '#include <Polar Graphs> version >= 3.0\n'
 <BLANKLINE>
 filesystem:
-{'root': {':variables': <VariablesRecord ...>,
-          'Packages': {'PolarGraphs': {':variables': <VariablesRecord ...>},
-                       'WMDataBase': {':variables': <VariablesRecord ...>}},
+{'root': {'K0': 0.0,
+          'K1': 0.0,
+          'K10': 0.0,
+          'K11': 0.0,
+          'K12': 0.0,
+          'K13': 0.0,
+          'K14': 0.0,
+          'K15': 0.0,
+          'K16': 0.0,
+          'K17': 0.0,
+          'K18': 0.0,
+          'K19': 0.0,
+          'K2': 0.0,
+          'K20': 128.0,
+          'K3': 0.0,
+          'K4': 0.0,
+          'K5': 0.0,
+          'K6': 0.0,
+          'K7': 0.0,
+          'K8': 0.0,
+          'K9': 0.0,
+          'Packages': {'PolarGraphs': {'V_bottom': 232.0,
+                                       'V_left': 1.0,
+                                       'V_max': 2.4158518093414401,
+                                       'V_min': -2.1848498883412,
+                                       'V_right': 232.0,
+                                       'V_top': 1.0,
+                                       'u_UniqWaveNdx': 8.0,
+                                       'u_UniqWinNdx': 3.0,
+                                       'u_angle0': 0.0,
+                                       'u_angleRange': 6.2831853071795862,
+                                       'u_colorList': 'black;blue;green;cyan;red;magenta;yellow;white;special',
+                                       'u_debug': 0.0,
+                                       'u_debugStr': 'Turn Debugging On',
+                                       'u_majorDelta': 0.0,
+                                       'u_numPlaces': 0.0,
+                                       'u_polAngle0': 0.26179938779914941,
+                                       'u_polAngleAxesWherePop': 'Off;Radius Start;Radius End;Radius Start and End;All Major Radii;At Listed Radii',
+                                       'u_polAngleRange': 1.0471975511965976,
+                                       'u_polAngleUnitsPop': 'deg;rad',
+                                       'u_polInnerRadius': -20.0,
+                                       'u_polLineStylePop': 'solid;dash 1;dash 2;dash 3;dash 4;dash 5;dash 6;dash 7;dash 8;dash 9;dash 10;dash 11;dash 12;dash 13;dash 14;dash 15;dash 16;dash 17;',
+                                       'u_polMajorAngleInc': 0.26179938779914941,
+                                       'u_polMajorRadiusInc': 10.0,
+                                       'u_polMinorAngleTicks': 3.0,
+                                       'u_polMinorRadiusTicks': 1.0,
+                                       'u_polOffOn': 'Off;On',
+                                       'u_polOuterRadius': 0.0,
+                                       'u_polRadAxesWherePop': '  Off;  Angle Start;  Angle Middle;  Angle End;  Angle Start and End;  0;  90;  180; -90;  0, 90;  90, 180; -180, -90; -90, 0;  0, 180;  90, -90;  0, 90, 180, -90;  All Major Angles;  At Listed Angles',
+                                       'u_polRotPop': ' -90;  0; +90; +180',
+                                       'u_popup': '',
+                                       'u_prompt': '',
+                                       'u_segsPerMinorArc': 3.0,
+                                       'u_tickDelta': 0.0,
+                                       'u_var': 0.0,
+                                       'u_x1': 11.450159535018935,
+                                       'u_x2': 12.079591517721363,
+                                       'u_y1': 42.732577139459856,
+                                       'u_y2': 45.081649278814126},
+                       'WMDataBase': {'u_dataBase': ';PolarGraph0:,appendRadius=radiusData,...,useCircles=2,maxArcLine=6;',
+                                      'u_dbBadStringChars': ',;=:',
+                                      'u_dbCurrBag': 'PolarGraph1',
+                                      'u_dbCurrContents': ',appendRadius=radiusQ1,...,useCircles=2,maxArcLine=6;',
+                                      'u_dbReplaceBadChars': '\xa9\xae\x99\x9f',
+                                      'u_str': '2'}},
           'W_plrX5': <WaveRecord ...>,
           'W_plrX6': <WaveRecord ...>,
           'W_plrY5': <WaveRecord ...>,