Dev/dr

.github/workflows/unittests.yml

@@ -1,13 +1,13 @@
 # This workflow will install Python dependencies, run tests and lint with a single version of Python
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Pychron Install via EDM with pytest suite
+name: Pychron Install via EDM with unittest suite
 
 on:
   push:
     branches: [ dev/dc, dev/dr, hot/dr, hot/dc]
   pull_request:
-    branches: [ dev/dc, dev/dr , hot/dr, hot/dc]
+    branches: [ dev/dc, dev/dr, hot/dr, hot/dc]
 
 jobs:
   build:

.github/workflows/hardwaredocs.yml → .github/workflows/wikidocs.yml

@@ -1,12 +1,12 @@
-name: Hardware Docs
+name: Wiki Docs
 on:
   pull_request:
     branches: [dev/dc, hot/dc]
   push:
     branches: [dev/dc, hot/dc]
 jobs:
-  build_hardware_docs:
-    name: Build hardware docs (${{ matrix.python-version }}, ${{ matrix.os }})
+  build_wiki_docs:
+    name: Build wiki docs (${{ matrix.python-version }}, ${{ matrix.os }})
     strategy:
       matrix:
         os: [ macos-latest ]
@@ -32,20 +32,27 @@ jobs:
           scipy sqlalchemy traits xlrd xlsxwriter xlwt pytest statsmodels
       - name: Install PIP dependencies
         run: >
-          ~/.edm/envs/edm/bin/python -m pip install --no-dependencies uncertainties qimage2ndarray peakutils
-      - name: build docs
+          ~/.edm/envs/edm/bin/python -m pip install --no-dependencies uncertainties qimage2ndarray peakutils lazydocs
+      - name: build hardware docs
         run: |
-          ~/.edm/envs/edm/bin/python pychron/hardwaredocs.py 
+          ~/.edm/envs/edm/bin/python pychron/docs_hardware.py
       - name: copy to temp
         run: cp pychron/hardwaredocs.md /Users/runner/work/hardwaredocs.md
+      - name: build pyscript docs
+        run: |
+          ~/.edm/envs/edm/bin/python pychron/docs_pyscript.py
+      - name: copy to temp
+        run: cp pychron/pyscriptdocs.md /Users/runner/work/pyscriptdocs.md
       - name: fetch wiki
         uses: actions/checkout@v2
         with:
           repository: NMGRL/pychron.wiki
           set-safe-directory: /Users/runner/work/pychron.wiki
-      - name: copy to wiki
+      - name: copy hardware to wiki
         run:  cp /Users/runner/work/hardwaredocs.md ./Available-Hardware.md
+      - name: copy pyscript to wiki
+        run: cp /Users/runner/work/pyscriptdocs.md ./Pyscript-API.md
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4.1.2
         with:
-          commit_message: built hardware docs
+          commit_message: built wiki docs

README.md

@@ -102,5 +102,5 @@ To turn off App Nap system wide use
 
 
 # Citing Pychron 
-Are you using pychron for data collection and/or data reduction for published data? Please cite it by including as much
+Are you using pychron for data collection and/or data reduction for publishing data? Please cite it by including as much
 information as possible from the following: *Jake Ross. (2019). NMGRL/pychron v18.2 (v18.2). Zenodo. https://doi.org/10.5281/zenodo.3237834*

launchers/helpers.py

@@ -306,6 +306,79 @@ def sizeHint(self, option, index):
     checkbox_renderer.CheckboxRenderer = CheckboxRenderer
 
 
+def monkey_patch_table_view():
+    from traitsui.qt4.table_editor import TableView
+
+    def sizeHint(self):
+        size_hint = QtGui.QTableView.sizeHint(self)
+
+        # This method is sometimes called by Qt after the editor has been
+        # disposed but before this control has been deleted:
+        if self._editor.factory is None:
+            return size_hint
+
+        try:
+            width = self.style().pixelMetric(
+                QtGui.QStyle.PixelMetric.PM_ScrollBarExtent, QtGui.QStyleOptionHeader(), self
+            )
+        except AttributeError:
+            width = 100
+
+        for column in range(len(self._editor.columns)):
+            width += self.sizeHintForColumn(column)
+
+        size_hint.setWidth(int(width))
+        return size_hint
+
+    def resizeColumnsToContents(self):
+        """Support proportional column width specifications."""
+
+        # TODO: The proportional size specification approach found in the
+        # TableColumns is not entirely compatible with the ability to
+        # specify the resize_mode.  Namely, there are combinations of
+        # specifications that are redundant, and others which are
+        # contradictory.  Rework this method so that the various values
+        # for **width** have a well-defined, sensible meaning for each
+        # of the possible values of resize_mode.
+
+        editor = self._editor
+        available_space = self.viewport().width()
+        hheader = self.horizontalHeader()
+
+        # Compute sizes for columns with absolute or no size requests
+        proportional = []
+        for column_index in range(len(editor.columns)):
+            column = editor.columns[column_index]
+            requested_width = column.get_width()
+            if (
+                    column.resize_mode in ("interactive", "stretch")
+                    and 0 < requested_width <= 1.0
+            ):
+                proportional.append((column_index, requested_width))
+            elif (
+                    column.resize_mode == "interactive"
+                    and requested_width < 0
+                    and self._initial_size
+            ):
+                # Keep previous size if initial sizing has been done
+                available_space -= hheader.sectionSize(column_index)
+            else:
+                base_width = hheader.sectionSizeHint(column_index)
+                width = int(max(base_width, self.sizeHintForColumn(column_index)))
+                hheader.resizeSection(column_index, width)
+                available_space -= width
+
+        # Now use the remaining space for columns with proportional width
+        # requests
+        for column_index, percent in proportional:
+            base_width = hheader.sectionSizeHint(column_index)
+            width = int(max(base_width, int(percent * available_space)))
+            hheader.resizeSection(column_index, width)
+
+    TableView.resizeColumnsToContents = resizeColumnsToContents
+    TableView.sizeHint = sizeHint
+
+
 KLASS_MAP = {'pyexperiment': 'PyExperiment',
              'pyview': 'PyView',
              'pyvalve': 'PyValve',
@@ -324,6 +397,7 @@ def entry_point(appname, debug=False):
     monkey_patch_preferences()
     monkey_patch_checkbox_render()
     monkey_patch_panel()
+    monkey_patch_table_view()
 
     # set_stylesheet('darkorange.css')
     env = initialize_version(appname, debug)
@@ -497,6 +571,12 @@ def initialize_version(appname, debug):
                       ' Error: {}'.format(e))
 
         return False
+    except FileExistsError as e:
+        emsg = str(e)
+        path = emsg.split('File exists:')[-1]
+        warning(None, """Failed to setup logging.  Error: {}\n\n
+Delete directory {} to proceed""".format(e, path))
+        return False
 
     return env
 

pychron/applications/about_dialog.py

@@ -21,7 +21,7 @@
 from pyface.qt.QtGui import QPlainTextEdit
 
 # ============= enthought library imports =======================
-from pyface.ui.qt4.about_dialog import AboutDialog
+from pyface.about_dialog import AboutDialog
 from traits.api import List, Str
 
 # ============= local library imports  ==========================

pychron/bakeout/__init__.py

@@ -0,0 +1,17 @@
+# ===============================================================================
+# Copyright 2024 ross
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ===============================================================================
+
+# ============= EOF =============================================

pychron/bakeout/bakeout_manager.py

@@ -0,0 +1,124 @@
+# ===============================================================================
+# Copyright 2024 ross
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ===============================================================================
+from traits.api import Any
+from traitsui.api import UItem, TableEditor, InstanceEditor, HGroup
+from traitsui.table_column import ObjectColumn
+from traitsui.extras.checkbox_column import CheckboxColumn
+
+from pychron.graph.time_series_graph import TimeSeriesStreamStackedGraph
+from pychron.hardware.bakeout_plc import BakeoutPLC
+from pychron.loggable import Loggable
+from pychron.managers.stream_graph_manager import StreamGraphManager
+
+
+class BakeoutManager(StreamGraphManager):
+    controller = Any
+    settings_name = "bakeout_streaming"
+
+    def _create_manager(
+        self, klass, manager, params, port=None, host=None, remote=False
+    ):
+        return self.application.get_service(BakeoutManager)
+
+    def _controller_default(self):
+        return BakeoutPLC(name="controller", configuration_dir_name="bakeout")
+
+    def prepare_destroy(self):
+        self.set_streaming_active(False)
+        self.stop_scan()
+        self.controller.prepare_destroy()
+
+    def activate(self):
+        self.debug("asdfascasdcasdc")
+        self.set_streaming_active(True)
+        # self.bind_preferences()
+
+        # self.load_event_marker_config()
+        self.setup_scan()
+        # self.readout_view.start()
+        self.reset_scan_timer()
+
+    def setup_scan(self):
+        self._reset_graph()
+        self.graph_scan_width = 10
+        self._graph_scan_width_changed()
+
+    def _update_scan_graph(self):
+        for ci in self.get_display_channels():
+            t = self.controller.read_temperature(ci.index)
+            if t is None:
+                continue
+
+            sp = self.controller.read_setpoint(ci.index)
+            dc = self.controller.read_duty_cycle(ci.index)
+            self.controller.read_overtemp_ishighhigh(ci.index)
+
+            self.graph.record(t, series=ci.index)
+            self.graph.record(sp, series=ci.index + 1)
+            self.graph.record(dc, plotid=1, series=ci.index)
+
+    def _graph_factory(self, *args, **kw):
+        g = TimeSeriesStreamStackedGraph()
+        # g.plotcontainer.padding_top = 5
+        # g.plotcontainer.padding_right = 5
+        g.new_plot(
+            xtitle="Time (s)",
+            ytitle="Temp. (C)",
+            padding_top=5,
+            padding_left=75,
+            padding_right=5,
+            show_legend="ul",
+        )
+        g.set_scan_width(600, plotid=0)
+        g.set_data_limits(1.8 * 600, plotid=0)
+
+        # Output/Duty Cycle
+        g.new_plot(
+            ytitle="Output/Duty Cycle (%)",
+            padding_top=5,
+            padding_left=75,
+            padding_right=5,
+        )
+
+        g.set_scan_width(600, plotid=1)
+        g.set_data_limits(1.8 * 600, plotid=1)
+        g.set_y_limits(min_=-2, max_=102, plotid=1)
+        for channel in self.controller.channels:
+            series, _ = g.new_series(
+                plotid=0, color=channel.color, name=channel.shortname
+            )
+            g.new_series(
+                plotid=0,
+                # render_style="connectedhold",
+                line_style="dash",
+                color=series.color,
+                name=f"{channel.shortname}, Setpoint",
+            )
+
+            g.new_series(plotid=1, name=channel.shortname, color=series.color)
+
+        return g
+
+    def get_display_channels(self):
+        return [ci for ci in self.controller.channels if ci.display]
+
+
+if __name__ == "__main__":
+    b = BakeoutManager()
+    b.activate()
+    b.setup_scan()
+
+# ============= EOF =============================================

pychron/bakeout/tasks/__init__.py

@@ -0,0 +1,17 @@
+# ===============================================================================
+# Copyright 2024 ross
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ===============================================================================
+
+# ============= EOF =============================================