Merge branch 'pre-release' into doc-update-tutorials

Author: ruck314

docs/src/installing/build.rst

@@ -94,7 +94,7 @@ Local Install
    $ cmake .. -DROGUE_INSTALL=local
    $ make -j$(nproc)
    $ make install
-   $ source ../setup_rogue.sh (or .csh)
+   $ source ../setup_rogue.sh (or .csh, or .fish)
 
 Custom Install
 --------------
@@ -111,7 +111,7 @@ Make sure you have permission to install into the passed install directory, if n
    $ cmake .. -DROGUE_INSTALL=custom -DROGUE_DIR=/path/to/custom/dir
    $ make -j$(nproc)
    $ make install
-   $ source /path/to/custom/dir/setup_rogue.sh (or .csh)
+   $ source /path/to/custom/dir/setup_rogue.sh (or .csh, or .fish)
 
 
 System Install

docs/src/utilities/fileio/classes/index.rst

@@ -13,6 +13,3 @@ The following are detailed descriptions of the various C++ classes that make up
    writer.rst
    channel.rst
    reader.rst
-   legacy_writer.rst
-   legacy_reader.rst
-

docs/src/utilities/fileio/classes/legacy_reader.rst

@@ -17,7 +17,8 @@
 import signal
 import pydm
 import pyrogue
-import pyrogue.pydm.data_plugins.rogue_plugin
+import pydm.data_plugins
+from pyrogue.pydm.data_plugins.rogue_plugin import RoguePlugin
 
 # Define a signal handler to ensure the application quits gracefully
 def pydmSignalHandler(sig, frame):
@@ -47,6 +48,12 @@ def runPyDM(serverList='localhost:9090', ui=None, title=None, sizeX=800, sizeY=1
     args.append(f"maxListExpand={maxListExpand}")
     args.append(f"maxListSize={maxListSize}")
 
+    pydm.data_plugins.initialize_plugins_if_needed()
+
+    # Add Rogue plugin manually, if it hasn't already been added based on $PYDM_DATA_PLUGINS_PATH
+    if 'rogue' not in pydm.data_plugins.plugin_modules:
+        pydm.data_plugins.add_plugin(RoguePlugin)
+
     # Initialize the PyDM application with specified parameters
     app = pydm.PyDMApplication(ui_file=ui,
                                command_line_args=args,

docs/src/utilities/fileio/classes/legacy_writer.rst

@@ -89,14 +89,3 @@ def getChannel(self,chan):
 
     def setDropErrors(self,drop):
         self._writer.setDropErrors(drop)
-
-
-class LegacyStreamWriter(StreamWriter):
-    def __init__(self, **kwargs):
-        super().__init__(writer=rogue.utilities.fileio.LegacyStreamWriter(), **kwargs)
-
-    def getDataChannel(self):
-        return self._writer.getDataChannel()
-
-    def getYamlChannel(self):
-        return self._writer.getYamlChannel()

include/rogue/utilities/fileio/LegacyStreamReader.h

@@ -13,8 +13,6 @@
 target_sources(rogue-core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/StreamReader.cpp")
 target_sources(rogue-core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/StreamWriter.cpp")
 target_sources(rogue-core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/StreamWriterChannel.cpp")
-target_sources(rogue-core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/LegacyStreamWriter.cpp")
-target_sources(rogue-core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/LegacyStreamReader.cpp")
 
 if (NOT NO_PYTHON)
    target_sources(rogue-core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/module.cpp")