Changeset 363 for trunk/src/read_GUI.m

Timestamp:

Jan 10, 2012, 9:13:31 AM (12 years ago)

Author:

sommeria

Message:

civ2 introduced in civ_matlab (still bugs)
bugs corrected in civ and fill_GUI, read_GUI
comments in get_field

File:

• trunk/src/read_GUI.m (modified) (2 diffs)

trunk/src/read_GUI.m

@@ -16 +16 @@
                 check_input=1;%default
                 switch object_style
-                    case {'checkbox','pushbutton','radiobutton','togglebutton'}
+                    case {'checkbox','radiobutton','togglebutton'}
                         input=get(hchild(ichild),'Value');
                     case 'edit'
-                        separator=regexp(tag,'_');
+                        separator=regexp(tag,'^num_');
                         if isempty(separator)
                             input=get(hchild(ichild),'String');
                         else
-                            switch(tag(1:separator))
-                                case 'num_'
-                                    input=str2double(get(hchild(ichild),'String'));
-                                    tag=tag(separator+1:end);
-                                    %deal with undefined input: retrieve the default value stored as UserData
-                                    if isnan(input)
-                                        input=get(hchild(ichild),'UserData');
-                                        set(hchild(ichild),'String',num2str(input))
-                                    end
-                                case 'txt_'
-                                    input=get(hchild(ichild),'String');
-                                    tag=tag(separator+1:end);
-                                otherwise
-                                    input=get(hchild(ichild),'String');
+                            input=str2double(get(hchild(ichild),'String'));
+                            tag=regexprep(tag,'^num_','');
+                            %deal with undefined input: retrieve the default value stored as UserData
+                            if isnan(input)
+                                input=get(hchild(ichild),'UserData');
+                                set(hchild(ichild),'String',num2str(input))
                             end
-                        end
-
-                        %                         key=tag(7:end);
-                    case{'Listbox','popupmenu'}
+                        end                        
+                    case{'listbox','popupmenu'}
                         listinput=get(hchild(ichild),'String');
                         value=get(hchild(ichild),'Value');
                         if ~isempty(listinput)
-                        input=listinput(value);
+                            input=listinput{value};
+                        else
+                            check_input=0;
                         end
-                        separator=regexp(tag,'_');
-                        if strcmp(tag(1:separator),'num_')
+                        separator=regexp(tag,'^num_');
+                        if ~isempty(separator)
                             input=str2double(input);% transform to numerical values if the uicontrol tag begins with 'num_'
-                            tag=tag(separator+1:end);
+                            tag=regexprep(tag,'^num_','');
                         end
                     otherwise
@@ -57 +49 @@
                 if check_input
                     struct.(tag)=input;
-                  %  eval(['struct.' tag '=input;'])
                 end
             case 'uitable'
-                 struct.(tag)=get(hchild(ichild),'Data');
+                struct.(tag)=get(hchild(ichild),'Data');
         end
     end