From e0b91104d619e6a6acc28b09ff7708c20f083da2 Mon Sep 17 00:00:00 2001
From: galperti <cristian.galperti@epfl.ch>
Date: Wed, 22 Jun 2022 15:15:48 +0200
Subject: [PATCH] genMARTe2entrycommon -> genMARTe2entry
---
classes/SCDclass_mdswg.m | 2 +-
classes/SCDclass_mdswgsigarray1.m | 2 +-
classes/SCDclass_mdswgsigsingle.m | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/classes/SCDclass_mdswg.m b/classes/SCDclass_mdswg.m
index 5ec860a..58d590d 100644
--- a/classes/SCDclass_mdswg.m
+++ b/classes/SCDclass_mdswg.m
@@ -152,7 +152,7 @@ classdef SCDclass_mdswg < matlab.mixin.Heterogeneous
% out = obj.modelparam;
%end
- function entrystring = genMARTe2entrycommon(obj, shot)
+ function entrystring = genMARTe2entry(obj, shot)
%entrystring = ['+' obj.wavegentarget ' = { Class=' obj.classname ' Path=' obj.tdiexpr ];
entrystring = sprintf('+%-50s = { Class=%-30s Path=%-40s',obj.wavegentarget,obj.marteclassname,obj.genMARTe2MDStdiexpression);
end
diff --git a/classes/SCDclass_mdswgsigarray1.m b/classes/SCDclass_mdswgsigarray1.m
index faa3601..4d06a15 100644
--- a/classes/SCDclass_mdswgsigarray1.m
+++ b/classes/SCDclass_mdswgsigarray1.m
@@ -150,7 +150,7 @@ classdef SCDclass_mdswgsigarray1 < SCDclass_mdswg
if(obj.srcstartidx~=obj.deststartidx || obj.srcstopidx~=obj.deststopidx)
error('SCDclass_mdswgsigarray1:genMARTe2entry','Signal position remapping not yet implemented in the MARTe version of this class');
end
- entrystring=obj.genMARTe2entrycommon(shot);
+ entrystring=obj.genMARTe2entry@SCDclass_mdswg(obj,shot);
entrystring=[entrystring ' StartIdx=' num2str(obj.srcstartidx) ' StopIdx=' num2str(obj.srcstopidx) ' }'];
end
diff --git a/classes/SCDclass_mdswgsigsingle.m b/classes/SCDclass_mdswgsigsingle.m
index 1925dc4..4d1e462 100644
--- a/classes/SCDclass_mdswgsigsingle.m
+++ b/classes/SCDclass_mdswgsigsingle.m
@@ -133,7 +133,7 @@ classdef SCDclass_mdswgsigsingle < SCDclass_mdswg
if obj.destidx~=1
error('SCDclass_mdswgsigsingle:marteerror', 'MARTe2 remapping not yet implemented');
end
- entrystring=[obj.genMARTe2entrycommon(shot) ' }'];
+ entrystring=[obj.genMARTe2entry@SCDclass_mdswg(obj,shot) ' }'];
end
function autopopulatemds(obj, shot)
--
GitLab