Changeset 3d72901 in sasview for src/sas

Timestamp:

Sep 30, 2018 5:54:43 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

73c51df

Parents:

1b4cb41 (diff), 863ac2c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (09/30/18 17:54:43)

git-committer:

GitHub <noreply@…> (09/30/18 17:54:43)

Message:

Merge pull request #186 from SasView?/ticket-1179

Ticket 1179: Add the SasView? version to Report Files

Location:

src/sas

Files:

• sascalc/fit/pagestate.py (modified) (1 diff)
• sasgui/perspectives/invariant/invariant_state.py (modified) (1 diff)

src/sas/sascalc/fit/pagestate.py

@@ -640 +640 @@
                 if len(value.strip()) == 0:
                     continue
-                title = value + " [" + repo_time + "]"
+                title = (value + " [" + repo_time + "] [SasView v" +
+                         SASVIEW_VERSION + "]")
                 title_name = HEADER % title
             elif name == "data":

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -130 +130 @@
         my_time, date = self.timestamp
         file_name = self.file
+        from sas.sasview.__init__ import __version__ as sasview_version
 
         state_num = int(self.saved_state['state_num'])
         state = "\n[Invariant computation for %s: " % file_name
-        state += "performed at %s on %s] \n" % (my_time, date)
+        state += "performed at %s on %s] " % (my_time, date)
+        state += "[SasView v%s]\n" % (sasview_version)
         state += "State No.: %d \n" % state_num
         state += "\n=== Inputs ===\n"