Display ddb source on the title of the start window "Choose Field Trip"

aodn · Mar 27, 2017 · 17aba55 · 17aba55
1 parent ba3a1ae
commit 17aba55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/DDB/executeDDBQuery.m b/DDB/executeDDBQuery.m
@@ -92,10 +92,13 @@
 
   % execute the query - the java method returns 
   % an ArrayList of org.imos.ddb.schema.* objects.
+  source     = '';
+  driver     = '';
   connection = '';
   dbuser     = '';
   dbpassword = '';
   try 
+      source     = readProperty('toolbox.ddb');
       driver     = readProperty('toolbox.ddb.driver');
       connection = readProperty('toolbox.ddb.connection');
       dbuser     = readProperty('toolbox.ddb.user');
@@ -104,7 +107,7 @@
   end
 
   if isempty(connection)
-      ddb = org.imos.ddb.DDB.getDDB(readProperty('toolbox.ddb'));
+      ddb = org.imos.ddb.DDB.getDDB(source);
   else
       ddb = org.imos.ddb.DDB.getDDB(driver, connection, dbuser, dbpassword);
   end

diff --git a/GUI/startDialog.m b/GUI/startDialog.m
@@ -123,7 +123,11 @@
   %
 
   % dialog figure
-  f = figure('Name',        'Select Field Trip', ...
+  source = readProperty('toolbox.ddb');
+  if isempty(source)
+      source = readProperty('toolbox.ddb.connection');
+  end
+  f = figure('Name',        ['Select Field Trip - ' source], ...
              'Visible',     'off',...
              'MenuBar',     'none',...
              'Resize',      'off',...