Changeset 636cf8d in sasview for src/sas/sascalc/fit

Timestamp:

Aug 9, 2018 5:20:21 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:

fde3042

Parents:

cd59dc5 (diff), 59873e1 (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 Butler <butlerpd@…> (08/09/18 17:20:21)

git-committer:

GitHub <noreply@…> (08/09/18 17:20:21)

Message:

Merge pull request #162 from SasView?/beta_load_project

Beta Load Project Issue Fix

File:

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

src/sas/sascalc/fit/pagestate.py

@@ -13 +13 @@
 ################################################################################
 import time
+import re
 import os
 import sys
@@ -962 +963 @@
         if node.get('version'):
             # Get the version for model conversion purposes
-            self.version = tuple(int(e) for e in
-                                 str.split(node.get('version'), "."))
+            x = re.sub('[^\d.]', '', node.get('version'))
+            self.version = tuple(int(e) for e in str.split(x, "."))
             # The tuple must be at least 3 items long
             while len(self.version) < 3: