Changeset 1001 for trunk/src/series.m

Timestamp:

Feb 27, 2017, 9:28:27 AM (8 years ago)

Author:

sommeria

Message:

tubcorrelation added, compilation improved to accept tranform fct

File:

• trunk/src/series.m (modified) (4 diffs)

trunk/src/series.m

@@ +1 @@
+
+
+
 %'series': master function associated to the GUI series.m for analysis field series  
 %------------------------------------------------------------------------
@@ -185 +188 @@
 TransformPathList=cell(NbBuiltinTransform,1); % initiate the cell matrix of Action fct paths
 TransformPathList(:)={path_transform_fct}; % set the default path to series fcts to all list members
+SeriesData.TransformPath=path_transform_fct;% store the standard path for trqnsform functions (needed for compilation)
 
 %% get the user defined functions stored in the personal file uvmat_perso.mat 
@@ -1526 +1530 @@
 if strcmp(ActionExt,'.sh')
     TransformPath='';
-    if ~isempty(get(handles.ActionExt,'UserData'))
-        TransformPath=get(handles.ActionExt,'UserData');
+    if isfield(SeriesData,'TransformPath')
+        TransformPath=SeriesData.TransformPath;
+        if isfield(SeriesData,'TransformList')
+            TransformList=get(handles.TransformName,'String');
+            TransformIndex=get(handles.TransformName,'Value');
+            TransformName=TransformList{TransformIndex};
+            if ~ismember(TransformName,SeriesData.TransformList)
+                TransformPath='';
+            end
+        end
+    end
+    if ~isempty(TransformPath)&&...
+          ~strcmp(TransformPath,get(handles.TransformPath,'String'))% if the transform is not in paths set for compilation
+        msgbox_uvmat('ERROR', 'compilation not available for this transform function, select .m')
+        return
     end
     set(handles.series,'Pointer','watch') % set the mouse pointer to 'watch'
@@ -2552 +2569 @@
 FieldTransformVisible='off';  %hidden by default
 if isfield(ParamOut,'FieldTransform')
-    FieldTransformVisible=ParamOut.FieldTransform;  
+    if ~strcmp(ParamOut.FieldTransform,'off')
+    FieldTransformVisible='on';  
+    end
+    if iscell(ParamOut.FieldTransform)
+        SeriesData.TransformList=ParamOut.FieldTransform;
+    end
     TransformName_Callback([],[], handles)
 end
 set(handles.FieldTransform,'Visible',FieldTransformVisible)
-if isfield(ParamOut,'TransformPath')
-    set(handles.ActionExt,'UserData',ParamOut.TransformPath)
+if isfield(ParamOut,'TransformPath');% record the path of transform function requested for compilation
+    set(handles.TransformPath,'UserData',ParamOut.TransformPath)
 else
-    set(handles.ActionExt,'UserData',[])
+    set(handles.TransformPath,'UserData',[])
 end