Changeset 965 for trunk/src/set_object.m

Timestamp:

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

Author:

sommeria

Message:

various

File:

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

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
 
 %------------------------------------------------------------------------