Merge pull request #237 from the-virtual-brain/TVB-2782

TVB-2782. Small fixes after testing
the-virtual-brain · Sep 10, 2020 · 20e74d7 · 20e74d7
2 parents a3b3aa0 + b748da7
commit 20e74d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/framework_tvb/tvb/adapters/analyzers/fcd_adapter.py b/framework_tvb/tvb/adapters/analyzers/fcd_adapter.py
@@ -281,6 +281,7 @@ def launch(self, view_model):
                             f.array_data.store(cm_data)
                             f.connectivity.store(connectivity_gid)
                             f.title.store(cm_index.title)
+                            f.gid.store(uuid.UUID(cm_index.gid))
                             cm_array_metadata = f.array_data.get_cached_metadata()
 
                         cm_index.array_data_min = cm_array_metadata.min

diff --git a/framework_tvb/tvb/adapters/datatypes/db/mode_decompositions.py b/framework_tvb/tvb/adapters/datatypes/db/mode_decompositions.py
@@ -47,7 +47,7 @@ class PrincipalComponentsIndex(DataType):
     def fill_from_has_traits(self, datatype):
         # type: (PrincipalComponents)  -> None
         super(PrincipalComponentsIndex, self).fill_from_has_traits(datatype)
-        self.fk_source_gid = datatype.source.gid
+        self.fk_source_gid = datatype.source.gid.hex
 
     def get_extra_info(self):
         labels_dict = {}

diff --git a/framework_tvb/tvb/adapters/datatypes/db/spectral.py b/framework_tvb/tvb/adapters/datatypes/db/spectral.py
@@ -51,8 +51,8 @@ def fill_from_has_traits(self, datatype):
         super(FourierSpectrumIndex, self).fill_from_has_traits(datatype)
         self.segment_length = datatype.segment_length
         self.windowing_function = datatype.windowing_function
-        self.frequency_step = datatype.frequency_step
-        self.max_frequency = datatype.max_frequency
+        self.frequency_step = datatype.freq_step
+        self.max_frequency = datatype.max_freq
         self.fk_source_gid = datatype.source.gid.hex
 
     def get_extra_info(self):