users guide v2.4

Merge branch 'dev'
mingsongli · Nov 16, 2021 · 4126cac · 4126cac
2 parents 227a708 + 5e6382c
commit 4126cac
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 248 deletions.
diff --git a/code/guicode/AC.fig b/code/guicode/AC.fig
diff --git a/code/guicode/AC.m b/code/guicode/AC.m
@@ -1422,9 +1422,9 @@ function menu_manuals_Callback(hObject, eventdata, handles)
 
 %filename = which('AC_Users_Guide.pdf');
 %openpdf(filename);
-url2 = 'https://github.com/mingsongli/acycle/blob/master/doc/AC_Users_Guide.pdf';
+url2 = 'https://github.com/mingsongli/acycle/blob/master/doc/Acycle_Users_Guide.pdf';
 web(url2,'-browser')
-url = 'https://github.com/mingsongli/acycle/wiki';
+url = 'https://acycle.org/manual/';
 web(url,'-browser')
 
 
@@ -1433,16 +1433,18 @@ function menu_findupdates_Callback(hObject, eventdata, handles)
 % hObject    handle to menu_findupdates (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    structure with handles and user data (see GUIDATA)
-url = 'https://mingsongli.com/acycle';
-web(url,'-browser')
+
 url = 'https://github.com/mingsongli/acycle';
 web(url,'-browser')
+url = 'https://acycle.org/downloads/';
+web(url,'-browser')
 
 % --------------------------------------------------------------------
 function menu_contact_Callback(hObject, eventdata, handles)
 % hObject    handle to menu_contact (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    structure with handles and user data (see GUIDATA)
+
 guidata(hObject, handles);
 copyright(handles)
 
@@ -3987,8 +3989,8 @@ function menu_email_Callback(hObject, eventdata, handles)
 % hObject    handle to menu_email (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    structure with handles and user data (see GUIDATA)
-email
-
+url = 'mingsongli.com';
+web(url,'-browser')
 
 % --------------------------------------------------------------------
 function menu_samplerate_Callback(hObject, eventdata, handles)

diff --git a/code/guicode/email.fig b/code/guicode/email.fig
diff --git a/code/guicode/email.m b/code/guicode/email.m
diff --git a/code/guicode/linegenerator.fig b/code/guicode/linegenerator.fig
diff --git a/code/guicode/waveletGUI.fig b/code/guicode/waveletGUI.fig
diff --git a/code/guicode/waveletGUI.m b/code/guicode/waveletGUI.m
@@ -22,7 +22,7 @@
 
 % Edit the above text to modify the response to help waveletGUI
 
-% Last Modified by GUIDE v2.5 14-Nov-2021 23:27:17
+% Last Modified by GUIDE v2.5 17-Nov-2021 00:05:51
 
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -231,6 +231,7 @@ function waveletGUI_OpeningFcn(hObject, eventdata, handles, varargin)
 Yticks(length(Yticks))=[];
 set(handles.edit3,'string',num2str(  2^floor(log2(2*dt)) ))
 set(handles.edit4,'string',num2str( 2^fix(log2(timelen)) ))
+%set(handles.edit4,'string',num2str( 3/8 * abs(data(1,1)-data(end,1)) ))
 set(handles.popupmenu1,'value',1,'enable','off')
 set(handles.popupmenu2,'value',1)
 set(handles.checkbox2,'value',1)
@@ -1087,3 +1088,10 @@ function pushbutton3_Callback(hObject, eventdata, handles)
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    structure with handles and user data (see GUIDATA)
 msgbox({'User defined tick labels, space delimited values, e.g.,';'10 20 41 100 405 1200 2400'},'Help: format')
+
+
+% --- Executes when figure1 is resized.
+function figure1_SizeChangedFcn(hObject, eventdata, handles)
+% hObject    handle to figure1 (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
diff --git a/code/misc/check_acycle_toolboxes.m b/code/misc/check_acycle_toolboxes.m
@@ -21,7 +21,8 @@
 % remove duplicated elements
 
 B = {A{2}};
-for k =3:266
+As = size(A);
+for k =3:As(1)
     C = A{k};
     if ~any(strcmp(B,C))
         B{end+1,1} = C;

diff --git a/code/package/wavelet/wave_readGUI.m b/code/package/wavelet/wave_readGUI.m
@@ -110,7 +110,7 @@
 
         name1 = [dat_name,'-wavelet.fig'];
         name4 = [dat_name,'-wavelet-power.txt'];
-        name5 = [dat_name,'-wavelet-siglev95.txt'];
+        name5 = [dat_name,'-wavelet-siglev.txt'];
         CDac_pwd
         try savefig(handles.figwave,name1)
             disp(['>>  Save as: ',name1, '. Folder: '])

diff --git a/doc/Acycle_Users_Guide.docx b/doc/Acycle_Users_Guide.docx
diff --git a/doc/Acycle_Users_Guide.pdf b/doc/Acycle_Users_Guide.pdf