Changeset 1081 for trunk/src

Timestamp:

May 28, 2020, 5:30:08 PM (5 years ago)

Author:

sommeria

Message:

phys_polar corrected

Location:

trunk/src

Files:

• get_field.m (modified) (1 diff)
• read_GUI.m (modified) (1 diff)
• transform_field/ima_filter.m (modified) (1 diff)
• transform_field/phys_polar.m (modified) (1 diff)

trunk/src/get_field.m

@@ -629 +629 @@
 
 %% set default selection for grid coordinates
+if ~isempty(var_coord)
 coord_val(1)=var_coord(end);
 coord_val(2)=var_coord(end-1);
 if numel(var_coord)>=3
     coord_val(3)=var_coord(end-2);
+end
 end
 % if numel(find(test_coord))>3

trunk/src/read_GUI.m

@@ -71 +71 @@
                         end                        
                     case {'listbox','popupmenu'}
-                        listinput=get(hchild(ichild),'String');
-                        value=get(hchild(ichild),'Value');
+                        listinput=get(hchild(ichild),'String')
+                        value=get(hchild(ichild),'Value')
                         if ~isempty(listinput)
                             if numel(value)==1% single selection

trunk/src/transform_field/ima_filter.m

@@ -60 +60 @@
 Mfiltre=Mfiltre/(sum(sum(Mfiltre)));%normalize filter
 
-Atype=class(DataIn.A);% detect integer 8 or 16 bits
-if numel(size(DataIn.A))==3
-    DataOut.A=filter2(Mfiltre,sum(DataIn.A,3));%filter the input image, after summation on the color component (for color images)
-    DataOut.A=uint16(DataOut.A); %transform to 16 bit images
-else
-    DataOut.A=filter2(Mfiltre,DataIn.A);
-    DataOut.A=feval(Atype,DataOut.A);%transform to the initial image format
+[CellInfo,NbDim,errormsg]=find_field_cells(DataIn)
+for icell=1:numel(CellInfo)
+    if isfield(CellInfo{icell},'CoordType')&& strcmp(CellInfo{icell}.CoordType,'grid')
+        for ivar=1:numel(CellInfo{icell}.VarIndex)
+            VarName=DataIn.ListVarName{CellInfo{icell}.VarIndex(ivar)};
+            Atype=class(DataIn.(VarName));% detect integer 8 or 16 bits
+            if numel(size(DataIn.(VarName)))==3
+                DataOut.(VarName)=filter2(Mfiltre,sum(DataIn.(VarName),3));%filter the input image, after summation on the color component (for color images)
+                DataOut.(VarName)=uint16(DataOut.(VarName)); %transform to 16 bit images
+            else
+                DataOut.(VarName)=filter2(Mfiltre,DataIn.(VarName));
+                DataOut.(VarName)=feval(Atype,DataOut.(VarName));%transform to the initial image format
+            end
+        end
+    end
 end
  

trunk/src/transform_field/phys_polar.m

@@ -444 +444 @@
     siz=size(A{icell});
     checkuint8=isa(A{icell},'uint8');%check for image input with 8 bits
-    checkuint16=isa(A{icell},'uint8');%check for image input with 16 bits
+    checkuint16=isa(A{icell},'uint16');%check for image input with 16 bits
     A{icell}=double(A{icell});
     if numel(siz)==2 %(B/W images)