Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SCDDS-core
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SPC
SCDDS
SCDDS-core
Commits
e0b91104
Commit
e0b91104
authored
2 years ago
by
Cristian Galperti
Browse files
Options
Downloads
Patches
Plain Diff
genMARTe2entrycommon -> genMARTe2entry
parent
b6c29abd
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
classes/SCDclass_mdswg.m
+1
-1
1 addition, 1 deletion
classes/SCDclass_mdswg.m
classes/SCDclass_mdswgsigarray1.m
+1
-1
1 addition, 1 deletion
classes/SCDclass_mdswgsigarray1.m
classes/SCDclass_mdswgsigsingle.m
+1
-1
1 addition, 1 deletion
classes/SCDclass_mdswgsigsingle.m
with
3 additions
and
3 deletions
classes/SCDclass_mdswg.m
+
1
−
1
View file @
e0b91104
...
...
@@ -152,7 +152,7 @@ classdef SCDclass_mdswg < matlab.mixin.Heterogeneous
% out = obj.modelparam;
%end
function
entrystring
=
genMARTe2entry
common
(
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
...
...
This diff is collapsed.
Click to expand it.
classes/SCDclass_mdswgsigarray1.m
+
1
−
1
View file @
e0b91104
...
...
@@ -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
.
genMARTe2entry
common
(
shot
);
entrystring
=
obj
.
genMARTe2entry
@
SCDclass_mdswg
(
obj
,
shot
);
entrystring
=
[
entrystring
' StartIdx='
num2str
(
obj
.
srcstartidx
)
' StopIdx='
num2str
(
obj
.
srcstopidx
)
' }'
];
end
...
...
This diff is collapsed.
Click to expand it.
classes/SCDclass_mdswgsigsingle.m
+
1
−
1
View file @
e0b91104
...
...
@@ -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
.
genMARTe2entry
common
(
shot
)
' }'
];
entrystring
=
[
obj
.
genMARTe2entry
@
SCDclass_mdswg
(
obj
,
shot
)
' }'
];
end
function
autopopulatemds
(
obj
,
shot
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment