readerbotda 1.4.0__tar.gz → 1.4.2__tar.gz

{readerbotda-1.4.0 → readerbotda-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: readerbotda
-Version: 1.4.0
+Version: 1.4.2
 Summary: Pacchetto per lettura e visualizzazione file di log sensore BOTDA Cohaerentia
 Author: Marco Brunero
 Author-email: marco.brunero@cohaerentia.com

readerbotda-1.4.2/ReaderBOTDA/plotter/abc.py

@@ -0,0 +1,44 @@
+from abc import ABC, abstractmethod
+import numpy.typing as npt
+
+
+class Plotter(ABC):
+
+    @abstractmethod
+    def single_plot(self, position, profile, title: str = None):
+        pass
+
+    @abstractmethod
+    def multiple_plot(self, position, profiles, timestamps, title: str = ""):
+        pass
+
+    @abstractmethod
+    def statistics(self, position, mean, std, title: str = ""):
+        pass
+
+    @abstractmethod
+    def raw2d_plot(self, position, frequency, BGS, title: str = None):
+        pass
+
+    @abstractmethod
+    def rawBGS_plot(
+        self,
+        frequency,
+        BGS,
+        positions_m: npt.ArrayLike,
+        index: int = None,
+        title: str = None,
+    ):
+        pass
+
+    @abstractmethod
+    def raw3d_plot(self, position, frequency, BGS, title: str = None):
+        pass
+
+    @abstractmethod
+    def max_plot(self, position, max, title: str = None):
+        pass
+
+    @abstractmethod
+    def max_stat_plot(self, max_mean, max_std, title: str = ""):
+        pass

readerbotda-1.4.2/ReaderBOTDA/plotter/bokeh.py

@@ -0,0 +1,115 @@
+from .abc import Plotter
+
+from bokeh.plotting import figure
+from bokeh.models.layouts import Column
+from bokeh.plotting.figure import Figure as bokehFigure
+from bokeh.plotting import show as bokehShow
+from bokeh.models import Legend
+from bokeh.layouts import gridplot
+from bokeh.palettes import Bokeh8
+from bokeh.io import curdoc
+
+import numpy as np
+import numpy.typing as npt
+
+
+class Bokeh(Plotter):
+    def __init__(self, theme: str = "caliber"):
+        curdoc().theme = theme
+        # TODO: capire come prendere la palette del tema scelto, invece che usare sempre Bokeh8.
+        self.palette = Bokeh8
+
+    def single_plot(self, position, profile, title: str = None) -> bokehFigure:
+        fig = figure(
+            title=title,
+            x_axis_label="Position (m)",
+            y_axis_label="BFS (MHz)",
+            sizing_mode="stretch_width",
+        )
+        fig.line(position, profile)
+        return fig
+
+    def multiple_plot(
+        self, position, profiles, timestamps, title: str = ""
+    ) -> bokehFigure:
+        fig = figure(
+            title=title,
+            x_axis_label="Position (m)",
+            y_axis_label="BFS (MHz)",
+            sizing_mode="stretch_width",
+        )
+        fig.add_layout(Legend(), "right")
+        for i, (time, color) in enumerate(zip(timestamps, self.palette)):
+            fig.line(
+                x=position,
+                y=profiles[:, i],
+                color=color,
+                legend_label=time.strftime("%m/%d/%Y, %H:%M:%S"),
+            )
+        return fig
+
+    def statistics(
+        self, position, mean: np.ndarray, std: np.ndarray, title: str = ""
+    ) -> Column:
+        f1 = figure(title=title, y_axis_label="Mean BFS (MHz)")
+        f1.line(x=position, y=mean)
+        f1.varea(x=position, y1=mean + std, y2=mean - std, fill_alpha=0.3)
+        f2 = figure(
+            x_axis_label="Position (m)", y_axis_label="Std Dev (MHz)", y_range=(0, 10)
+        )
+        f2.line(x=position, y=std)
+        return gridplot([f1, f2], ncols=1, height=150, sizing_mode="stretch_width")
+
+    def max_plot(self, position, max, title: str = None) -> bokehFigure:
+        fig = figure(
+            title=title,
+            x_axis_label="Position (m)",
+            y_axis_label="Max BGS Amplitude",
+            sizing_mode="stretch_width",
+        )
+        fig.line(x=position, y=max)
+        return fig
+
+    def max_stat_plot(
+        self, max_mean: np.ndarray, max_std: np.ndarray, title: str = ""
+    ) -> bokehFigure:
+        fig = figure(
+            title=title, y_axis_label="Max BGS (Volts)", sizing_mode="stretch_width"
+        )
+        fig.line(y=max_mean)
+        fig.varea(y1=max_mean + max_std, y2=max_mean - max_std, fill_alpha=0.3)
+        return fig
+
+    def rawBGS_plot(
+        self,
+        frequency,
+        BGS,
+        positions_m: npt.ArrayLike = None,
+        index: int = None,
+        title: str = None,
+    ) -> bokehFigure:
+        fig = figure(
+            title=title,
+            x_axis_label="Frequency (GHz)",
+            y_axis_label="Amplitude (V)",
+            sizing_mode="stretch_width",
+        )
+        if not index:
+            for single in np.transpose(BGS):
+                fig.line(x=frequency, y=single)
+        else:
+            for single in np.transpose(BGS):
+                fig.line(x=frequency, y=single, color="rgba(175,175,175,0.15)")
+            fig.line(x=frequency, y=BGS[:, index])
+        return fig
+
+    def raw3d_plot(self, position, frequency, BGS, title: str = None):
+        raise NameError("Function raw3d_plot not yet defined for Bokeh plotter.")
+
+    def raw2d_plot(self, position, frequency, BGS, title: str = None):
+        raise NameError("Function raw2d_plot not yet defined for Bokeh plotter.")
+
+    @staticmethod
+    def show(fig) -> None:
+        bokehShow(fig)
+        pass

{readerbotda-1.4.0 → readerbotda-1.4.2}/ReaderBOTDA/plotter/plotly.py

@@ -8,6 +8,7 @@ from plotly.subplots import make_subplots
 
 from datetime import datetime
 import numpy as np
+import numpy.typing as npt
 
 
 class Plotly(Plotter):
@@ -201,12 +202,17 @@ class Plotly(Plotter):
         return self._applyTheme(fig)
 
     def rawBGS_plot(
-        self, frequency, BGS, index: int = None, title: str = None
+        self,
+        frequency,
+        BGS,
+        positions_m: npt.ArrayLike,
+        index: int = None,
+        title: str = None,
     ) -> go.Figure:
         fig = go.Figure(
             layout=dict(
                 title=title,
-                hovermode=False,
+                # hovermode=False,
                 xaxis=dict(title=dict(text="Frequency (GHz)")),
                 yaxis=dict(title=dict(text="Amplitude (V)")),
             )
@@ -225,6 +231,11 @@ class Plotly(Plotter):
                         line=dict(color="rgba(175,175,175,0.15)"),
                         mode="lines",
                         showlegend=False,
+                        hovertext=[
+                            f"Position: {positions_m[i]:.2f} m"
+                            for _ in range(len(frequency))
+                        ],
+                        hoverinfo="text",
                     )
                 )
             fig.add_trace(
@@ -234,6 +245,11 @@ class Plotly(Plotter):
                     line=dict(color=self.firstColor),
                     mode="lines",
                     showlegend=False,
+                    hovertext=[
+                        f"Position: {positions_m[index]:.2f} m"
+                        for _ in range(len(frequency))
+                    ],
+                    hoverinfo="text",
                 )
             )
         return self._applyTheme(fig)

{readerbotda-1.4.0 → readerbotda-1.4.2}/ReaderBOTDA/reader.py

@@ -224,6 +224,15 @@ class multipleProfile:
             )
         return self.statistics
 
+    def deleteMeasures(self, indices: Union[int, list[int]]):
+        """Delete measures from the dataset."""
+        if isinstance(indices, int):
+            indices = [indices]
+        self.BFS = np.delete(self.BFS, indices, axis=1)
+        self.MaxGain = np.delete(self.MaxGain, indices, axis=1)
+        self.timestamps = np.delete(self.timestamps, indices)
+        self.calcStatistics()
+
     def plotStatistics(self, title: str = None):
         if not title:
             title = self.folder
@@ -372,7 +381,11 @@ class Raw:
         if not title:
             title = self.filename
         return self.plotter.rawBGS_plot(
-            self.frequency, self.BGS, index=index, title=title
+            self.frequency,
+            self.BGS,
+            positions_m=self.position,
+            index=index,
+            title=title,
         )
 
     def plotMax(self, title: str = None):

{readerbotda-1.4.0 → readerbotda-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "readerbotda"
-version = "1.4.0"
+version = "1.4.2"
 description = "Pacchetto per lettura e visualizzazione file di log sensore BOTDA Cohaerentia"
 authors = [
     {name = "Marco Brunero",email = "marco.brunero@cohaerentia.com"}

readerbotda-1.4.0/ReaderBOTDA/plotter/abc.py

@@ -1,35 +0,0 @@
-from abc import ABC, abstractmethod
-
-class Plotter(ABC):
-
-    @abstractmethod
-    def single_plot(self,position, profile, title: str = None):
-        pass
-
-    @abstractmethod
-    def multiple_plot(self,position, profiles, timestamps, title: str = ''):
-        pass
-
-    @abstractmethod
-    def statistics(self,position,mean,std,title:str = ''):
-        pass
-
-    @abstractmethod
-    def raw2d_plot(self,position, frequency, BGS, title: str = None):
-        pass
-    
-    @abstractmethod
-    def rawBGS_plot(self,frequency, BGS, index: int = None, title: str = None):
-        pass
-
-    @abstractmethod
-    def raw3d_plot(self,position, frequency, BGS, title: str = None):
-        pass
-
-    @abstractmethod
-    def max_plot(self,position,max,title: str = None):
-        pass
-
-    @abstractmethod
-    def max_stat_plot(self,max_mean,max_std, title:str = ''):
-        pass

readerbotda-1.4.0/ReaderBOTDA/plotter/bokeh.py

@@ -1,74 +0,0 @@
-from .abc import Plotter
-
-from bokeh.plotting import figure
-from bokeh.models.layouts import Column
-from bokeh.plotting.figure import Figure as bokehFigure
-from bokeh.plotting import show as bokehShow
-from bokeh.models import Legend
-from bokeh.layouts import gridplot
-from bokeh.palettes import Bokeh8
-from bokeh.io import curdoc
-
-import numpy as np
-
-class Bokeh(Plotter):
-    def __init__(self,theme:str='caliber'):
-        curdoc().theme = theme
-        #TODO: capire come prendere la palette del tema scelto, invece che usare sempre Bokeh8. 
-        self.palette = Bokeh8
-    
-    def single_plot(self, position, profile, title: str = None) -> bokehFigure:
-        fig = figure(title=title, x_axis_label='Position (m)', y_axis_label='BFS (MHz)',sizing_mode='stretch_width')
-        fig.line(position, profile) 
-        return fig
-
-    def multiple_plot(self, position, profiles, timestamps, title: str = '') -> bokehFigure:
-        fig = figure(title=title, x_axis_label='Position (m)', y_axis_label='BFS (MHz)',sizing_mode='stretch_width')
-        fig.add_layout(Legend(), 'right')
-        for i,(time,color) in enumerate(zip(timestamps, self.palette)):
-            fig.line(x=position,y=profiles[:,i],
-                color=color,
-                legend_label=time.strftime("%m/%d/%Y, %H:%M:%S"))
-        return fig
-
-    def statistics(self, position, mean: np.ndarray,
-                   std: np.ndarray, title:str = '') -> Column:
-        f1 = figure(title=title,y_axis_label='Mean BFS (MHz)')
-        f1.line(x=position, y=mean)
-        f1.varea(x=position, y1=mean+std, y2=mean-std,fill_alpha=0.3)
-        f2 = figure(x_axis_label='Position (m)', y_axis_label='Std Dev (MHz)', y_range=(0,10))
-        f2.line(x=position, y=std)
-        return gridplot([f1,f2],ncols=1,height=150,sizing_mode='stretch_width')
-
-    def max_plot(self, position, max, title: str = None) -> bokehFigure:
-        fig = figure(title=title, x_axis_label='Position (m)', y_axis_label='Max BGS Amplitude',sizing_mode='stretch_width')
-        fig.line(x=position,y=max)
-        return fig
-    
-    def max_stat_plot(self,max_mean: np.ndarray, max_std: np.ndarray, title:str = '')-> bokehFigure:
-        fig = figure(title=title,y_axis_label='Max BGS (Volts)',sizing_mode='stretch_width')
-        fig.line(y=max_mean)
-        fig.varea(y1=max_mean+max_std, y2=max_mean-max_std,fill_alpha=0.3)
-        return fig
-    
-    def rawBGS_plot(self, frequency, BGS, index: int = None, title: str = None) -> bokehFigure:
-        fig = figure(title=title,x_axis_label='Frequency (GHz)', y_axis_label='Amplitude (V)',sizing_mode='stretch_width')
-        if not index:
-            for single in np.transpose(BGS):
-                fig.line(x=frequency,y=single)
-        else:
-            for single in np.transpose(BGS):
-                fig.line(x=frequency,y=single,color='rgba(175,175,175,0.15)')
-            fig.line(x=frequency,y=BGS[:,index])        
-        return fig
-
-    def raw3d_plot(self, position, frequency, BGS, title: str = None):
-        raise NameError('Function raw3d_plot not yet defined for Bokeh plotter.')
-
-    def raw2d_plot(self, position, frequency, BGS, title: str = None):
-        raise NameError('Function raw2d_plot not yet defined for Bokeh plotter.')
-    
-    @staticmethod
-    def show(fig) -> None:
-        bokehShow(fig)
-        pass