From e2c10884a078f9ff913c5e6ab0e12fb502435e3e Mon Sep 17 00:00:00 2001
From: Cristian Galperti <cristian.galperti@epfl.ch>
Date: Wed, 29 May 2019 09:58:49 +0200
Subject: [PATCH] printMARTe2config output minor bugs fixed
---
code/classes/SCDclass_mdspar.m | 2 +-
code/classes/SCDclass_mdsparfixdimvector.m | 1 +
code/classes/SCDclass_mdsparfixdimvectorint.m | 1 +
code/classes/SCDclass_mdswg.m | 6 ++----
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/classes/SCDclass_mdspar.m b/code/classes/SCDclass_mdspar.m
index 1551773..67bbeac 100644
--- a/code/classes/SCDclass_mdspar.m
+++ b/code/classes/SCDclass_mdspar.m
@@ -179,7 +179,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
function entrystring = genMARTe2entrycommon(obj, shot)
obj=obj.actualizetdiexpr(shot);
- entrystring = sprintf('+%-30s = { Class=%-30s Path=%-40s',obj.gettargetparam,obj.classname,obj.tdiexprused);
+ entrystring = sprintf('+%-50s = { Class=%-30s Path=%-40s',obj.gettargetparam,obj.classname,obj.tdiexprused);
end
function str = genMARTe2MDSsourcestr(obj)
diff --git a/code/classes/SCDclass_mdsparfixdimvector.m b/code/classes/SCDclass_mdsparfixdimvector.m
index fb98b80..a4739a6 100644
--- a/code/classes/SCDclass_mdsparfixdimvector.m
+++ b/code/classes/SCDclass_mdsparfixdimvector.m
@@ -49,6 +49,7 @@ classdef SCDclass_mdsparfixdimvector < SCDclass_mdspar
function entrystring = genMARTe2entry(obj, shot)
entrystring=obj.genMARTe2entrycommon(shot);
+ entrystring=[entrystring ' Dim=' num2str(obj.dimension)];
entrystring=[entrystring ' }'];
end
diff --git a/code/classes/SCDclass_mdsparfixdimvectorint.m b/code/classes/SCDclass_mdsparfixdimvectorint.m
index 9fcc8be..3085ef1 100644
--- a/code/classes/SCDclass_mdsparfixdimvectorint.m
+++ b/code/classes/SCDclass_mdsparfixdimvectorint.m
@@ -49,6 +49,7 @@ classdef SCDclass_mdsparfixdimvectorint < SCDclass_mdspar
function entrystring = genMARTe2entry(obj, shot)
entrystring=obj.genMARTe2entrycommon(shot);
+ entrystring=[entrystring ' Dim=' num2str(obj.dimension)];
entrystring=[entrystring ' }'];
end
diff --git a/code/classes/SCDclass_mdswg.m b/code/classes/SCDclass_mdswg.m
index 46b8c59..6ea9b0a 100644
--- a/code/classes/SCDclass_mdswg.m
+++ b/code/classes/SCDclass_mdswg.m
@@ -99,10 +99,8 @@ classdef SCDclass_mdswg < matlab.mixin.Heterogeneous
%end
function entrystring = genMARTe2entrycommon(obj, shot)
- %obj.mdsconnect(shot);
- %[obj,~]=obj.getdata;
- %entrystring = ['+' obj.wavegentarget ' = { Class=' obj.classname ' Path=' obj.tdiexpr ' }'];
- entrystring = ['+' obj.wavegentarget ' = { Class=' obj.classname ' Path=' obj.tdiexpr ];
+ %entrystring = ['+' obj.wavegentarget ' = { Class=' obj.classname ' Path=' obj.tdiexpr ];
+ entrystring = sprintf('+%-50s = { Class=%-30s Path=%-40s',obj.wavegentarget,obj.classname,obj.tdiexpr);
end
--
GitLab