From 322e3dbb9f71f2bb7617146563a09f5a89487867 Mon Sep 17 00:00:00 2001 From: Mickey Derks Date: Sun, 12 Nov 2017 17:11:38 +0100 Subject: [PATCH] Depentent properties do not hold a value. --- OOequipment/FunctionGenerator.m | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/OOequipment/FunctionGenerator.m b/OOequipment/FunctionGenerator.m index fd099f9..a81c34e 100644 --- a/OOequipment/FunctionGenerator.m +++ b/OOequipment/FunctionGenerator.m @@ -41,33 +41,30 @@ classdef FunctionGenerator < Equipment end function fg = set.waveform(fg,w) - fg.waveform = FunctionGenerator.getWave(w); - fg.write(strcat('FUNCtion:SHAPe ', fg.waveform)); + fg.write(strcat('FUNCtion:SHAPe ', FunctionGenerator.getWave(w))); end function fg = set.frequency(fg,f) - fg.frequency = Equipment.forceNum(f); - fg.write(strcat('FREQuency ', num2str(fg.frequency))); + Equipment.forceNum(f); + fg.write(strcat('FREQuency ', num2str(f))); end function fg = set.voltage(fg,v) - fg.voltage = Equipment.forceNum(v); - fg.write(strcat('VOLTage ', num2str(fg.voltage))); + Equipment.forceNum(v); + fg.write(strcat('VOLTage ', num2str(v))); end function fg = set.unit(fg,u) - fg.unit = FunctionGenerator.getUnit(u); - fg.write(strcat('VOLTage:UNIT ', fg.unit)); + fg.write(strcat('VOLTage:UNIT ', FunctionGenerator.getUnit(u))); end function fg = set.offset(fg,o) - fg.offset = Equipment.forceNum(o); - fg.write(strcat('VOLTage:OFFSet ', num2str(fg.offset))); + Equipment.forceNum(o); + fg.write(strcat('VOLTage:OFFSet ', num2str(o))); end function fg = set.load(fg,l) - fg.load = FunctionGenerator.getLoad(l); - fg.write(strcat('OUTPut:LOAD ', fg.load)); + fg.write(strcat('OUTPut:LOAD ', FunctionGenerator.getLoad(l))); end end