From 19bac066d65f0003fdeadf9222b32cdd4314c697 Mon Sep 17 00:00:00 2001
From: scalinon <sylvain.calinon@idiap.ch>
Date: Fri, 21 Feb 2020 16:15:15 +0100
Subject: [PATCH] Ref updated

---
 demos/m_fcts/plotArmBasis.m | 8 ++++++--
 demos/m_fcts/plotArmLink.m  | 8 ++++----
 demos/m_fcts/plotGMM.m      | 4 ++--
 demos/m_fcts/plotGMM1D.m    | 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/demos/m_fcts/plotArmBasis.m b/demos/m_fcts/plotArmBasis.m
index e44374a..7b0e68e 100644
--- a/demos/m_fcts/plotArmBasis.m
+++ b/demos/m_fcts/plotArmBasis.m
@@ -44,7 +44,7 @@ xTmp(1,:) = [sz*1.5 sz.*1.5*cos(t1) -sz*1.5];
 xTmp(2,:) = [-sz*1.2 sz.*1.5*sin(t1) -sz*1.2];
 xTmp(3,:) = zeros(1,nbSegm);
 x = xTmp + repmat(p1,1,nbSegm);
-h = patch(x(1,:),x(2,:),x(3,:),facecol,'edgecolor',edgecol,'linewidth',2,'edgealpha',alpha,'facealpha',alpha); 
+h = patch(x(1,:),x(2,:),x(3,:),facecol,'edgecolor',edgecol,'linewidth',3,'edgealpha',alpha,'facealpha',alpha); 
 
 xTmp2(1,:) = linspace(-sz*1.2,sz*1.2,5);
 xTmp2(2,:) = repmat(-sz*1.2,1,5);
@@ -52,5 +52,9 @@ xTmp2(3,:) = zeros(1,5);
 x2 = xTmp2 + repmat(p1,1,5);
 x3 = xTmp2 + repmat(p1+[-0.5;-1;0]*sz,1,5);
 for i=1:5
-	h = [h patch([x2(1,i) x3(1,i)], [x2(2,i) x3(2,i)], facecol,'edgecolor',facecol,'linewidth',2,'edgealpha',alpha,'facealpha',alpha)]; 
+	if facecol==[1,1,1]
+		h = [h patch([x2(1,i) x3(1,i)], [x2(2,i) x3(2,i)], edgecol,'edgecolor',edgecol,'linewidth',3,'edgealpha',alpha,'facealpha',alpha)]; 
+	else
+		h = [h patch([x2(1,i) x3(1,i)], [x2(2,i) x3(2,i)], facecol,'edgecolor',facecol,'linewidth',3,'edgealpha',alpha,'facealpha',alpha)]; 
+	end
 end
diff --git a/demos/m_fcts/plotArmLink.m b/demos/m_fcts/plotArmLink.m
index c2bcaac..d5739a5 100644
--- a/demos/m_fcts/plotArmLink.m
+++ b/demos/m_fcts/plotArmLink.m
@@ -47,7 +47,7 @@ xTmp(3,:) = zeros(1,nbSegm);
 R = [cos(a1) -sin(a1) 0; sin(a1) cos(a1) 0; 0 0 0];
 x = R*xTmp + repmat(p1,1,nbSegm);
 p2 = R*[d1;0;0] + p1;
-h = patch(x(1,:),x(2,:),x(3,:),facecol,'edgecolor',edgecol,'linewidth',2,'edgealpha',alpha,'facealpha',alpha); 
-msh = [sin(linspace(0,2*pi,nbSegm)); cos(linspace(0,2*pi,nbSegm))]*sz*0.2;
-h = [h patch(msh(1,:)+p1(1), msh(2,:)+p1(2), repmat(p1(3),1,nbSegm), edgecol,'edgeColor',edgecol,'linewidth',2,'edgealpha',alpha,'facealpha',alpha)]; 
-h = [h patch(msh(1,:)+p2(1), msh(2,:)+p2(2), repmat(p2(3),1,nbSegm), edgecol,'edgeColor',edgecol,'linewidth',2,'edgealpha',alpha,'facealpha',alpha)]; 
+h = patch(x(1,:),x(2,:),x(3,:),facecol,'edgecolor',edgecol,'linewidth',3,'edgealpha',alpha,'facealpha',alpha); 
+msh = [sin(linspace(0,2*pi,nbSegm)); cos(linspace(0,2*pi,nbSegm))]*sz*0.4;
+h = [h patch(msh(1,:)+p1(1), msh(2,:)+p1(2), repmat(p1(3),1,nbSegm), facecol,'edgeColor',edgecol,'linewidth',3,'edgealpha',alpha,'facealpha',alpha)]; 
+h = [h patch(msh(1,:)+p2(1), msh(2,:)+p2(2), repmat(p2(3),1,nbSegm), facecol,'edgeColor',edgecol,'linewidth',3,'edgealpha',alpha,'facealpha',alpha)]; 
diff --git a/demos/m_fcts/plotGMM.m b/demos/m_fcts/plotGMM.m
index f75e639..1f20b1f 100644
--- a/demos/m_fcts/plotGMM.m
+++ b/demos/m_fcts/plotGMM.m
@@ -43,7 +43,7 @@ function [h, X] = plotGMM(Mu, Sigma, color, valAlpha)
 
 nbStates = size(Mu,2);
 nbDrawingSeg = 100;
-darkcolor = color*.7; %max(color-0.5,0);
+darkcolor = color * .7; %max(color-0.5,0);
 t = linspace(-pi, pi, nbDrawingSeg);
 if nargin<4
 	valAlpha = 1;
@@ -63,9 +63,9 @@ for i=1:nbStates
 		%h = [h patch(MuTmp(1,:), MuTmp(2,:), darkcolor, 'LineStyle', 'none', 'facealpha', valAlpha)];
 		h = [h plot(Mu(1,:), Mu(2,:), '.', 'markersize', 10, 'color', darkcolor)];
 	else %Plot without transparency
+		h = [h plot(Mu(1,:), Mu(2,:), '.', 'markersize', 10, 'color', darkcolor)];
 		%Standard plot
 		h = [h patch(X(1,:,i), X(2,:,i), color, 'lineWidth', 1, 'EdgeColor', darkcolor)];
-		h = [h plot(Mu(1,:), Mu(2,:), '.', 'markersize', 10, 'color', darkcolor)];
 % 		%Plot only contours
 % 		h = [h plot(X(1,:,i), X(2,:,i), '-', 'color', color, 'lineWidth', 1)];
 	end
diff --git a/demos/m_fcts/plotGMM1D.m b/demos/m_fcts/plotGMM1D.m
index c6334f7..8a25172 100644
--- a/demos/m_fcts/plotGMM1D.m
+++ b/demos/m_fcts/plotGMM1D.m
@@ -59,7 +59,7 @@ if ~isfield(model,'Priors')
 	model.Priors = ones(model.nbStates,1) / model.nbStates;
 end
 
-lightcolor = min(color+0.5,1);
+lightcolor = min(color+0,1);
 
 X=[];
 for i=1:model.nbStates
-- 
GitLab