Changeset 681 for trunk/src/read_field.m

Timestamp:

Sep 2, 2013, 2:42:52 PM (11 years ago)

Author:

sommeria

Message:

mouse action improved for translations, use of magenta color to indicate that REFRESH is needed

File:

• trunk/src/read_field.m (modified) (5 diffs)

trunk/src/read_field.m

@@ -71 +71 @@
         Role={};
         ProjModeRequest={};
+        checkU=0;
+        checkV=0;
         for ilist=1:numel(InputField)
             r=regexp(InputField{ilist},'(?<Operator>(^vec|^norm))\((?<UName>.+),(?<VName>.+)\)$','names');
+            Operator='';
             if isempty(r)%  no operator used
-                ListVar=[ListVar InputField(ilist)];
+                if isempty(find(strcmp(InputField{ilist},ListVar)))
+                ListVar=[ListVar InputField(ilist)];%append the variable name if not already in the list
+                end
                 if check_colorvar(ilist)
                     Role{numel(ListVar)}='ancillary';% not projected with interpolation
@@ -83 +88 @@
                 end
             else  % an operator 'vec' or 'norm' is used
+                Operator=r.Operator;
                 if ~check_colorvar(ilist) && strcmp(r.Operator,'norm')
                     ProjModeRequestVar='interp_lin';%scalar field (requires interpolation for plot)
@@ -94 +100 @@
                     Role=[Role {'vector_x'}];
                     ProjModeRequest=[ProjModeRequest {ProjModeRequestVar}];
+                else
+                    checkU=1;
                 end
                 if isempty(ind_var_V)
@@ -99 +107 @@
                     Role=[Role {'vector_y'}];
                     ProjModeRequest=[ProjModeRequest {ProjModeRequestVar}];
+                else
+                    checkV=1;
                 end
             end
@@ -125 +135 @@
             Field.VarAttribute{ivar+2}.ProjModeRequest=ProjModeRequest{ivar};
         end
-
+        if strcmp(Operator,'norm')
+             NormName='norm';
+            if ~isempty(strcmp(ListVar,'norm'))
+                NormName='norm_1';
+            end
+            Field.ListVarName=[Field.ListVarName {NormName}];
+            ilist=numel(Field.ListVarName);
+            Field.VarDimName{ilist}=Field.VarDimName{ind_var_U};
+            Field.VarDimName{ilist}.Role='scalar';
+            Field.(NormName)=Field.(r.UName).*Field.(r.UName)+Field.(r.VName).*Field.(r.VName);
+            Field.(NormName)=sqrt(Field.(NormName));
+            if ~checkU && ~checkV
+                Field.ListVarName([ind_var_U ind_var_V])=[];
+                Field.VarDimName([ind_var_U ind_var_V])=[];
+                Field.VarAttribute([ind_var_U ind_var_V])=[];
+            elseif ~checkU
+                Field.ListVarName(ind_var_U)=[];
+                Field.VarDimName(ind_var_U)=[];
+                Field.VarAttribute(ind_var_U )=[];
+            elseif ~checkV
+                                Field.ListVarName(ind_var_V)=[];
+                Field.VarDimName(ind_var_V)=[];
+                Field.VarAttribute(ind_var_V )=[];
+            end
+        end
     case 'video'
         if strcmp(class(ParamIn),'VideoReader')