Updates for v6.02

Updated the way the Collect and Review windows resize to be more efficient and to make it impossible to go below 1024x768 pixels. Also updated the Review window to enable video playback and seeking without having any annotation files loaded.

Author: Jeffrey M Girard

fig_collect.m

@@ -11,14 +11,13 @@
     % Create and center main window
     defaultBackground = get(0,'defaultUicontrolBackgroundColor');
     handles.figure_collect = figure( ...
-        'Units','normalized', ...
         'Name','DARMA: Collect Ratings', ...
         'MenuBar','none', ...
         'ToolBar','none', ...
         'NumberTitle','off', ...
         'Visible','off', ...
         'Color',defaultBackground, ...
-        'SizeChangedFcn',@figure_collect_SizeChanged, ...
+        'ResizeFcn',@figure_collect_Resize, ...
         'KeyPressFcn',@figure_collect_KeyPress, ...
         'CloseRequestFcn',@figure_collect_CloseReq);
     % Create menu bar elements
@@ -63,8 +62,13 @@
     handles.menu_report = uimenu(handles.menu_help, ...
         'Label','Report Issues', ...
         'Callback',@menu_report_Callback);
-    pause(0.1);
-    set(handles.figure_collect,'Position',[0.1 0.1 0.8 0.8]);
+    % Set minimum size
+    set(handles.figure_collect,'Units','normalized','Position',[0.1,0.1,0.8,0.8],'Visible','on');
+    drawnow;
+    jFig = get(handle(handles.figure_collect),'JavaFrame');
+    jClient = jFig.fHG2Client;
+    jWindow = jClient.getWindow;
+    jWindow.setMinimumSize(java.awt.Dimension(1024,768));
     % Create uicontrol elements
     handles.axis_info = axes(handles.figure_collect, ...
         'Units','normalized', ...
@@ -582,7 +586,7 @@ function menu_defaultdir_Callback(hObject,~)
 
 function menu_about_Callback(~,~)
     global version;
-    msgbox(sprintf('DARMA version %.2f\nJeffrey M Girard (c) 2014-2016\nhttp://darma.jmgirard.com\nGNU General Public License v3',version),'About','Help');
+    msgbox(sprintf('DARMA version %.2f\nJeffrey M Girard (c) 2014-2017\nhttp://darma.jmgirard.com\nGNU General Public License v3',version),'About','Help');
 end
 
 % ===============================================================================
@@ -772,20 +776,12 @@ function create_axis(handles)
 
 % =========================================================
 
-function figure_collect_SizeChanged(hObject,~)
+function figure_collect_Resize(hObject,~)
     handles = guidata(hObject);
     if isfield(handles,'figure_collect')
-        pos = getpixelposition(handles.figure_collect);
         % Force to remain above a minimum size
-        if pos(3) < 1024 || pos(4) < 600
-            setpixelposition(handles.figure_collect,[pos(1) pos(2) 1024 600]);
-            movegui(handles.figure_collect,'center');
-            set(handles.toggle_playpause,'FontSize',12);
-            set(handles.table_info,'ColumnName',[]);
-        else
             set(handles.toggle_playpause,'FontSize',14);
             set(handles.table_info,'ColumnName',{'Bin Size','Axis Magnitude'});
-        end
         % Update the size and position of the VLC controller
         if isfield(handles,'vlc')
             move(handles.vlc,getpixelposition(handles.axis_guide));

fig_launcher.m

@@ -3,7 +3,7 @@
 % License: https://github.com/jmgirard/DARMA/blob/master/LICENSE.txt
 
     global version;
-    version = 6.01;
+    version = 6.02;
     % Create and center main window
     defaultBackground = get(0,'defaultUicontrolBackgroundColor');
     handles.figure_launcher = figure( ...

fig_review.m

@@ -5,15 +5,13 @@
     % Create and maximize annotation window
     defaultBackground = get(0,'defaultUicontrolBackgroundColor');
     handles.figure_review = figure( ...
-        'Units','normalized', ...
-        'Position',[0.1 0.1 0.8 0.8], ...
         'Name','DARMA: Review Ratings', ...
         'NumberTitle','off', ...
         'MenuBar','none', ...
         'ToolBar','none', ...
         'Visible','off', ...
         'Color',defaultBackground, ...
-        'SizeChangedFcn',@figure_review_SizeChanged, ...
+        'ResizeFcn',@figure_review_Resize, ...
         'CloseRequestFcn',@figure_review_CloseRequest);
     %Create menu bar elements
     handles.menu_media = uimenu(handles.figure_review, ...
@@ -60,8 +58,15 @@
     handles.menu_report = uimenu(handles.menu_help, ...
         'Label','Report Issues', ...
         'Callback',@menu_report_Callback);
-    pause(0.1);
+    % Set minimum size
+    set(handles.figure_review,'Units','normalized','Position',[0.1,0.1,0.8,0.8],'Visible','on');
+    drawnow;
+    jFig = get(handle(handles.figure_review),'JavaFrame');
+    jClient = jFig.fHG2Client;
+    jWindow = jClient.getWindow;
+    jWindow.setMinimumSize(java.awt.Dimension(1024,768));
     %Create uicontrol elements
+    global ts_X ts_Y;
     lc = .01; rc = .89;
     handles.axis_X = axes('Units','Normalized', ...
         'Parent',handles.figure_review, ...
@@ -73,6 +78,9 @@
         'PickableParts','none', ...
         'ButtonDownFcn',{@axis_click_Callback,'X'});
     ylabel('X Axis','FontSize',10);
+    hold on;
+    ts_X = plot(handles.axis_X,[0,0],[-100,100],'k');
+    hold off;
     handles.axis_Y = axes('Units','Normalized', ...
         'Parent',handles.figure_review, ...
         'TickLength',[0.005 0], ...
@@ -83,6 +91,9 @@
         'PickableParts','none', ...
         'ButtonDownFcn',{@axis_click_Callback,'Y'});
     ylabel('Y Axis','FontSize',10);
+    hold on;
+    ts_Y = plot(handles.axis_Y,[0,0],[-100,100],'k');
+    hold off;
     handles.listbox = uicontrol('Style','listbox', ...
         'Parent',handles.figure_review, ...
         'Units','normalized', ...
@@ -200,6 +211,8 @@ function menu_openmedia_Callback(hObject,~)
         handles.dur = handles.vlc.input.length / 1000;
         set(handles.toggle_playpause,'String','Play','Enable','on');
         set(handles.menu_closemedia,'Enable','on');
+        set(handles.axis_X,'XLim',[0,handles.dur],'XTick',round(linspace(0,handles.dur,11)),'PickableParts','Visible');
+        set(handles.axis_Y,'XLim',[0,handles.dur],'XTick',round(linspace(0,handles.dur,11)),'PickableParts','Visible');
     catch err
         msgbox(err.message,'Error loading media file.','error'); return;
     end
@@ -269,7 +282,7 @@ function menu_export_Callback(hObject,~)
 
 function menu_about_Callback(~,~)
     global version;
-    msgbox(sprintf('DARMA version %.2f\nJeffrey M Girard (c) 2014-2016\nhttp://darma.jmgirard.com\nGNU General Public License v3',version),'About','Help');
+    msgbox(sprintf('DARMA version %.2f\nJeffrey M Girard (c) 2014-2017\nhttp://darma.jmgirard.com\nGNU General Public License v3',version),'About','Help');
 end
 
 % ===============================================================================
@@ -768,19 +781,11 @@ function update_plots(handles)
 
 % ===============================================================================
 
-function figure_review_SizeChanged(hObject,~)
+function figure_review_Resize(hObject,~)
     handles = guidata(hObject);
-    if isfield(handles,'figure_review')
-        pos = getpixelposition(handles.figure_review);
-        % Force to remain above a minimum size
-        if pos(3) < 1024 || pos(4) < 600
-            setpixelposition(handles.figure_review,[pos(1) pos(2) 1024 600]);
-            movegui(handles.figure_review,'center');
-        end
+    if isfield(handles,'figure_review') && isfield(handles,'vlc')
         % Update the size and position of the VLC controller
-        if isfield(handles,'vlc')
-            move(handles.vlc,getpixelposition(handles.axis_guide));
-        end
+        move(handles.vlc,getpixelposition(handles.axis_guide));
     end
 end