From 5d6666182a7024489a9944296664c7f241795cf7 Mon Sep 17 00:00:00 2001
From: marwan <>
Date: Mon, 25 Feb 2008 11:45:27 +0000
Subject: [PATCH] fix of the colorbar bug
---
private/create_CRPfig.m | 5 ++++-
private/create_JRPfig.m | 5 ++++-
private/show_crp.m | 9 +++++++--
private/switch_unthresholded.m | 16 ++++++++++------
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/private/create_CRPfig.m b/private/create_CRPfig.m
index d948bcb..64abe7a 100644
--- a/private/create_CRPfig.m
+++ b/private/create_CRPfig.m
@@ -10,6 +10,9 @@ function [h_axes,h_fig]=create_CRPfig(h,xshuttle,yshuttle)
% $Revision$
%
% $Log$
+% Revision 4.7 2004/11/10 07:04:28 marwan
+% initial import
+%
%
% This program is free software; you can redistribute it and/or
% modify it under the terms of the GNU General Public License
@@ -109,7 +112,7 @@ global props
colormap(french(256))
h1=colorbar('horiz'); % Colorbar
- set(h1,'Visible','off','Position',[.1 .07 .8 .02],'Tag','ColBar','xlim',[0 255])
+ set(h1,'Visible','off','Position',[.1 .07 .8 .02],'Tag','Colorbar','xlim',[0 255])
set(get(h1,'children'),'Visible','off')
set(findobj('Tag','CRPPlot'),'Position',[.1 .12 .8 .8*17/23])
diff --git a/private/create_JRPfig.m b/private/create_JRPfig.m
index 72d4d05..62efe31 100644
--- a/private/create_JRPfig.m
+++ b/private/create_JRPfig.m
@@ -10,6 +10,9 @@ function [h_axes,h_fig]=create_JRPfig(h,xshuttle,yshuttle)
% $Revision$
%
% $Log$
+% Revision 4.2 2005/04/04 09:52:24 marwan
+% bug in colormap selection fixed
+%
% Revision 4.1 2005/03/16 12:21:30 marwan
% add support for joint recurrence plots
%
@@ -113,7 +116,7 @@ global props
colormap(french(256))
h1=colorbar('horiz'); % Colorbar
- set(h1,'Visible','off','Position',[.1 .07 .8 .02],'Tag','ColBar','xlim',[0 255])
+ set(h1,'Visible','off','Position',[.1 .07 .8 .02],'Tag','Colorbar','xlim',[0 255])
set(get(h1,'children'),'Visible','off')
set(findobj('Tag','CRPPlot'),'Position',[.1 .12 .8 .8*17/23])
diff --git a/private/show_crp.m b/private/show_crp.m
index b29b1a1..48a5681 100644
--- a/private/show_crp.m
+++ b/private/show_crp.m
@@ -10,6 +10,9 @@ function show_crp(X,Shuttle)
% $Revision$
%
% $Log$
+% Revision 4.12 2007/05/22 13:43:45 marwan
+% added fixed RR support
+%
% Revision 4.11 2006/03/29 13:07:40 marwan
% problems regarding OPRPs and embedding resolved
%
@@ -97,14 +100,16 @@ NY=size(X,1);
'xdata',Shuttle.xscale(1:NX),'ydata',Shuttle.yscale(1:NY),...
'cdata',X_show,'UserData',X)
set(get(findobj('Tag','ColBar','Parent',Shuttle.hCRP),'children'),'visible','on')
- h1=findobj('Tag','ColBar','Parent',Shuttle.hCRP);
+
+ h1=findobj('Tag','Colorbar','Parent',Shuttle.hCRP);
set(h1,'visible','on')
set(get(h1,'xlabel'),'string','Dist. to Next Recurrence Point')
b2=get(h1,'position');
b3=get(h1,'ticklength');
+
set(h1,'ticklength',[b3(1)/2 b3(2)],'xlim',[0 255],...
'xtick',[0:255/9:255],'xticklabel',zl)
- titletext=sprintf('%s \n',['Unthresholded ',Shuttle.txt_cross,'Recurrence Plot'],...
+ titletext=sprintf('%s \n',[Shuttle.txt_cross,'Distance Matrix'],...
['Dimension: ', num2str(Shuttle.m), ', Delay: ', num2str(Shuttle.t)]);
clear v h1 h2
diff --git a/private/switch_unthresholded.m b/private/switch_unthresholded.m
index 19bc7d5..c2a3557 100644
--- a/private/switch_unthresholded.m
+++ b/private/switch_unthresholded.m
@@ -10,6 +10,9 @@ function switch_unthresholded(hCRP)
% $Revision$
%
% $Log$
+% Revision 4.8 2005/12/09 19:19:17 marwan
+% && and || changed to & and | (upwards compatibility)
+%
% Revision 4.7 2004/11/10 07:04:29 marwan
% initial import
%
@@ -19,7 +22,8 @@ function switch_unthresholded(hCRP)
% as published by the Free Software Foundation; either version 2
% of the License, or any later version.
- if get(gcbo,'value')==7 & strcmp(get(gcbo,'tag'),'Method')
+
+ if get(gcbo,'value')==10 & strcmp(get(gcbo,'tag'),'Method')
set(findobj('Tag','Unthresh','Parent',gcf),'enable','off')
set(findobj('Tag','Dim','Parent',gcf),'enable','off')
set(findobj('Tag','Dimtext','Parent',gcf),'enable','off')
@@ -28,7 +32,7 @@ function switch_unthresholded(hCRP)
return
end
- if get(gcbo,'value')~=7 & strcmp(get(gcbo,'tag'),'Method')
+ if get(gcbo,'value')~=10 & strcmp(get(gcbo,'tag'),'Method')
set(findobj('Tag','Unthresh','Parent',gcf),'enable','on')
set(findobj('Tag','Dim','Parent',gcf),'enable','on')
set(findobj('Tag','Dimtext','Parent',gcf),'enable','on')
@@ -42,14 +46,14 @@ function switch_unthresholded(hCRP)
set(findobj('Tag','Sizetext','Parent',gcf),'enable','off')
set(findobj('Tag','Method','Parent',gcf),'enable','off')
set(findobj('Tag','Log','Parent',gcf),'enable','on')
- set(findobj('Tag','ColBar','Parent',hCRP),'visible','on')
- set(get(findobj('Tag','ColBar','Parent',hCRP),'children'),'visible','on')
+ set(findobj('Tag','Colorbar','Parent',hCRP),'visible','on')
+ set(get(findobj('Tag','Colorbar','Parent',hCRP),'children'),'visible','on')
end
if get(findobj('Tag','Unthresh','Parent',gcf),'value')==0
set(findobj('Tag','Size','Parent',gcf),'enable','on')
set(findobj('Tag','Sizetext','Parent',gcf),'enable','on')
set(findobj('Tag','Method','Parent',gcf),'enable','on')
- set(findobj('Tag','ColBar','Parent',hCRP),'visible','off')
- set(get(findobj('Tag','ColBar','Parent',hCRP),'children'),'visible','off')
+ set(findobj('Tag','Colorbar','Parent',hCRP),'visible','off')
+ set(get(findobj('Tag','Colorbar','Parent',hCRP),'children'),'visible','off')
set(findobj('Tag','Log','Parent',gcf),'enable','off')
end
--
GitLab