Changeset 315 for trunk/src/set_col_vec.m

Timestamp:

Dec 3, 2011, 10:25:45 PM (13 years ago)

Author:

sommeria

Message:

many corrections, use of the new GUI civ with mask, grid and the new matlab civ1 and fix
pivlab now included in civ_matlab which contains all matlab subfunctions for civ.

File:

• trunk/src/set_col_vec.m (modified) (3 diffs)

trunk/src/set_col_vec.m

@@ -10 +10 @@
             % colcode.CName: 'ima_cor','black','white',...
             % colcode.ListColorCode ='black', 'white', 'rgb','brg', '64 colors'
-            % colcode.FixedCbounds =0; thresholds scaling relative to min and max, =1 fixed thresholds
-            % colcode.MinC; min 
-            % colcode.MaxC; max
+            % colcode.CheckFixVecColor =0; thresholds scaling relative to min and max, =1 fixed thresholds
+            % colcode.MinVec; min 
+            % colcode.MaxVec; max
             % colcode.ColCode1: first threshold for rgb, relative to min (0) and max (1)
             % colcode.ColCode2: second threshold for rgb, relative to min (0) and max (1), 
@@ -19 +19 @@
 % vec_C: matlab vector representing the scalar setting the color
 function [colorlist,col_vec,colcode_out]=set_col_vec(colcode,vec_C)
-
 col_vec=[]; 
 colcode_out=colcode;%default
@@ -61 +60 @@
     col_vec=ones(size(vec_C));%all vectors at color#1
 elseif strcmp(colcode.ListColorCode,'rgb')|| strcmp(colcode.ListColorCode,'bgr')% 3 color representation
-    ind1=find(vec_C < ColCode1); % =1 for red vectors
+%    ind1=find(vec_C < ColCode1); % =1 for red vectors
     ind_green=find((vec_C >= ColCode1) & (vec_C < ColCode2));% =1 for green vectors
-    ind3=find(vec_C >= ColCode2);% =1 for blue vectors
+%     ind3=find(vec_C >= ColCode2);% =1 for blue vectors
     colorlist(2,:)=[0 1 0];%green
-    col_vec(ind1)=1;
+    col_vec(vec_C < ColCode1)=1;
     col_vec(ind_green)=2;
-    col_vec(ind3)=3;
+    col_vec(vec_C >= ColCode2)=3;
     if strcmp(colcode.ListColorCode,'rgb')
         colorlist(1,:)=[1 0 0];%red