# HG changeset patch # User Daniele Nicolodi # Date 1323098406 -3600 # Node ID a26669b59d7efc63bd73376294cb47a38470a27a # Parent 317b5f447f3ed1e3a433fc2f795aba66c69aacb2 Update LTPDAworkbench diff -r 317b5f447f3e -r a26669b59d7e m-toolbox/classes/@LTPDAworkbench/LTPDAworkbench.m --- a/m-toolbox/classes/@LTPDAworkbench/LTPDAworkbench.m Mon Dec 05 16:20:06 2011 +0100 +++ b/m-toolbox/classes/@LTPDAworkbench/LTPDAworkbench.m Mon Dec 05 16:20:06 2011 +0100 @@ -80,13 +80,7 @@ pause(0.1); save(libfile, 'lib') end - - % Set the repository manager to the workbench - rm = LTPDARepositoryManager(); - awtinvoke(wb.mp, 'setRepositoryManager', rm.manager); -% javaMethodEDT('setRepositoryManager', wb.mp, rm.manager); - pause(0.1); - + % refresh library tree awtinvoke(wb.mp, 'refreshLibraryTree'); % javaMethodEDT('refreshLibraryTree', wb.mp); @@ -184,8 +178,8 @@ set(h, 'ActionPerformedCallback', {@wb.cb_launchLTPDApreferences}); %---- 'LTPDA Repository GUI' menu item - h = handle(wb.mp.getLtpdaRepoGuiMenuItem, 'callbackproperties'); - set(h, 'ActionPerformedCallback', {@wb.cb_launchRepogui}); + %h = handle(wb.mp.getLtpdaRepoGuiMenuItem, 'callbackproperties'); + %set(h, 'ActionPerformedCallback', {@wb.cb_launchRepogui}); %---- 'Spectral Window Viewer' menu item h = handle(wb.mp.getLtpdaSpecwinViewerMenuItem, 'callbackproperties'); @@ -244,8 +238,8 @@ set(h, 'ActionPerformedCallback', {@wb.cb_submitObjects}); %----Open repository manager - h = handle(wb.mp.getRepoConnectTBB, 'callbackproperties'); - set(h, 'ActionPerformedCallback', {@wb.cb_openRepoManagerGUI}); + h = handle(wb.mp.getRepoSearchTBB, 'callbackproperties'); + set(h, 'ActionPerformedCallback', {@wb.cb_queryRepository}); %%%%%%%%%% other %%%%%%%%%% @@ -382,7 +376,7 @@ % Repository Buttons varargout = cb_submitObjects(varargin) - varargout = cb_openRepoManagerGUI(varargin) + varargout = cb_queryRepository(varargin) % other varargout = cb_guiClosed(varargin) diff -r 317b5f447f3e -r a26669b59d7e m-toolbox/classes/@LTPDAworkbench/cb_launchRepogui.m --- a/m-toolbox/classes/@LTPDAworkbench/cb_launchRepogui.m Mon Dec 05 16:20:06 2011 +0100 +++ b/m-toolbox/classes/@LTPDAworkbench/cb_launchRepogui.m Mon Dec 05 16:20:06 2011 +0100 @@ -6,7 +6,6 @@ % function cb_launchRepogui(varargin) - rm = LTPDARepositoryManager(); - rm.showGui(); + LTPDADatabaseConnectionManager().connect(); end diff -r 317b5f447f3e -r a26669b59d7e m-toolbox/classes/@LTPDAworkbench/cb_openRepoManagerGUI.m --- a/m-toolbox/classes/@LTPDAworkbench/cb_openRepoManagerGUI.m Mon Dec 05 16:20:06 2011 +0100 +++ b/m-toolbox/classes/@LTPDAworkbench/cb_openRepoManagerGUI.m Mon Dec 05 16:20:06 2011 +0100 @@ -8,9 +8,7 @@ % function cb_openRepoManagerGUI(varargin) - rm = LTPDARepositoryManager(); - rm.showGui(); - rm.gui.toFront(); + LTPDADatabaseConnectionManager().connect(); end diff -r 317b5f447f3e -r a26669b59d7e m-toolbox/classes/@LTPDAworkbench/cb_queryRepository.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/m-toolbox/classes/@LTPDAworkbench/cb_queryRepository.m Mon Dec 05 16:20:06 2011 +0100 @@ -0,0 +1,9 @@ +function varargout = cb_queryRepository(varargin) + + wb = varargin{1}; + conn = LTPDADatabaseConnectionManager().connect(); + + rqd = javaObjectEDT('mpipeline.repository.RepositoryQueryDialog', wb.mp, false, conn, true); + rqd.setVisible(true); + +end diff -r 317b5f447f3e -r a26669b59d7e m-toolbox/classes/@LTPDAworkbench/cb_submitObjects.m --- a/m-toolbox/classes/@LTPDAworkbench/cb_submitObjects.m Mon Dec 05 16:20:06 2011 +0100 +++ b/m-toolbox/classes/@LTPDAworkbench/cb_submitObjects.m Mon Dec 05 16:20:06 2011 +0100 @@ -10,6 +10,8 @@ wb = varargin{1}; + wb + % Get all selected blocks sbs = awtinvoke(wb.mp, 'getSelectedBlocks'); @@ -49,6 +51,9 @@ end cmd = [cmd 'sinfo, plist(''hostname'', ''''));']; + + disp(sinfo) + disp(cmd) assignin('base', 'sinfo', sinfo); try