Changeset 9706d88 in sasview for src/sas/sascalc

Timestamp:

Sep 22, 2017 12:21:37 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d3b0c77, 574adc7

Parents:

ab0b93f

Message:

merge fixups

File:

• src/sas/sascalc/fit/models.py (modified) (2 diffs)

src/sas/sascalc/fit/models.py

@@ -95 +95 @@
     path = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR)
 
-    # TODO: initializing ~/.sasview/plugin_models doesn't belong in sascalc
+    # TODO: trigger initialization of plugins dir from installer or startup
     # If the plugin directory doesn't exist, create it
     if not os.path.isdir(path):
         os.makedirs(path)
     # TODO: should we be checking for new default models every time?
-    initialize_plugins_dir(path)
+    # TODO: restore support for default plugins
+    #initialize_plugins_dir(path)
     return path
 
@@ -106 +107 @@
 def initialize_plugins_dir(path):
     # TODO: There are no default plugins
+    # TODO: Default plugins directory is in sasgui, but models.py is in sascalc
     # TODO: Move default plugins beside sample data files
     # TODO: Should not look for defaults above the root of the sasview install