From 31958fae211bfe6bb101a8ada080ebed42f6c9d4 Mon Sep 17 00:00:00 2001
From: carmelo magnafico <carmelo.magnafico@gmail.com>
Date: Fri, 18 Oct 2019 08:26:54 +0200
Subject: [PATCH] textual calibration bug fix
---
matlab/src/classes/@MatMust/MatMust.m | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/matlab/src/classes/@MatMust/MatMust.m b/matlab/src/classes/@MatMust/MatMust.m
index 1c3403a..e93bf77 100644
--- a/matlab/src/classes/@MatMust/MatMust.m
+++ b/matlab/src/classes/@MatMust/MatMust.m
@@ -216,11 +216,11 @@ classdef MatMust < handle
switch class(data_par(1).calibratedValue)
case 'char'
indx = [1,find(diff([data_par.value])~=0)]+1;
- ylabels = string;
- ylabels([unique([data_par.value],'stable')]) = replace({data_par(indx).calibratedValue},'_',' ');
+ [ylabels,charind ] = unique(replace({data_par(indx).calibratedValue},'_',' '),'stable');
plot([data_par.dateMAT], [data_par.value], '-x' );
- set(gca,'ytick',unique([data_par.value],'sorted'))
- set(gca,'yticklabel',ylabels)
+ set(gca,'ytick',unique([data_par.value],'sorted'));
+ [~,si] = sort([data_par(indx(charind)).value]);
+ set(gca,'yticklabel', ylabels(si) );
if exist('dataFigShowUpdatefcn')==2
set(datacursormode(gcf),'UpdateFcn',@dataFigShowUpdatefcn)
end
@@ -249,12 +249,11 @@ classdef MatMust < handle
% MatMust_searchTMparFromName(obj, namequery, dataproviders, varargin)
%
% dataproviders = dataprovider IdName.
- % namequery = The query to perform (ex. '*HGA' )
+ % namequery = The query to perform (ex. '*HGA' or 'HGA+.+state' )
% varargin = You can specify several options in varagin:
% ex: 'dump' -> print to screen the parameters found
% 'Description' -> Extend search in Parameters Descriptions
% 'Id' -> Extend Search in Parameter Id
- % 'Unit' -> Extend Search in Unit name space
%
@@ -265,10 +264,10 @@ classdef MatMust < handle
dataproviders = char(join(dataproviders,','));
end
try
- optindx = strcmp(varargin,'Description')+strcmp(varargin,'Unit')+strcmp(varargin,'Id');
+ optindx = strcmp(varargin,'Description')+strcmp(varargin,'Id')+strcmp(dataproviders,'name');
if any(find(optindx))
field = join(varargin(find(optindx)),',');
- response = webread([obj.url,obj.urlsub, query], 'field',['name,',char(field)],'text',namequery,'dataproviders', dataproviders ,obj.GEToptions);
+ response = webread([obj.url,obj.urlsub, query], 'field',[char(field)],'text',namequery,'dataproviders', dataproviders ,obj.GEToptions);
else
response = webread([obj.url,obj.urlsub, query], 'field','name','text',namequery,'dataproviders', dataproviders ,obj.GEToptions);
--
GitLab