Changeset 546 for trunk/src/uvmat.m

Timestamp:

Sep 17, 2012, 10:47:38 PM (12 years ago)

Author:

sommeria

Message:

bugs corrected for tps projection on a grid + pb of colorbar display solved

File:

• trunk/src/uvmat.m (modified) (6 diffs)

trunk/src/uvmat.m

@@ -178 +178 @@
 set(hObject,'Units','Normalized')
 movegui(hObject,'center')
+%UvData.OpenParam.PosColorbar=[0.8450    0.0900    0.0190    0.3600];
 UvData.OpenParam.PosColorbar=[0.805 0.022 0.019 0.445];
 UvData.OpenParam.PosSetObject=[-0.05 -0.03 0.3 0.7]; %position for set_object
@@ -2439 +2440 @@
     end
     UvData.Field.Mesh=min(Mesh);
-    UvData.Field.XMax=max(CoordMax(ind,1));
-    UvData.Field.XMin=min(CoordMin(ind,1));
-    UvData.Field.YMax=max(CoordMax(ind,2));
-    UvData.Field.YMin=max(CoordMin(ind,2));
+    UvData.Field.XMax=max(CoordMax(ind,end));
+    UvData.Field.XMin=min(CoordMin(ind,end));
+    UvData.Field.YMax=max(CoordMax(ind,end-1));
+    UvData.Field.YMin=max(CoordMin(ind,end-1));
     if NbDim==3
-        UvData.Field.ZMax=max(CoordMax(ind,3));
-        UvData.Field.ZMin=max(CoordMin(ind,3));
+        UvData.Field.ZMax=max(CoordMax(ind,1));
+        UvData.Field.ZMin=max(CoordMin(ind,1));
     end
     % adjust the mesh to a value 1, 2 , 5 *10^n
@@ -3061 +3062 @@
 end
 if isequal(field,'image')||isequal(field_1,'image')
-    set(handles.TitleNpx,'Visible','on')% visible npx,pxcm... buttons
-    set(handles.TitleNpy,'Visible','on')
+    set(handles.TitleNpxy,'Visible','on')% visible npx,pxcm... buttons
     set(handles.num_Npx,'Visible','on')
     set(handles.num_Npy,'Visible','on')
 else
-    set(handles.TitleNpx,'Visible','off')% visible npx,pxcm... buttons
-    set(handles.TitleNpy,'Visible','off')
+    set(handles.TitleNpxy,'Visible','off')% visible npx,pxcm... buttons
     set(handles.num_Npx,'Visible','off')
     set(handles.num_Npy,'Visible','off')
@@ -3148 +3147 @@
             set(handles.SubField,'Value',0)
         else %valid browser input:  display the selected image
-            set(handles.TitleNpx,'Visible','on')% visible npx,pxcm... buttons
-            set(handles.TitleNpy,'Visible','on')
+            set(handles.TitleNpxy,'Visible','on')% visible npx,pxcm... buttons
             set(handles.num_Npx,'Visible','on')
             set(handles.num_Npy,'Visible','on')
@@ -3161 +3159 @@
         end
         if ~isequal(field,'image')
-            set(handles.TitleNpx,'Visible','off')% visible npx,pxcm... buttons
-            set(handles.TitleNpy,'Visible','off')
+            set(handles.TitleNpxy,'Visible','off')% visible npx,pxcm... buttons
             set(handles.num_Npx,'Visible','off')
             set(handles.num_Npy,'Visible','off')
@@ -4839 +4836 @@
 % --- Executes on selection change in Coord_x.
 function Coord_x_Callback(hObject, eventdata, handles)
+
+
+% --- Executes on button press in CheckColorBar.
+function CheckColorBar_Callback(hObject, eventdata, handles)
+% hObject    handle to CheckColorBar (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hint: get(hObject,'Value') returns toggle state of CheckColorBar