Allow workspaces to be created in add_channel()

ginga/rv/Control.py

@@ -1128,16 +1128,20 @@ def add_workspace(self, wsname, wstype, inSpace=None, use_toolbar=True):
 
     # CHANNEL MANAGEMENT
 
-    def add_image(self, imname, image, chname=None, silent=False):
+    def add_image(self, imname, image, chname=None, wsname=None, silent=False):
         if chname is None:
             channel = self.get_current_channel()
             if channel is None:
                 raise ValueError("Need to provide a channel name to add "
                                  "the image")
             chname = channel.name
 
+        if self.has_channel(chname):
+            channel = self.get_channel(chname)
+        else:
+            channel = self.add_channel(chname, workspace=wsname)
+
         # add image to named channel
-        channel = self.get_channel_on_demand(chname)
         channel.add_image(image, silent=silent)
 
     def advertise_image(self, chname, image):
@@ -1428,6 +1432,10 @@ def add_channel(self, chname, workspace=None,
             channel = Channel(chname, self, datasrc=None,
                               settings=settings)
 
+            if workspace is not None:
+                if not self.ds.has_ws(workspace):
+                    self.add_workspace(workspace, 'tabs')
+
             bnch = self.add_viewer(chname, settings,
                                    workspace=workspace)
             # for debugging