connecting new ssx_intregrate widget

Author: luisodls

src/client/dui_client.ui

@@ -915,7 +915,7 @@
                   </item>
                  </layout>
                 </widget>
-                <widget class="QWidget" name="SsxIntergratePage">
+                <widget class="QWidget" name="SsxIntegratePage">
                  <layout class="QGridLayout" name="gridLayout_42">
                   <item row="0" column="0">
                    <widget class="QTabWidget" name="tabWidget_10">

src/client/exec_utils.py

@@ -232,6 +232,7 @@ def get_help_messages(handler_in):
         "reindex",
         "refine",
         "integrate",
+        "ssx_integrate",
         "symmetry",
         "scale",
         "cosym",

src/client/gui_utils.py

@@ -86,7 +86,7 @@ def check_if_predict_n_report(str_key):
         "icon"          : "resources/ssx_index.png",
         "main_cmd"      :["dials.ssx_index"],
         "nxt_widg_lst"  :[
-            "integrate",
+            "ssx_integrate",
             "optional"
         ]
     },
@@ -124,6 +124,14 @@ def check_if_predict_n_report(str_key):
             "symmetry", "scale", "export", "combine_experiments", "optional"
         ]
     },
+    "ssx_integrate" : {
+        "tooltip"       : "dials.ssx_integrate ...",
+        "icon"          : "resources/ssx_integrate.png",
+        "main_cmd"      :["dials.ssx_integrate"],
+        "nxt_widg_lst"  :[
+            "symmetry", "scale", "export", "optional"
+        ]
+    },
     "symmetry" : {
         "tooltip"       : "dials.symmetry ...",
         "icon"          : "resources/symmetry.png",

src/client/q_object.py

@@ -52,7 +52,7 @@
 from client.simpler_param_widgets import OptionalWidget
 from client.simpler_param_widgets import (
     FindspotsSimplerParameterTab, IndexSimplerParamTab,
-    SsxIndexSimplerParamTab,
+    SsxIndexSimplerParamTab, SsxIntegrateSimplerParamTab,
     RefineBravaiSimplerParamTab, RefineSimplerParamTab,
     IntegrateSimplerParamTab, SymmetrySimplerParamTab,
     ScaleSimplerParamTab, CombineExperimentSimplerParamTab
@@ -259,6 +259,29 @@ def __init__(self, parent = None, multi_runner = None):
         it_advanced_parameters.set_scroll_parent(
             self.window.IntegrateAdvancedScrollArea
         )
+
+        #######################################################################################################
+
+        ssx_integr_simpl_widg = SsxIntegrateSimplerParamTab()
+        ssx_integr_simpl_widg.item_changed.connect(self.item_param_changed)
+        self.window.SsxIntegrateSimplerScrollArea.setWidget(ssx_integr_simpl_widg)
+        ssx_it_advanced_parameters = build_advanced_params_widget(
+            "ssx_integrate_params", self.window.SsxIntegrateSearchLayout,
+            self.runner_handler
+        )
+        ssx_it_advanced_parameters.item_changed.connect(
+            self.item_param_changed
+        )
+        self.window.SsxIntegrateAdvancedScrollArea.setWidget(
+            ssx_it_advanced_parameters
+        )
+        ssx_it_advanced_parameters.set_scroll_parent(
+            self.window.SsxIntegrateAdvancedScrollArea
+        )
+
+        #######################################################################################################
+
+
         sym_simpl_widg = SymmetrySimplerParamTab()
         sym_simpl_widg.item_changed.connect(self.item_param_changed)
         self.window.SymmetrySimplerScrollArea.setWidget(sym_simpl_widg)
@@ -321,6 +344,10 @@ def __init__(self, parent = None, multi_runner = None):
         ref_simpl_widg.twin_widg = rf_advanced_parameters
         it_advanced_parameters.twin_widg = integr_simpl_widg
         integr_simpl_widg.twin_widg = it_advanced_parameters
+
+        ssx_it_advanced_parameters.twin_widg = ssx_integr_simpl_widg
+        ssx_integr_simpl_widg.twin_widg = ssx_it_advanced_parameters
+
         sm_advanced_parameters.twin_widg = sym_simpl_widg
         sym_simpl_widg.twin_widg = sm_advanced_parameters
         sc_advanced_parameters.twin_widg = scale_simpl_widg
@@ -385,6 +412,14 @@ def __init__(self, parent = None, multi_runner = None):
             "integrate"
         ]["main_page"] = self.window.IntegratePage
 
+        ########################################################################################################
+        self.param_widgets["ssx_integrate"]["simple"] = ssx_integr_simpl_widg
+        self.param_widgets["ssx_integrate"]["advanced"] = ssx_it_advanced_parameters
+        self.param_widgets[
+            "ssx_integrate"
+        ]["main_page"] = self.window.SsxIntegratePage
+        ########################################################################################################
+
         self.param_widgets["symmetry"]["simple"] = sym_simpl_widg
         self.param_widgets["symmetry"]["advanced"] = sm_advanced_parameters
         self.param_widgets["symmetry"]["main_page"] = self.window.SimmetryPage

src/client/resources/ssx_integrate.png

@@ -1098,8 +1098,6 @@ def special_check_up(self, param_in, value_in):
             self.detec_fix.setChecked(False)
 
 
-################################################################################### New SsxIndexSimplerParamTab
-
 class SsxIndexSimplerParamTab(SimpleParamTab):
     """
     This widget is the tool for tunning the simpler and most common parameters
@@ -1165,9 +1163,6 @@ def reset_pars(self):
         self.build_pars()
 
 
-################################################################################### New SsxIndexSimplerParamTab
-
-
 class RefineBravaiSimplerParamTab(SimpleParamTab):
     def __init__(self, parent=None):
         super(RefineBravaiSimplerParamTab, self).__init__()
@@ -1335,7 +1330,7 @@ def special_check_up(self, param_in, value_in):
             self.detec_fix.setChecked(False)
 
 
-class IntegrateSimplerParamTab(SimpleParamTab):
+class  IntegrateSimplerParamTab(SimpleParamTab):
     """
     This widget is the tool for tunning the simpler and most common parameters
     in the integrate algorithm, this widget is the first to appear once the
@@ -1405,6 +1400,82 @@ def reset_pars(self):
         self.clearLayout(self.main_v_layout)
         self.build_pars()
 
+########################################################################################################
+
+class  SsxIntegrateSimplerParamTab(SimpleParamTab):
+    """
+    This widget is the tool for tunning the simpler and most common parameters
+    in the integrate algorithm, this widget is the first to appear once the
+    button "Integrate" is clicked
+    """
+    def __init__(self, parent=None):
+        super(SsxIntegrateSimplerParamTab, self).__init__()
+        self.do_emit = True
+        self.main_v_layout = QVBoxLayout()
+        self.build_pars()
+        self.setLayout(self.main_v_layout)
+
+    def build_pars(self):
+
+        hbox_d_min = QHBoxLayout()
+        label_d_min = QLabel("High resolution limit")
+        hbox_d_min.addWidget(label_d_min)
+        d_min_line = QLineEdit()
+        d_min_line.setPlaceholderText("None")
+        d_min_line.local_path = "prediction.d_min"
+        d_min_line.textChanged.connect(self.line_changed)
+        hbox_d_min.addWidget(d_min_line)
+        self.main_v_layout.addLayout(hbox_d_min)
+
+        ##############################################################################
+        hbox_d_max = QHBoxLayout()
+        d_max_label = QLabel("Low resolution limit")
+        hbox_d_max.addWidget(d_max_label)
+        d_max_line = QLineEdit()
+        d_max_line.setPlaceholderText("None")
+        d_max_line.local_path = "prediction.d_max"
+        d_max_line.textChanged.connect(self.line_changed)
+        hbox_d_max.addWidget(d_max_line)
+        self.main_v_layout.addLayout(hbox_d_max)
+        ##############################################################################
+
+        hbox_lay_algorithm_53 = QHBoxLayout()
+        label_algorithm_53 = QLabel("Background algorithm")
+        hbox_lay_algorithm_53.addWidget(label_algorithm_53)
+        box_algorithm_53 = DefaultComboBox("integration.background.algorithm",
+            ["Auto", "glm", "gmodel", "null", "simple"], default_index=0)
+        box_algorithm_53.currentIndexChanged.connect(self.combobox_changed)
+        hbox_lay_algorithm_53.addWidget(box_algorithm_53)
+        self.main_v_layout.addLayout(hbox_lay_algorithm_53)
+
+
+
+
+        consider_2_remove = '''
+        PrFit_lay_out = QHBoxLayout()
+        label_PrFit = QLabel("Use profile fitting")
+        PrFit_lay_out.addWidget(label_PrFit)
+        PrFit_comb_bx = DefaultComboBox("integration.profile.fitting",
+            ["True", "False", "Auto"])
+        PrFit_comb_bx.currentIndexChanged.connect(self.combobox_changed)
+        PrFit_lay_out.addWidget(PrFit_comb_bx)
+        self.main_v_layout.addLayout(PrFit_lay_out)
+        '''
+
+        self.main_v_layout.addStretch()
+        #self.box_nproc.item_list = None
+        self.lst_var_widg = _get_all_direct_layout_widget_children(
+            self.main_v_layout
+        )
+
+    def reset_pars(self):
+        self.clearLayout(self.main_v_layout)
+        self.build_pars()
+
+########################################################################################################
+
+
+
 class SymmetrySimplerParamTab(SimpleParamTab):
     """
     This widget is the tool for tunning the simpler and most common parameters

src/client/simpler_param_widgets.py

@@ -36,6 +36,8 @@
 from dials.command_line.refine import working_phil as phil_scope_refine
 from dials.command_line.integrate import phil_scope as phil_scope_integrate
 
+from dials.command_line.ssx_integrate import phil_scope as ssx_phil_scope_integrate
+
 from dials.command_line.scale import phil_scope as phil_scope_scale
 from dials.command_line.symmetry import phil_scope as phil_scope_symmetry
 from dials.command_line.combine_experiments import (
@@ -508,10 +510,11 @@ def get_param_list(cmd_str):
     connect_dict = {
             "find_spots_params"              :phil_scope_find_spots.objects    ,
             "index_params"                   :phil_scope_index.objects         ,
-          "ssx_index_params"                   :ssx_phil_scope_index.objects         ,
+          "ssx_index_params"                     :ssx_phil_scope_index.objects           ,
             "refine_bravais_settings_params" :phil_scope_r_b_settings.objects  ,
             "refine_params"                  :phil_scope_refine.objects        ,
             "integrate_params"               :phil_scope_integrate.objects     ,
+          "ssx_integrate_params"                 :ssx_phil_scope_integrate.objects       ,
             "symmetry_params"                :phil_scope_symmetry.objects      ,
             "scale_params"                   :phil_scope_scale.objects         ,
             "combine_experiments_params"     :phil_scope_combine_params.objects,