Allow usdview to open without specifying a file

Closes #3321

(Internal change: 2384347)

Author: MishDivyAmzn

pxr/usdImaging/bin/testusdview/CMakeLists.txt

@@ -83,6 +83,11 @@ pxr_install_test_dir(
     DEST testUsdviewFileArguments7
 )
 
+pxr_install_test_dir(
+    SRC testenv/testUsdviewWrapper
+    DEST testUsdviewWrapper0
+)
+
 pxr_install_test_dir(
     SRC testenv/testUsdviewWrapper
     DEST testUsdviewWrapper1
@@ -489,10 +494,22 @@ pxr_register_test(testUsdviewFileArguments7
         PXR_USDVIEW_SUPPRESS_STATE_SAVING=1
 )
 
-pxr_register_test(testUsdviewWrapper1
+pxr_register_test(testUsdviewWrapper0
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback.py"
-    EXPECTED_RETURN_CODE 2
+    STDOUT_REDIRECT valid_output_no_file
+    DIFF_COMPARE valid_output_no_file
+    EXPECTED_RETURN_CODE 0
+    ENV
+        PXR_USDVIEW_SUPPRESS_STATE_SAVING=1
+)
+
+pxr_register_test(testUsdviewWrapper1
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback.py test.usda"
+    STDOUT_REDIRECT valid_output
+    DIFF_COMPARE valid_output
+    EXPECTED_RETURN_CODE 0
     ENV
         PXR_USDVIEW_SUPPRESS_STATE_SAVING=1
 )

pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/baseline/valid_output_no_file

@@ -0,0 +1 @@
+callback

pxr/usdImaging/usdviewq/__init__.py

@@ -111,8 +111,9 @@ def RegisterPositionals(self, parser):
         register positional arguments on the ArgParser
         '''
         parser.add_argument('usdFile', action='store',
+                            nargs='?',
                             type=str,
-                            help='The file to view')
+                            help='The file to view (Optional)')
 
     def RegisterOptions(self, parser):
         '''
@@ -372,10 +373,15 @@ def GetResolverContext(self, usdFile):
         context is provided.  For usdview, configuring an asset context by
         default is reasonable, and allows clients that embed usdview to 
         achieve different behavior when needed.
+        
+        If usdFile path is not provided, it returns default context.
         """
         from pxr import Ar
 
         r = Ar.GetResolver()
+        
+        if not usdFile:
+            return r.CreateDefaultContext()
 
         # ConfigureResolverForAsset no longer exists under Ar 2.0; this
         # is here for backwards compatibility with Ar 1.0.

pxr/usdImaging/usdviewq/appController.py

@@ -403,7 +403,7 @@ def __init__(self, parserData, resolverContextFn):
             self._ui = Ui_MainWindow()
             self._ui.setupUi(self._mainWindow)
 
-            self._mainWindow.setWindowTitle(parserData.usdFile)
+            self._mainWindow.setWindowTitle(parserData.usdFile or "New Stage")
             self._statusBar = QtWidgets.QStatusBar(self._mainWindow)
             self._mainWindow.setStatusBar(self._statusBar)
 
@@ -1203,17 +1203,22 @@ def _MuteMatchingLayers():
             # layers populated after loading
             _MuteMatchingLayers()
 
-    def _openStage(self, usdFilePath, sessionFilePath,
-                   populationMaskPaths, muteLayersRe):
+    def _openEmptyStage(self):
+        stage = Usd.Stage.CreateInMemory()
+
+        if not stage:
+            sys.stderr.write('Error: Unable to create empty stage\n')
+
+        return stage
+            
+    def _openStageForFile(self, usdFilePath, sessionFilePath,
+                          populationMaskPaths, muteLayersRe):
 
         def _GetFormattedError(reasons=None):
             err = ("Error: Unable to open stage '{0}'\n".format(usdFilePath))
             if reasons:
                 err += "\n".join(reasons) + "\n"
             return err
-        
-        if self._mallocTags != 'none':
-            Tf.MallocTag.Initialize()
 
         # Pull on the asset resolver here so that the "open stage" time does
         # not include its initialization time for consistency with previous
@@ -1276,6 +1281,21 @@ def _GetFormattedError(reasons=None):
         else:
             stage.SetEditTarget(stage.GetSessionLayer())
 
+        return stage
+
+    def _openStage(self, usdFilePath, sessionFilePath,
+                   populationMaskPaths, muteLayersRe):
+
+        if self._mallocTags != 'none':
+            Tf._mallocTags.Initialize()
+
+        if not usdFilePath:
+            stage = self._openEmptyStage()
+        
+        else:
+            stage = self._openStageForFile(usdFilePath, sessionFilePath,
+                                           populationMaskPaths, muteLayersRe)
+
         if self._mallocTags == 'stage':
             DumpMallocTags(stage, "stage-loading")
 
@@ -2795,6 +2815,12 @@ def _cleanAndClose(self):
 
         # Start timer to measure Qt shutdown time
         self._startQtShutdownTimer()
+        
+    
+    def _getRecommendedFilenamePrefix(self):
+        return (self._parserData.usdFile.rsplit('.', 1)[0]
+                if self._parserData.usdFile
+                else 'new_file')
 
     def _openFile(self):
         extensions = Sdf.FileFormat.FindAllFileFormatExtensions()
@@ -2836,14 +2862,17 @@ def _getSaveFileName(self, caption, recommendedFilename):
         return saveName
 
     def _saveOverridesAs(self):
-        recommendedFilename = self._parserData.usdFile.rsplit('.', 1)[0]
-        recommendedFilename += '_overrides.usd'
+        recommendedFilename = self._getRecommendedFilenamePrefix()
+        if self._parserData.usdFile:
+            recommendedFilename += "_overrides.usd"
+        else:
+            recommendedFilename += ".usd"
 
         saveName = self._getSaveFileName(
             'Save Overrides As', recommendedFilename)
         if len(saveName) == 0:
             return
-        elif (os.path.isfile(saveName) and
+        elif (os.path.isfile(saveName) and self._parserData.usdFile and
             os.path.samefile(saveName, self._parserData.usdFile)):
             msg = QtWidgets.QMessageBox()
             msg.setIcon(QtWidgets.QMessageBox.Critical)
@@ -2857,13 +2886,13 @@ def _saveOverridesAs(self):
             return
 
         with BusyContext():
-            # In the future, we may allow usdview to be brought up with no file,
-            # in which case it would create an in-memory root layer, to which
-            # all edits will be targeted.  In order to future proof
-            # this, first fetch the root layer, and if it is anonymous, just
-            # export it to the given filename. If it isn't anonmyous (i.e., it
-            # is a regular usd file on disk), export the session layer and add
-            # the stage root file as a sublayer.
+            # usdview can be brought up with no file, in which case it
+            # creates an in-memory root layer, to which all edits are 
+            # targeted. This first fetches the root layer, and if it is 
+            # anonymous, just exports it to the given filename. If it 
+            # isn't anonymous (i.e., it is a regular usd file on disk), 
+            # exports the session layer and add the stage root file 
+            # as a sublayer.
             rootLayer = self._dataModel.stage.GetRootLayer()
             if not rootLayer.anonymous:
                 self._dataModel.stage.GetSessionLayer().Export(
@@ -2889,7 +2918,7 @@ def _saveOverridesAs(self):
                     saveName, 'Created by UsdView')
 
     def _saveFlattenedAs(self):
-        recommendedFilename = self._parserData.usdFile.rsplit('.', 1)[0]
+        recommendedFilename = self._getRecommendedFilenamePrefix()
         recommendedFilename += '_flattened.usd'
 
         saveName = self._getSaveFileName(
@@ -2905,7 +2934,7 @@ def _copyViewerImage(self):
 
     def _saveViewerImage(self):
         recommendedFilename = "{}_{}{:04d}.png".format(
-            self._parserData.usdFile.rsplit('.', 1)[0],
+            self._getRecommendedFilenamePrefix(),
             "" if not self.getActiveCamera()
                 else self.getActiveCamera().GetName() + "_",
             int(self._dataModel.currentFrame.GetValue()))
@@ -5518,4 +5547,4 @@ def setActiveRenderPassPrim(self, prim):
 
         if self._stageView:
             self._stageView.SetActiveRenderPassPrim(prim)
-            self._stageView.updateView()
+            self._stageView.updateView()

pxr/usdImaging/usdviewq/testenv/testUsdviewqLauncher.py

@@ -7,7 +7,6 @@
 #
 
 import unittest
-import sys
 
 from pxr.Usdviewq import Launcher, InvalidUsdviewOption
 
@@ -25,15 +24,13 @@ def Run(self, args=None):
         """Run the launcher, and optionally provide a list of command line
         arguments. By default, no arguments are used.
         """
-        args = args or []
-        self._args = [sys.argv[0]] + args
+        self._args = args or []
         super(ValidationOnlyLauncher, self).Run()
 
     def ParseOptions(self, parser):
         """Parse the given command line arguments rather than the test's command
         line arguments.
         """
-
         return parser.parse_args(self._args)
 
     def LaunchPreamble(self, arg_parse_result):
@@ -54,6 +51,11 @@ def test_noOptions(self):
 
         ValidationOnlyLauncher().Run()
 
+    def test_usdFileOnly(self):
+        """Test the launcher with no arguments except for a usd file."""
+
+        ValidationOnlyLauncher().Run(["foo.usda"])
+
     def test_cameraFlag(self):
         """Only a valid non-root prim path or a camera name should be
         acceptable.