Update class generator to skip setting inherited properties in subclass constructor

+file/fillClass.m

@@ -148,7 +148,8 @@
         defaults,... %all defaults, regardless of inheritance
         classprops,...
         namespace, ...
-        superClassProps);
+        superClassProps, ...
+        inherited);
     setterFcns = file.fillSetters(setdiff(nonInherited, union(readonly, hiddenAndReadonly)), classprops);
     validatorFcns = file.fillValidators(allProperties, classprops, namespace, namespace.getFullClassName(name), inherited);
     exporterFcns = file.fillExport(nonInherited, class, depnm, required);

+file/fillConstructor.m

@@ -1,4 +1,4 @@
-function functionString = fillConstructor(name, parentname, defaults, props, namespace, superClassProps)
+function functionString = fillConstructor(name, parentname, defaults, props, namespace, superClassProps, inherited)
     caps = upper(name);
     functionBody = ['% ' caps ' - Constructor for ' name];
 
@@ -7,7 +7,7 @@
         functionBody = [functionBody newline() docString];
     end
 
-    bodyString = fillBody(parentname, defaults, props, namespace);
+    bodyString = fillBody(parentname, defaults, props, namespace, inherited);
     if ~isempty(bodyString)
         functionBody = [functionBody newline() bodyString];
     end
@@ -30,7 +30,8 @@
         'end'}, newline());
 end
 
-function bodystr = fillBody(parentName, defaults, props, namespace)
+function bodystr = fillBody(parentName, defaults, props, namespace, inherited)
+
     if isempty(defaults)
         bodystr = '';
     else
@@ -153,6 +154,8 @@
         'p.StructExpand = false;'};
 
     names = names(~dynamicConstrained & ~isAnonymousType);
+    names = setdiff(names, inherited, 'stable');
+
     defaults = cell(size(names));
     for i=1:length(names)
         prop = props(names{i});

+types/+core/AbstractFeatureSeries.m

@@ -65,13 +65,9 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         addParameter(p, 'feature_units',[]);
         addParameter(p, 'features',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         obj.feature_units = p.Results.feature_units;
         obj.features = p.Results.features;
         if strcmp(class(obj), 'types.core.AbstractFeatureSeries')

+types/+core/AnnotationSeries.m

@@ -49,13 +49,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_resolution',[]);
-        addParameter(p, 'data_unit',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_resolution = p.Results.data_resolution;
-        obj.data_unit = p.Results.data_unit;
         if strcmp(class(obj), 'types.core.AnnotationSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/CurrentClampSeries.m

@@ -74,14 +74,10 @@
         addParameter(p, 'bias_current',[]);
         addParameter(p, 'bridge_balance',[]);
         addParameter(p, 'capacitance_compensation',[]);
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         misc.parseSkipInvalidName(p, varargin);
         obj.bias_current = p.Results.bias_current;
         obj.bridge_balance = p.Results.bridge_balance;
         obj.capacitance_compensation = p.Results.capacitance_compensation;
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         if strcmp(class(obj), 'types.core.CurrentClampSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/CurrentClampStimulusSeries.m

@@ -59,11 +59,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         if strcmp(class(obj), 'types.core.CurrentClampStimulusSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/DecompositionSeries.m

@@ -72,15 +72,11 @@
         p.PartialMatching = false;
         p.StructExpand = false;
         addParameter(p, 'bands',[]);
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         addParameter(p, 'metric',[]);
         addParameter(p, 'source_channels',[]);
         addParameter(p, 'source_timeseries',[]);
         misc.parseSkipInvalidName(p, varargin);
         obj.bands = p.Results.bands;
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         obj.metric = p.Results.metric;
         obj.source_channels = p.Results.source_channels;
         obj.source_timeseries = p.Results.source_timeseries;

+types/+core/ElectricalSeries.m

@@ -72,15 +72,11 @@
         p.StructExpand = false;
         addParameter(p, 'channel_conversion',[]);
         addParameter(p, 'channel_conversion_axis',[]);
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         addParameter(p, 'electrodes',[]);
         addParameter(p, 'filtering',[]);
         misc.parseSkipInvalidName(p, varargin);
         obj.channel_conversion = p.Results.channel_conversion;
         obj.channel_conversion_axis = p.Results.channel_conversion_axis;
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         obj.electrodes = p.Results.electrodes;
         obj.filtering = p.Results.filtering;
         if strcmp(class(obj), 'types.core.ElectricalSeries')

+types/+core/GrayscaleImage.m

@@ -32,9 +32,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         if strcmp(class(obj), 'types.core.GrayscaleImage')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/IZeroClampSeries.m

@@ -57,15 +57,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'bias_current',[]);
-        addParameter(p, 'bridge_balance',[]);
-        addParameter(p, 'capacitance_compensation',[]);
-        addParameter(p, 'stimulus_description',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.bias_current = p.Results.bias_current;
-        obj.bridge_balance = p.Results.bridge_balance;
-        obj.capacitance_compensation = p.Results.capacitance_compensation;
-        obj.stimulus_description = p.Results.stimulus_description;
         if strcmp(class(obj), 'types.core.IZeroClampSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/Image.m

@@ -37,11 +37,9 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         addParameter(p, 'description',[]);
         addParameter(p, 'resolution',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         obj.description = p.Results.description;
         obj.resolution = p.Results.resolution;
         if strcmp(class(obj), 'types.core.Image')

+types/+core/ImageReferences.m

@@ -28,9 +28,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         if strcmp(class(obj), 'types.core.ImageReferences')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/ImageSeries.m

@@ -70,14 +70,12 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         addParameter(p, 'device',[]);
         addParameter(p, 'dimension',[]);
         addParameter(p, 'external_file',[]);
         addParameter(p, 'external_file_starting_frame',[]);
         addParameter(p, 'format',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         obj.device = p.Results.device;
         obj.dimension = p.Results.dimension;
         obj.external_file = p.Results.external_file;

+types/+core/IndexSeries.m

@@ -60,19 +60,9 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_conversion',[]);
-        addParameter(p, 'data_offset',[]);
-        addParameter(p, 'data_resolution',[]);
-        addParameter(p, 'data_unit',[]);
         addParameter(p, 'indexed_images',[]);
         addParameter(p, 'indexed_timeseries',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_conversion = p.Results.data_conversion;
-        obj.data_offset = p.Results.data_offset;
-        obj.data_resolution = p.Results.data_resolution;
-        obj.data_unit = p.Results.data_unit;
         obj.indexed_images = p.Results.indexed_images;
         obj.indexed_timeseries = p.Results.indexed_timeseries;
         if strcmp(class(obj), 'types.core.IndexSeries')

+types/+core/IntervalSeries.m

@@ -49,13 +49,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_resolution',[]);
-        addParameter(p, 'data_unit',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_resolution = p.Results.data_resolution;
-        obj.data_unit = p.Results.data_unit;
         if strcmp(class(obj), 'types.core.IntervalSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/IntracellularElectrodesTable.m

@@ -39,10 +39,8 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'description',[]);
         addParameter(p, 'electrode',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.description = p.Results.description;
         obj.electrode = p.Results.electrode;
         if strcmp(class(obj), 'types.core.IntracellularElectrodesTable')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));

+types/+core/IntracellularRecordingsTable.m

@@ -49,12 +49,10 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'description',[]);
         addParameter(p, 'electrodes',[]);
         addParameter(p, 'responses',[]);
         addParameter(p, 'stimuli',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.description = p.Results.description;
         obj.electrodes = p.Results.electrodes;
         obj.responses = p.Results.responses;
         obj.stimuli = p.Results.stimuli;

+types/+core/IntracellularResponsesTable.m

@@ -39,10 +39,8 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'description',[]);
         addParameter(p, 'response',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.description = p.Results.description;
         obj.response = p.Results.response;
         if strcmp(class(obj), 'types.core.IntracellularResponsesTable')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));

+types/+core/IntracellularStimuliTable.m

@@ -45,11 +45,9 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'description',[]);
         addParameter(p, 'stimulus',[]);
         addParameter(p, 'stimulus_template',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.description = p.Results.description;
         obj.stimulus = p.Results.stimulus;
         obj.stimulus_template = p.Results.stimulus_template;
         if strcmp(class(obj), 'types.core.IntracellularStimuliTable')

+types/+core/NWBData.m

@@ -28,9 +28,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         if strcmp(class(obj), 'types.core.NWBData')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/OpticalSeries.m

@@ -74,12 +74,10 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         addParameter(p, 'distance',[]);
         addParameter(p, 'field_of_view',[]);
         addParameter(p, 'orientation',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         obj.distance = p.Results.distance;
         obj.field_of_view = p.Results.field_of_view;
         obj.orientation = p.Results.orientation;

+types/+core/OptogeneticSeries.m

@@ -57,12 +57,8 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         addParameter(p, 'site',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         obj.site = p.Results.site;
         if strcmp(class(obj), 'types.core.OptogeneticSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));

+types/+core/PatchClampSeries.m

@@ -70,15 +70,11 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         addParameter(p, 'electrode',[]);
         addParameter(p, 'gain',[]);
         addParameter(p, 'stimulus_description',[]);
         addParameter(p, 'sweep_number',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         obj.electrode = p.Results.electrode;
         obj.gain = p.Results.gain;
         obj.stimulus_description = p.Results.stimulus_description;

+types/+core/RGBAImage.m

@@ -32,9 +32,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         if strcmp(class(obj), 'types.core.RGBAImage')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/RGBImage.m

@@ -32,9 +32,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         if strcmp(class(obj), 'types.core.RGBImage')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));

+types/+core/RoiResponseSeries.m

@@ -58,10 +58,8 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         addParameter(p, 'rois',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         obj.rois = p.Results.rois;
         if strcmp(class(obj), 'types.core.RoiResponseSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));

+types/+core/ScratchData.m

@@ -34,10 +34,8 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
         addParameter(p, 'notes',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
         obj.notes = p.Results.notes;
         if strcmp(class(obj), 'types.core.ScratchData')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));

+types/+core/SpatialSeries.m

@@ -59,12 +59,8 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
         addParameter(p, 'reference_frame',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
         obj.reference_frame = p.Results.reference_frame;
         if strcmp(class(obj), 'types.core.SpatialSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));

+types/+core/SpikeEventSeries.m

@@ -57,17 +57,7 @@
         p.KeepUnmatched = true;
         p.PartialMatching = false;
         p.StructExpand = false;
-        addParameter(p, 'data',[]);
-        addParameter(p, 'data_unit',[]);
-        addParameter(p, 'timestamps',[]);
-        addParameter(p, 'timestamps_interval',[]);
-        addParameter(p, 'timestamps_unit',[]);
         misc.parseSkipInvalidName(p, varargin);
-        obj.data = p.Results.data;
-        obj.data_unit = p.Results.data_unit;
-        obj.timestamps = p.Results.timestamps;
-        obj.timestamps_interval = p.Results.timestamps_interval;
-        obj.timestamps_unit = p.Results.timestamps_unit;
         if strcmp(class(obj), 'types.core.SpikeEventSeries')
             cellStringArguments = convertContainedStringsToChars(varargin(1:2:end));
             types.util.checkUnset(obj, unique(cellStringArguments));