From 3072f45081fb04361ba0f41bc631e143b9aa36d2 Mon Sep 17 00:00:00 2001
From: IvarsKarpics <ivars.karpics@gmail.com>
Date: Fri, 19 May 2017 11:26:10 +0200
Subject: [PATCH] [Master] 2017.05.19. Set precision with static method

* Set file precision via static method. This needed if queue is populated not directly via queue manager. For example loaded from file.
---
 BeamlineSetup.py          |  2 ++
 Session.py                |  8 ++++++++
 queue_model_objects_v1.py | 10 +++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/BeamlineSetup.py b/BeamlineSetup.py
index d6d1b3c..5628a7d 100644
--- a/BeamlineSetup.py
+++ b/BeamlineSetup.py
@@ -354,12 +354,14 @@ def get_default_path_template(self):
         path_template.run_number = self[parent_key].getProperty('run_number')
         path_template.suffix = self.session_hwobj["file_info"].getProperty('file_suffix')
 
+        """
         path_template.precision = '04'
         try:
            if self.session_hwobj["file_info"].getProperty('precision'):
                path_template.precision = eval(self.session_hwobj["file_info"].getProperty('precision'))
         except:
            pass
+        """
         
         path_template.start_num = int(self[parent_key].getProperty('start_image_number'))
         path_template.num_files = int(self[parent_key].getProperty('number_of_images'))
diff --git a/Session.py b/Session.py
index 18db412..759a1e1 100644
--- a/Session.py
+++ b/Session.py
@@ -66,6 +66,14 @@ def init(self):
            self['file_info'].getProperty('archive_base_directory'),
            self['file_info'].getProperty('archive_folder'))
 
+        precision = "04"
+        try:
+            precision = eval(self.session_hwobj["file_info"].getProperty('precision'))
+        except:
+            pass
+
+        queue_model_objects.PathTemplate.set_precision(precision)
+
     def get_base_data_directory(self):
         """
         Returns the base data directory taking the 'contextual'
diff --git a/queue_model_objects_v1.py b/queue_model_objects_v1.py
index 7b29366..48848f6 100644
--- a/queue_model_objects_v1.py
+++ b/queue_model_objects_v1.py
@@ -195,6 +195,10 @@ def __init__(self):
         self.lims_group_id = None
         self.interleave_num_images = None
 
+    def set_name_from_task(self, task):
+        if isinstance(task, DataCollection):
+            self._name = "Standart"
+
 class Sample(TaskNode):
     def __init__(self):
         TaskNode.__init__(self)
@@ -1117,6 +1121,10 @@ def set_path_template_style(synchotron_name, template=None):
         PathTemplate.synchotron_name = synchotron_name
         PathTemplate.template = template
 
+    @staticmethod
+    def set_precision(precision):
+        PathTemplate.precision = precision
+
     def __init__(self):
         object.__init__(self)
 
@@ -1129,7 +1137,7 @@ def __init__(self):
         self.wedge_prefix = str()
         self.run_number = int()
         self.suffix = str()
-        self.precision = str()
+        #self.precision = str()
         self.start_num = int()
         self.num_files = int()