Changeset 233


Ignore:
Timestamp:
Apr 6, 2011, 11:54:15 PM (10 years ago)
Author:
sommeria
Message:

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

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r232 r233  
    46714671function TestCiv1_Callback(hObject, eventdata, handles)
    46724672%------------------------------------------------------------------------
     4673set(handles.TestCiv1,'BackgroundColor',[1 1 0])
     4674drawnow
    46734675test_civ1=get(handles.TestCiv1,'Value');
    46744676if test_civ1
     
    47334735        set(corrfig,'DeleteFcn',{@closeview_field})%
    47344736    end
     4737    set(handles.TestCiv1,'BackgroundColor',[1 0 0])
    47354738else
    47364739    corrfig=findobj(allchild(0),'tag','corrfig');% look for a current figure for image correlation display
  • trunk/src/pivlab.m

    r231 r233  
    9999    image1_crop=image1_roi(jref-iby2:jref+iby2,iref-ibx2:iref+ibx2);
    100100    image2_crop=image2_roi(jref+shifty-isy2:jref+shifty+isy2,iref+shiftx-isx2:iref+shiftx+isx2);
     101    image1_crop=image1_crop-mean(mean(image1_crop));
     102    image2_crop=image2_crop-mean(mean(image2_crop));
    101103        if mask(jref,iref)==0
    102104           %reference: Oliver Pust, PIV: Direct Cross-Correlation
  • trunk/src/read_field.m

    r227 r233  
    4141    end
    4242    test_civx=0;
    43     ParamIn
    4443    if ~strcmp(ParamIn.FieldName,'get_field...')% if get_field is not requested, look for Civx data
    4544        FieldList=calc_field;%list of possible fields for Civx data
     
    4746        field_index=strcmp(ParamOut.FieldName,FieldList);%look for ParamOut.FieldName in the list
    4847        if isempty(find(field_index,1))% ParamOut.FieldName is not in the list, check whether Civx data exist
    49             'TESTnc1'
    50             Data=nc2struct(ObjectName,'ListGlobalAttribute','absolut_time_T0','civ')
     48            Data=nc2struct(ObjectName,'ListGlobalAttribute','absolut_time_T0','civ');
    5149            if ~isempty(Data.absolut_time_T0)&& ~isequal(Data.civ,0)
    5250                ParamOut.FieldName='velocity';%Civx data found, set .FieldName='velocity' by default
  • trunk/src/set_object.m

    r231 r233  
    681681testnew=0;
    682682ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
    683 if strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
     683if ~isempty(ListObject) && strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
    684684    IndexObj=IndexObj_1;
    685685    projview='uvmat';
Note: See TracChangeset for help on using the changeset viewer.