diff --git a/classes/SCDclass_mdspar.m b/classes/SCDclass_mdspar.m
index 108affea352469f542747d0c09102e2b6d88262a..27aaa0725b1344d4f7df5b582b78bbf3faffe338 100644
--- a/classes/SCDclass_mdspar.m
+++ b/classes/SCDclass_mdspar.m
@@ -171,7 +171,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
end
end
- function [obj,value]=getdatacommon(obj, shot)
+ function [obj,value]=getdata(obj, shot)
% TODO: this depends upon selected MATLAB - MDSplus interface
% mdsipmex mdsvalueraw to return uncast MDSplus data
% python interface mdsvalue returns incast MDSplus data
@@ -386,7 +386,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
% Gets data from mds, mds connection is assumed already estabilished
% and tree opened
- [obj, value] = getdata(obj, shot)
+ %[obj, value] = getdata(obj, shot)
% Generate C++ code
%gencode(obj)
diff --git a/classes/SCDclass_mdspar3Dmatrix.m b/classes/SCDclass_mdspar3Dmatrix.m
index 4c2c65f25cdd36a9b68180dd051a162a0d417fa3..10cd5a742e5b8f28b3cd86f06a1350b604fd9faa 100644
--- a/classes/SCDclass_mdspar3Dmatrix.m
+++ b/classes/SCDclass_mdspar3Dmatrix.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdspar3Dmatrix < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparboolean.m b/classes/SCDclass_mdsparboolean.m
index 41276dabe27f97fc3c078dae5787366062a311fa..12a125ad198e8cecb88d3a4cf80317895092e3ef 100644
--- a/classes/SCDclass_mdsparboolean.m
+++ b/classes/SCDclass_mdsparboolean.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparboolean < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparenum.m b/classes/SCDclass_mdsparenum.m
index 912159b28f9c53e4b29acd5ef5fff906dbd86654..b9a2ed717befc7c16bcda214fded962895f1c576 100644
--- a/classes/SCDclass_mdsparenum.m
+++ b/classes/SCDclass_mdsparenum.m
@@ -58,7 +58,7 @@ classdef SCDclass_mdsparenum < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
end
function printinfo(obj)
diff --git a/classes/SCDclass_mdsparfixdimvector.m b/classes/SCDclass_mdsparfixdimvector.m
index 006a2f580aa53c35625bd8046c5e3af917498c61..29ce71467b80483d8cc8ac721255579691398738 100644
--- a/classes/SCDclass_mdsparfixdimvector.m
+++ b/classes/SCDclass_mdsparfixdimvector.m
@@ -40,7 +40,7 @@ classdef SCDclass_mdsparfixdimvector < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparfixdimvectorint.m b/classes/SCDclass_mdsparfixdimvectorint.m
index 3872a7d59b1bcd2e0c1a2ed8a50f590ba213130f..d73064124c4c38b7f1fd9581f223f152fb1d2823 100644
--- a/classes/SCDclass_mdsparfixdimvectorint.m
+++ b/classes/SCDclass_mdsparfixdimvectorint.m
@@ -40,7 +40,7 @@ classdef SCDclass_mdsparfixdimvectorint < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparmatrix.m b/classes/SCDclass_mdsparmatrix.m
index 23feae094ea57663451985a78e0a74482c6efb9c..f2bd8c1d44970f08bcb441d55a00fe1dc97c1e90 100644
--- a/classes/SCDclass_mdsparmatrix.m
+++ b/classes/SCDclass_mdsparmatrix.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrix < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparmatrixbool.m b/classes/SCDclass_mdsparmatrixbool.m
index eba15e39bb17d283ab5d4e4549b1d2df709edf26..3d28c093d55148a1bee8553e857c0e27a2f99a89 100644
--- a/classes/SCDclass_mdsparmatrixbool.m
+++ b/classes/SCDclass_mdsparmatrixbool.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrixbool < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparmatrixdouble.m b/classes/SCDclass_mdsparmatrixdouble.m
index 69adefdcc173d53803beab77c6b2ceb1abdb50fa..6df494ea4880d248761fa9d8429f038c40ce9009 100644
--- a/classes/SCDclass_mdsparmatrixdouble.m
+++ b/classes/SCDclass_mdsparmatrixdouble.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrixdouble < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=double(value);
end
diff --git a/classes/SCDclass_mdsparmatrixint.m b/classes/SCDclass_mdsparmatrixint.m
index ad8fb399d9047a1fdd3a46f5cb319311cf04acff..c08d02c104241cfc568cf8264802dcadca19ed04 100644
--- a/classes/SCDclass_mdsparmatrixint.m
+++ b/classes/SCDclass_mdsparmatrixint.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrixint < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparnumeric.m b/classes/SCDclass_mdsparnumeric.m
index 7e621aebb88ea88557c789cfe0a981e599042e83..6417c6d5165d86a998c57ec08be99643f4902d4f 100644
--- a/classes/SCDclass_mdsparnumeric.m
+++ b/classes/SCDclass_mdsparnumeric.m
@@ -28,7 +28,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
actchk=true;
if numel(sourcedim)~=numel(targetdim)
warning('SCDDScore:mdsparnumeric','%s: number of dimensions not matching, actualization skipped!',obj.modelparam);
- % TODO bette handle output ?
sourcedim
targetdim
actchk=false;
@@ -46,7 +45,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
end
if actchk && ~any(sourcedim == targetdim)
warning('SCDDScore:mdsparnumeric','%s: dimensions not matching, actualization skipped!',obj.modelparam);
- % TODO bette handle output ?
sourcedim
targetdim
actchk=false;
@@ -57,7 +55,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
targetclass=Simulink.data.evalinGlobal(obj.modelname,sprintf('class(%s)',obj.assignvar));
if actchk && ~strcmp(sourceclass,targetclass)
warning('SCDDScore:mdsparnumeric','%s: Data types not matching, actualization skipped!',obj.modelparam);
- % TODO bette handle output ?
sourceclass
targetclass
actchk=false;
@@ -67,8 +64,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
% interface do not provide in information (matrix
% orientation) to do this. Or, probably, I misunderstood and
% matrix orientation is always preserved
-
-
obj.caststring=sprintf('%s=%s;',obj.assignvar,obj.assignvar);
if actchk
@@ -77,7 +72,7 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
end
function printinfo(obj)
diff --git a/classes/SCDclass_mdsparscalar.m b/classes/SCDclass_mdsparscalar.m
index 2ee2a5b0681d880df291b0b5fb6a97f54531d353..fda44d640a817682be7e81b82a9af3f1b4a3a0a6 100644
--- a/classes/SCDclass_mdsparscalar.m
+++ b/classes/SCDclass_mdsparscalar.m
@@ -24,7 +24,7 @@ classdef SCDclass_mdsparscalar < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparscalarbool.m b/classes/SCDclass_mdsparscalarbool.m
index fa06c54f29e7a51ee2feceab054ee49ca66e8a7f..77603d08a0e54740c6e75197c80f1393f8f71e50 100644
--- a/classes/SCDclass_mdsparscalarbool.m
+++ b/classes/SCDclass_mdsparscalarbool.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparscalarbool < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=uint8(value);
end
diff --git a/classes/SCDclass_mdsparscalardouble.m b/classes/SCDclass_mdsparscalardouble.m
index d9a04a74389c4410d01019c7c4d6687dd55c0770..00ef51d97fcf752cb3fb2ad9ad08b34ecf7bd69b 100644
--- a/classes/SCDclass_mdsparscalardouble.m
+++ b/classes/SCDclass_mdsparscalardouble.m
@@ -24,7 +24,7 @@ classdef SCDclass_mdsparscalardouble < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=double(value);
end
diff --git a/classes/SCDclass_mdsparscalarint.m b/classes/SCDclass_mdsparscalarint.m
index 71ef5272212e285e95453752cfcde5b1f23733d2..182ee338517997131fe6d6c0cfb66f73640ec9de 100644
--- a/classes/SCDclass_mdsparscalarint.m
+++ b/classes/SCDclass_mdsparscalarint.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparscalarint < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparscalartaridx.m b/classes/SCDclass_mdsparscalartaridx.m
index fd72d2a066a53f56113bdeb1a090527622730da5..16975465fb1b6c58d8b2f194f07c04da2e04c68c 100644
--- a/classes/SCDclass_mdsparscalartaridx.m
+++ b/classes/SCDclass_mdsparscalartaridx.m
@@ -26,7 +26,7 @@ classdef SCDclass_mdsparscalartaridx < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparvector.m b/classes/SCDclass_mdsparvector.m
index ec15b411dacfad96e0e8519e4368a1c82d65f08f..0a177d8f901439f3f5fd89570a8a1191a3646f07 100644
--- a/classes/SCDclass_mdsparvector.m
+++ b/classes/SCDclass_mdsparvector.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparvector < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparvectorbool.m b/classes/SCDclass_mdsparvectorbool.m
index 6c6dc8b2fcf2ef10485441ca0dba9e889e2ec1d2..a82c746ec154480c6e9f2b83d4aac49473dded49 100644
--- a/classes/SCDclass_mdsparvectorbool.m
+++ b/classes/SCDclass_mdsparvectorbool.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparvectorbool < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=uint8(value);
end
diff --git a/classes/SCDclass_mdsparvectordouble.m b/classes/SCDclass_mdsparvectordouble.m
index 2f32fc54a1386d4934a54d85c0509e66af3a55a7..da74a9cc039e4859d559d1872ad04baf6f11a8d3 100644
--- a/classes/SCDclass_mdsparvectordouble.m
+++ b/classes/SCDclass_mdsparvectordouble.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparvectordouble < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=double(value);
end
diff --git a/classes/SCDclass_mdsparvectorint.m b/classes/SCDclass_mdsparvectorint.m
index e63b48bccd4be5513e63037112e8f679fa09bd4f..80dee7e667437e851419ac9661f9b320b1bb010a 100644
--- a/classes/SCDclass_mdsparvectorint.m
+++ b/classes/SCDclass_mdsparvectorint.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparvectorint < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end