Changeset 233 for trunk

Timestamp:

Apr 6, 2011, 11:54:15 PM (14 years ago)

Author:

sommeria

Message:

small bug corrections, and improved display of image correlations (Testcvi1)

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (2 diffs)
• pivlab.m (modified) (1 diff)
• read_field.m (modified) (2 diffs)
• set_object.m (modified) (1 diff)

trunk/src/civ.m

@@ -4671 +4671 @@
 function TestCiv1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+set(handles.TestCiv1,'BackgroundColor',[1 1 0])
+drawnow
 test_civ1=get(handles.TestCiv1,'Value');
 if test_civ1
@@ -4733 +4735 @@
         set(corrfig,'DeleteFcn',{@closeview_field})%
     end
+    set(handles.TestCiv1,'BackgroundColor',[1 0 0])
 else
     corrfig=findobj(allchild(0),'tag','corrfig');% look for a current figure for image correlation display

trunk/src/pivlab.m

@@ -99 +99 @@
     image1_crop=image1_roi(jref-iby2:jref+iby2,iref-ibx2:iref+ibx2);
     image2_crop=image2_roi(jref+shifty-isy2:jref+shifty+isy2,iref+shiftx-isx2:iref+shiftx+isx2);
+    image1_crop=image1_crop-mean(mean(image1_crop));
+    image2_crop=image2_crop-mean(mean(image2_crop));
         if mask(jref,iref)==0
            %reference: Oliver Pust, PIV: Direct Cross-Correlation

trunk/src/read_field.m

@@ -41 +41 @@
     end
     test_civx=0;
-    ParamIn
     if ~strcmp(ParamIn.FieldName,'get_field...')% if get_field is not requested, look for Civx data
         FieldList=calc_field;%list of possible fields for Civx data
@@ -47 +46 @@
         field_index=strcmp(ParamOut.FieldName,FieldList);%look for ParamOut.FieldName in the list
         if isempty(find(field_index,1))% ParamOut.FieldName is not in the list, check whether Civx data exist
-            'TESTnc1'
-            Data=nc2struct(ObjectName,'ListGlobalAttribute','absolut_time_T0','civ')
+            Data=nc2struct(ObjectName,'ListGlobalAttribute','absolut_time_T0','civ');
             if ~isempty(Data.absolut_time_T0)&& ~isequal(Data.civ,0)
                 ParamOut.FieldName='velocity';%Civx data found, set .FieldName='velocity' by default

trunk/src/set_object.m

@@ -681 +681 @@
 testnew=0;
 ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
-if strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
+if ~isempty(ListObject) && strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
     IndexObj=IndexObj_1;
     projview='uvmat';