Common: Remove old plot widget models

See merge request Karabo/Framework!7321

Author: dgoeries

src/pythonKarabo/karabo/common/scenemodel/api.py

@@ -28,15 +28,13 @@
 # deprecated widgets
 # Graph widgets
 from .widgets.graph_image import (
-    DetectorGraphModel, DisplayAlignedImageModel, DisplayImageElementModel,
-    DisplayImageModel, ImageGraphModel, ScientificImageModel,
-    VectorRollGraphModel, WebCamGraphModel, WebcamImageModel)
+    DetectorGraphModel, ImageGraphModel, VectorRollGraphModel,
+    WebCamGraphModel)
 from .widgets.graph_plots import (
-    AlarmGraphModel, BasePlotModel, DisplayPlotModel, LinePlotModel,
-    MultiCurveGraphModel, MultiCurvePlotModel, NDArrayGraphModel,
+    AlarmGraphModel, BasePlotModel, MultiCurveGraphModel, NDArrayGraphModel,
     ScatterGraphModel, StateGraphModel, TrendGraphModel, VectorBarGraphModel,
     VectorFillGraphModel, VectorGraphModel, VectorHistGraphModel,
-    VectorScatterGraphModel, VectorXYGraphModel, XYPlotModel, XYVectorModel)
+    VectorScatterGraphModel, VectorXYGraphModel)
 from .widgets.graph_utils import (
     BaseROIData, CrossROIData, RectROIData, build_graph_config,
     build_model_config, read_axes_set, read_base_karabo_image_model,

src/pythonKarabo/karabo/common/scenemodel/tests/test_data_model_structure.py

@@ -7,7 +7,7 @@
 
 # Hey Code Reviewers! Be sure to ask questions when this value changes!
 EXPECTED_HASH = (
-    "fc91c60121575d177f905240c5298bd3ef966581df317f12c9035cbfbf3c3b42"
+    "8c6220275c4bf7ab2b6b0f01c6d0879e9328aaf6bd64c88e4659e08b1b4f2eb1"
 )
 FAILURE_MSG = """
 ##############################################################################

src/pythonKarabo/karabo/common/scenemodel/tests/test_widgets_image.py

@@ -1,8 +1,6 @@
 from io import StringIO
 
-from ..api import (
-    LinePlotModel, SparklineModel, TrendGraphModel, VectorXYGraphModel,
-    read_scene)
+from ..api import SparklineModel, read_scene
 from .utils import (
     assert_base_traits, base_widget_traits, single_model_round_trip)
 
@@ -23,24 +21,6 @@
 """
 
 
-def test_line_plot_widget():
-    _check_line_plot_widget(
-        klass_name="DisplayTrendline", new_klass=TrendGraphModel
-    )
-    _check_line_plot_widget(
-        klass_name="XYVector", new_klass=VectorXYGraphModel
-    )
-
-
-def _check_line_plot_widget(klass_name, new_klass):
-    traits = base_widget_traits()
-    traits["klass"] = klass_name
-    model = LinePlotModel(**traits)
-    read_model = single_model_round_trip(model)
-    assert_base_traits(read_model)
-    assert isinstance(read_model, new_klass)
-
-
 def test_sparkline_basics():
     traits = base_widget_traits()
     traits["time_base"] = 42

src/pythonKarabo/karabo/common/scenemodel/tests/test_widgets_plot.py

@@ -1,4 +1,3 @@
-import warnings
 from xml.etree.ElementTree import SubElement
 
 from traits.api import Bool, Float, Instance, Int, String
@@ -44,28 +43,10 @@ class ImageGraphModel(KaraboImageModel):
     undock = Bool(False, transient=True)
 
 
-class DisplayImageModel(ImageGraphModel):
-    """A legacy model"""
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self).__name__} is deprecated, use ImageGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
 class DetectorGraphModel(KaraboImageModel):
     """A model of the DetectorGraph"""
 
 
-class DisplayAlignedImageModel(DetectorGraphModel):
-    """A legacy model"""
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self).__name__} is deprecated, use DetectorGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
 class VectorRollGraphModel(BaseWidgetObjectData):
     """A model of the VectorRoll Graph"""
 
@@ -88,29 +69,6 @@ class WebCamGraphModel(BaseWidgetObjectData):
     undock = Bool(False, transient=True)
 
 
-class DeprecatedBaseWebCamModel(WebCamGraphModel):
-    show_axes = Bool  # legacy traits
-    show_color_bar = Bool
-    show_tool_bar = Bool
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self).__name__} is deprecated, use WebCamGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
-class DisplayImageElementModel(DeprecatedBaseWebCamModel):
-    """A legacy model"""
-
-
-class WebcamImageModel(DeprecatedBaseWebCamModel):
-    """A legacy model"""
-
-
-class ScientificImageModel(DeprecatedBaseWebCamModel):
-    """A legacy model"""
-
-
 @register_scene_reader("DisplayImage")  # deprecated Qwt model
 @register_scene_reader("ImageGraph")
 def _image_graph_reader(element):
@@ -119,7 +77,6 @@ def _image_graph_reader(element):
     return ImageGraphModel(**traits)
 
 
-@register_scene_writer(DisplayImageModel)
 @register_scene_writer(ImageGraphModel)
 def _image_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)
@@ -137,7 +94,6 @@ def _detector_graph_reader(element):
     return DetectorGraphModel(**traits)
 
 
-@register_scene_writer(DisplayAlignedImageModel)  # deprecated Qwt model
 @register_scene_writer(DetectorGraphModel)
 def _detector_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)
@@ -186,9 +142,6 @@ def _webcam_graph_reader(element):
     return WebCamGraphModel(**traits)
 
 
-@register_scene_writer(DisplayImageElementModel)  # deprecated Qwt model
-@register_scene_writer(WebcamImageModel)  # deprecated Qwt model
-@register_scene_writer(ScientificImageModel)  # deprecated Qwt model
 @register_scene_writer(WebCamGraphModel)
 def _webcam_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)

src/pythonKarabo/karabo/common/scenemodel/widgets/graph_image.py

@@ -1,7 +1,6 @@
-import warnings
 from xml.etree.ElementTree import SubElement
 
-from traits.api import Bool, Enum, Float, Instance, Int, List, String
+from traits.api import Bool, Float, Instance, Int, List, String
 
 from karabo.common.scenemodel.bases import BaseWidgetObjectData
 from karabo.common.scenemodel.const import NS_KARABO, WIDGET_ELEMENT_TAG
@@ -70,31 +69,12 @@ class ScatterGraphModel(BasePlotModel):
     psize = Float(7.0)
 
 
-class XYPlotModel(ScatterGraphModel):
-    """a legacy model"""
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self).__name__} is deprecated, use ScatterGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
 class MultiCurveGraphModel(BasePlotModel):
     """A model for the MultiCurve Graph"""
 
 
-class MultiCurvePlotModel(MultiCurveGraphModel):
-    """a legacy model"""
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self).__name__} is deprecated, use MultiCurveGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
 class VectorScatterGraphModel(BasePlotModel):
     """A model for the VectorScatter Graph"""
-
     psize = Float(7.0)
 
 
@@ -105,15 +85,6 @@ class VectorXYGraphModel(BasePlotModel):
     y_grid = Bool(True)
 
 
-class XYVectorModel(VectorXYGraphModel):
-    """a legacy model"""
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self)} is deprecate, use VectorXYGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
 class VectorBarGraphModel(BasePlotModel):
     """A model for the Vector Bar Graph"""
 
@@ -157,43 +128,13 @@ class VectorGraphModel(BasePlotModel):
     y_grid = Bool(True)
 
 
-class DisplayPlotModel(VectorGraphModel):
-    """a legacy model"""
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self).__name__} is deprecated, use VectorGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
 class TrendGraphModel(BasePlotModel):
     """Trendline graph model"""
 
     x_grid = Bool(True)
     y_grid = Bool(True)
 
 
-class DisplayTrendlineModel(TrendGraphModel):
-    """a legacy model"""
-
-    def __init__(self, **traits):
-        super().__init__(**traits)
-        msg = f"{type(self).__name__} is deprecated, use TrendGraphModel"
-        warnings.warn(msg, DeprecationWarning)
-
-
-class LinePlotModel(DisplayTrendlineModel):
-    """A legacy model for line plot objects"""
-
-    # Note: LinePlotModel is a class model but was never serialized
-    # under its own name. It was the ghost writer of DisplayTrendline.
-    # The original model had a trait `boxes`. and other functions.
-    # this are removed. It should not have been used in device code.
-    # if they were used, the code should fail.
-
-    klass = Enum("DisplayTrendline", "XYVector")
-
-
 class StateGraphModel(BasePlotModel):
     """State graph model"""
 
@@ -218,7 +159,6 @@ def _scatter_graph_reader(element):
     return ScatterGraphModel(**traits)
 
 
-@register_scene_writer(XYPlotModel)
 @register_scene_writer(ScatterGraphModel)
 def _scatter_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)
@@ -254,7 +194,6 @@ def _vector_xy_graph_reader(element):
     return VectorXYGraphModel(**traits)
 
 
-@register_scene_writer(XYVectorModel)
 @register_scene_writer(VectorXYGraphModel)
 def _vector_xy_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)
@@ -346,7 +285,6 @@ def _vector_graph_reader(element):
     return VectorGraphModel(**traits)
 
 
-@register_scene_writer(DisplayPlotModel)
 @register_scene_writer(VectorGraphModel)
 def _vector_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)
@@ -367,7 +305,6 @@ def _trend_graph_reader(element):
     return TrendGraphModel(**traits)
 
 
-@register_scene_writer(DisplayTrendlineModel)  # deprecated Qwt model
 @register_scene_writer(TrendGraphModel)
 def _trend_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)
@@ -376,19 +313,6 @@ def _trend_graph_writer(model, parent):
     return element
 
 
-@register_scene_writer(LinePlotModel)  # deprecated Qwt model
-def _line_plot_writer(model, parent):
-    # Delegate the co writer to the respective new models
-    WRITER_MAP = {
-        "DisplayTrendline": _trend_graph_writer,
-        "XYVector": _vector_xy_graph_writer,
-    }
-
-    # The model will always have a `klass` due to its Enum traits
-    writer = WRITER_MAP.get(model.klass)
-    return writer(model, parent)
-
-
 @register_scene_reader("DisplayStateGraph")
 def _state_graph_reader(element):
     traits = read_base_plot(element)
@@ -427,7 +351,6 @@ def _multi_graph_reader(element):
     return MultiCurveGraphModel(**traits)
 
 
-@register_scene_writer(MultiCurvePlotModel)
 @register_scene_writer(MultiCurveGraphModel)
 def _multi_graph_writer(model, parent):
     element = SubElement(parent, WIDGET_ELEMENT_TAG)