Merge remote-tracking branch 'origin/master' into total_scattering_su…

…bmodule
neutrons · Apr 3, 2019 · 7f7110c · 7f7110c
2 parents 5be6d0a + 1fd2042
commit 7f7110c
Show file tree

Hide file tree

Showing 14 changed files with 661 additions and 983 deletions.
diff --git a/addie/events_handler/__init__.py → addie/initialization/events/__init__.py b/addie/events_handler/__init__.py → addie/initialization/events/__init__.py
diff --git a/addie/events_handler/processing_tab.py → ...e/initialization/events/processing_tab.py b/addie/events_handler/processing_tab.py → ...e/initialization/events/processing_tab.py
diff --git a/addie/initialization/events/rietveld_tab.py b/addie/initialization/events/rietveld_tab.py
@@ -0,0 +1,13 @@
+def run(main_window=None):
+    main_window.rietveld_ui.pushButton_loadBraggFile.clicked.connect(main_window.do_load_bragg_file)
+    main_window.rietveld_ui.checkBox_bank1.toggled.connect(main_window.evt_plot_bragg_bank)
+    main_window.rietveld_ui.checkBox_bank2.toggled.connect(main_window.evt_plot_bragg_bank)
+    main_window.rietveld_ui.checkBox_bank3.toggled.connect(main_window.evt_plot_bragg_bank)
+    main_window.rietveld_ui.checkBox_bank4.toggled.connect(main_window.evt_plot_bragg_bank)
+    main_window.rietveld_ui.checkBox_bank5.toggled.connect(main_window.evt_plot_bragg_bank)
+    main_window.rietveld_ui.checkBox_bank6.toggled.connect(main_window.evt_plot_bragg_bank)
+    main_window.rietveld_ui.comboBox_xUnit.currentIndexChanged.connect(main_window.evt_switch_bragg_unit)
+    main_window.rietveld_ui.radioButton_multiBank.toggled.connect(main_window.evt_change_gss_mode)
+    main_window.rietveld_ui.pushButton_rescaleGSAS.clicked.connect(main_window.do_rescale_bragg)
+    main_window.rietveld_ui.pushButton_gsasColorStyle.clicked.connect(main_window.do_set_bragg_color_marker)
+    main_window.rietveld_ui.pushButton_clearBraggCanvas.clicked.connect(main_window.do_clear_bragg_canvas)
diff --git a/addie/initialization/widgets/__init__.py b/addie/initialization/widgets/__init__.py
diff --git a/addie/initialization/configuration.py → ...e/initialization/widgets/configuration.py b/addie/initialization/configuration.py → ...e/initialization/widgets/configuration.py
diff --git a/addie/initialization/init_step1.py → addie/initialization/widgets/init_step1.py b/addie/initialization/init_step1.py → addie/initialization/widgets/init_step1.py
diff --git a/addie/initialization/init_step2.py → addie/initialization/widgets/init_step2.py b/addie/initialization/init_step2.py → addie/initialization/widgets/init_step2.py
diff --git a/addie/initialization/processing_tab.py → .../initialization/widgets/processing_tab.py b/addie/initialization/processing_tab.py → .../initialization/widgets/processing_tab.py
diff --git a/addie/initialization/widgets/rietveld_tab.py b/addie/initialization/widgets/rietveld_tab.py
@@ -0,0 +1,56 @@
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QVBoxLayout
+
+from addie.rietveld.braggview import BraggView
+from addie.rietveld.braggtree import BraggTree
+
+
+def run(main_window=None):
+    # frame_graphicsView_bragg
+    graphicsView_layout = QVBoxLayout()
+    main_window.rietveld_ui.frame_graphicsView_bragg.setLayout(graphicsView_layout)
+    main_window.rietveld_ui.graphicsView_bragg = BraggView(main_window)
+    graphicsView_layout.addWidget(main_window.rietveld_ui.graphicsView_bragg)
+
+    # frame_treeWidget_braggWSList
+    temp_layout = QVBoxLayout()
+    main_window.rietveld_ui.frame_treeWidget_braggWSList.setLayout(temp_layout)
+    main_window.rietveld_ui.treeWidget_braggWSList = BraggTree(main_window)
+    temp_layout.addWidget(main_window.rietveld_ui.treeWidget_braggWSList)
+
+    main_window.rietveld_ui.splitter_2.setStyleSheet("""
+        QSplitter::handle {
+           image: url(':/MPL Toolbar/vertical_splitter_icon.png');
+        }
+        """)
+    main_window.rietveld_ui.splitter_2.setSizes([1000, 1])
+
+    main_window.rietveld_ui.comboBox_xUnit.clear()
+    main_window.rietveld_ui.comboBox_xUnit.addItems(['TOF', 'dSpacing', 'Q'])
+    index = main_window.rietveld_ui.comboBox_xUnit.findText('dSpacing', Qt.MatchFixedString)
+    main_window.rietveld_ui.comboBox_xUnit.setCurrentIndex(index)
+
+    main_window.rietveld_ui.treeWidget_braggWSList.set_main_window(main_window)
+    main_window.rietveld_ui.treeWidget_braggWSList.add_main_item('workspaces',
+                                                                 append=True,
+                                                                 as_current_index=False)
+
+    main_window.rietveld_ui.radioButton_multiBank.setChecked(True)
+
+    # organize widgets group
+    main_window._braggBankWidgets = {1: main_window.rietveld_ui.checkBox_bank1,
+                                     2: main_window.rietveld_ui.checkBox_bank2,
+                                     3: main_window.rietveld_ui.checkBox_bank3,
+                                     4: main_window.rietveld_ui.checkBox_bank4,
+                                     5: main_window.rietveld_ui.checkBox_bank5,
+                                     6: main_window.rietveld_ui.checkBox_bank6}
+    main_window._braggBankWidgetRecords = dict()
+    for bank_id in main_window._braggBankWidgets:
+        checked = main_window._braggBankWidgets[bank_id].isChecked()
+        main_window._braggBankWidgetRecords[bank_id] = checked
+
+    # some controlling variables
+    main_window._currBraggXUnit = str(main_window.rietveld_ui.comboBox_xUnit.currentText())
+    if main_window._currBraggXUnit == 'Q':
+        main_window._currBraggXUnit = 'MomentumTransfer'
+    main_window._onCanvasGSSBankList = list()