Changeset 965 for trunk/src

Timestamp:

Jul 1, 2016, 7:47:18 PM (8 years ago)

Author:

sommeria

Message:

various

Location:

trunk/src

Files:

• proj_field.m (modified) (2 diffs)
• set_object.m (modified) (5 diffs)
• uvmat.m (modified) (2 diffs)

trunk/src/proj_field.m

@@ -949 +949 @@
 
 %% rotation angles
-PlaneAngle=[0 0 0];
+PlaneAngle=[0 0];
 norm_plane=[0 0 1];
 %cos_om=1;
@@ -963 +963 @@
 %     ObjectData.Angle(2)=90*Delta_y/Delta_mod;
 % end   
-if isfield(ObjectData,'Angle')&& isequal(size(ObjectData.Angle),[1 3])&& ~isequal(ObjectData.Angle,[0 0 0])
+if isfield(ObjectData,'Angle')&& isequal(size(ObjectData.Angle),[1 2])&& ~isequal(ObjectData.Angle,[0 0])
     test90y=0;%isequal(ObjectData.Angle,[0 90 0]);
     PlaneAngle=(pi/180)*ObjectData.Angle;

trunk/src/set_object.m

@@ -158 +158 @@
     end  
     if ~isfield(data,'Angle')
-        data.Angle=[0 0 0];
+        data.Angle=[0 0];
     end
 %     if isfield(data,'Angle') && isequal(numel(data.Angle),3)
@@ -362 +362 @@
         set(handles.num_Angle_1,'Visible','on')
         set(handles.num_Angle_2,'Visible','on')
-        set(handles.num_Angle_3,'Visible','on')
+        %set(handles.num_Angle_3,'Visible','on')
         set(handles.num_RangeZ_1,'Visible','on')
         set(handles.num_RangeZ_2,'Visible','on')
@@ -412 +412 @@
 PlaneAngle(1)=str2num(get(handles.num_Angle_1,'String'));%first  angle in degrees
 PlaneAngle(2)=str2num(get(handles.num_Angle_2,'String'));%second  angle in degrees
-PlaneAngle(3)=str2num(get(handles.num_Angle_3,'String'));%second  angle in degrees
+%PlaneAngle(3)=str2num(get(handles.num_Angle_3,'String'));%second  angle in degrees
 om=norm(PlaneAngle);%norm of rotation angle in radians
 OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
@@ -714 +714 @@
 Z_value=get(handles.z_slider,'Value');
 %rotation angles
-PlaneAngle=[0 0 0]; 
+PlaneAngle=[0 0]; 
 norm_plane=[0 0 1];
 cos_om=1;
@@ -764 +764 @@
 
 
-function num_Angle_3_Callback(hObject, eventdata, handles)
-
-%------------------------------------------------------------------------
-% --- Executes on key press with selection of a uicontrol
-%------------------------------------------------------------------------
-function KeyPressFcn(hObject, eventdata, handles)
-set(handles.REFRESH,'BackgroundColor',[1 0 1])% se REFRESH to magenta color, indicates that refresh needs to be done
-if strcmp(get(hObject,'Tag'),'num_Angle_3')
-    set(handles.num_RangeX_1,'String','')
-    set(handles.num_RangeX_2,'String','')
-        set(handles.num_RangeY_1,'String','')
-    set(handles.num_RangeY_2,'String','')
-end
+% function num_Angle_3_Callback(hObject, eventdata, handles)
+% 
+% %------------------------------------------------------------------------
+% % --- Executes on key press with selection of a uicontrol
+% %------------------------------------------------------------------------
+% function KeyPressFcn(hObject, eventdata, handles)
+% set(handles.REFRESH,'BackgroundColor',[1 0 1])% se REFRESH to magenta color, indicates that refresh needs to be done
+% if strcmp(get(hObject,'Tag'),'num_Angle_3')
+%     set(handles.num_RangeX_1,'String','')
+%     set(handles.num_RangeX_2,'String','')
+%         set(handles.num_RangeY_1,'String','')
+%     set(handles.num_RangeY_2,'String','')
+% end
 
 %------------------------------------------------------------------------

trunk/src/uvmat.m

@@ -3749 +3749 @@
             UvData.ProjObject{1}.RangeZ=UvData.Field.CoordMesh;%main plotting plane
             UvData.ProjObject{1}.Coord(1,3)=(UvData.Field.ZMin+UvData.Field.ZMax)/2;%section at a middle plane chosen
-            UvData.ProjObject{1}.Angle=[0 0 0];
+            UvData.ProjObject{1}.Angle=[0 0];
         elseif isfield(UvData,'Z')
             %multilevel case (single menuplane in a 3D space)
@@ -5661 +5661 @@
     end
     ZBounds=0; % default
+    if  ~isfield(UvData,'Field')
+        disp('an input field needs to be introduced')
+        return
+    end
     if isfield(UvData.Field,'ZMin') && isfield(UvData.Field,'ZMax')
         ZBounds(1)=UvData.Field.ZMin; %minimum for the Z slider