Merge pull request #155 from RNA-FRETools/autosort-snr

 Use trajectory SNR as a criterium to sort molecules with Trace manager (Part 2)

Author: mca-sh

MASH-FRET/source/mod-trace-processing/management/trace-manager/_callbacks/edit_xlow_Callback.m

@@ -8,9 +8,10 @@ function edit_xlow_Callback(obj,evd,h_fig)
 dat1 = get(h.tm.axes_ovrAll_1,'userdata');
 dat3 = get(h.tm.axes_histSort,'userdata');
 indx = get(h.tm.popupmenu_selectXdata,'value');
-jx = get(h.tm.popupmenu_selectXval,'value')-1;
+datid = getASdataindex;
+jx = datid(get(h.tm.popupmenu_selectXval,'value'));
 indy = get(h.tm.popupmenu_selectYdata,'value')-1;
-jy = get(h.tm.popupmenu_selectYval,'value')-1;
+jy = datid(get(h.tm.popupmenu_selectYval,'value'));
 isTDP = (indx==indy & jx==9 & jy==9);
 
 if jx==0 || isTDP

MASH-FRET/source/mod-trace-processing/management/trace-manager/_callbacks/edit_xniv_Callback.m

@@ -7,10 +7,11 @@ function edit_xniv_Callback(obj,evd,h_fig)
 
 dat1 = get(h.tm.axes_ovrAll_1,'userdata');
 dat3 = get(h.tm.axes_histSort,'userdata');
+datid = getASdataindex;
 indx = get(h.tm.popupmenu_selectXdata,'value');
-jx = get(h.tm.popupmenu_selectXval,'value')-1;
+jx = datid(get(h.tm.popupmenu_selectXval,'value'));
 indy = get(h.tm.popupmenu_selectYdata,'value')-1;
-jy = get(h.tm.popupmenu_selectYval,'value')-1;
+jy = datid(get(h.tm.popupmenu_selectYval,'value'));
 isTDP = (indx==indy & jx==9 & jy==9);
 
 niv = str2num(get(obj,'string'));

MASH-FRET/source/mod-trace-processing/management/trace-manager/_callbacks/edit_xup_Callback.m

@@ -7,10 +7,11 @@ function edit_xup_Callback(obj,evd,h_fig)
 
 dat1 = get(h.tm.axes_ovrAll_1,'userdata');
 dat3 = get(h.tm.axes_histSort,'userdata');
+datid = getASdataindex;
 indx = get(h.tm.popupmenu_selectXdata,'value');
-jx = get(h.tm.popupmenu_selectXval,'value')-1;
+jx = datid(get(h.tm.popupmenu_selectXval,'value'));
 indy = get(h.tm.popupmenu_selectYdata,'value')-1;
-jy = get(h.tm.popupmenu_selectYval,'value')-1;
+jy = datid(get(h.tm.popupmenu_selectYval,'value'));
 isTDP = (indx==indy & jx==9 & jy==9);
 
 if jx==0 || isTDP

MASH-FRET/source/mod-trace-processing/management/trace-manager/_callbacks/edit_ylow_Callback.m

@@ -10,10 +10,11 @@
 
 dat1 = get(h.tm.axes_ovrAll_1,'userdata');
 dat3 = get(h.tm.axes_histSort,'userdata');
+datid = getASdataindex;
 indx = get(h.tm.popupmenu_selectXdata,'value');
-jx = get(h.tm.popupmenu_selectXval,'value')-1;
+jx = datid(get(h.tm.popupmenu_selectXval,'value'));
 indy = get(h.tm.popupmenu_selectYdata,'value')-1;
-jy = get(h.tm.popupmenu_selectYval,'value')-1;
+jy = datid(get(h.tm.popupmenu_selectYval,'value'));
 isTDP = (indx==indy & jx==9 & jy==9);
 
 % no y-data: abort

MASH-FRET/source/mod-trace-processing/management/trace-manager/_callbacks/edit_yniv_Callback.m

@@ -8,9 +8,11 @@ function edit_yniv_Callback(obj,evd,h_fig)
 dat1 = get(h.tm.axes_ovrAll_1,'userdata');
 dat3 = get(h.tm.axes_histSort,'userdata');
 indx = get(h.tm.popupmenu_selectXdata,'value');
-jx = get(h.tm.popupmenu_selectXval,'value')-1;
+datid = getASdataindex;
+indx = get(h.tm.popupmenu_selectXdata,'value');
+jx = datid(get(h.tm.popupmenu_selectXval,'value'));
 indy = get(h.tm.popupmenu_selectYdata,'value')-1;
-jy = get(h.tm.popupmenu_selectYval,'value')-1;
+jy = datid(get(h.tm.popupmenu_selectYval,'value'));
 isTDP = (indx==indy & jx==9 & jy==9);
 
 % no y-data: abort

MASH-FRET/source/mod-trace-processing/management/trace-manager/_callbacks/edit_yup_Callback.m

@@ -10,10 +10,11 @@
 
 dat1 = get(h.tm.axes_ovrAll_1,'userdata');
 dat3 = get(h.tm.axes_histSort,'userdata');
+datid = getASdataindex;
 indx = get(h.tm.popupmenu_selectXdata,'value');
-jx = get(h.tm.popupmenu_selectXval,'value')-1;
+jx = datid(get(h.tm.popupmenu_selectXval,'value'));
 indy = get(h.tm.popupmenu_selectYdata,'value')-1;
-jy = get(h.tm.popupmenu_selectYval,'value')-1;
+jy = datid(get(h.tm.popupmenu_selectYval,'value'));
 isTDP = (indx==indy & jx==9 & jy==9);
 
 if indy==0 || isTDP