zeed-movs-viewer 0.0.1__tar.gz → 0.0.2__tar.gz

{zeed_movs_viewer-0.0.1 → zeed_movs_viewer-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zeed-movs-viewer
-Version: 0.0.1
+Version: 0.0.2
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                 Version 3, 19 November 2007
          

{zeed_movs_viewer-0.0.1 → zeed_movs_viewer-0.0.2}/pyproject.toml

@@ -6,7 +6,7 @@ requires = [
 
 [project]
 name = "zeed-movs-viewer"
-version = "0.0.1"
+version = "0.0.2"
 requires-python = ">=3.12,<3.14"
 classifiers = [
     "Programming Language :: Python :: 3 :: Only",
@@ -79,6 +79,7 @@ composite = [
     "pdm bump patch --commit --tag",
     "pdm publish",
     "git push",
+    "git push --tags",
 ]
 
 [tool.ruff]

{zeed_movs_viewer-0.0.1 → zeed_movs_viewer-0.0.2}/src/movsviewer/automation.py

@@ -37,13 +37,13 @@ logger = getLogger(__name__)
 
 
 def get_options(dtemp: str) -> Options:
-    options = Options()
-
-    options.profile = FirefoxProfile()
+    profile = FirefoxProfile()
     # set download folder
-    options.profile.set_preference('browser.download.folderList', 2)
-    options.profile.set_preference('browser.download.dir', dtemp)
+    profile.set_preference('browser.download.folderList', 2)
+    profile.set_preference('browser.download.dir', dtemp)
 
+    options = Options()
+    options.profile = profile
     return options
 
 

{zeed_movs_viewer-0.0.1 → zeed_movs_viewer-0.0.2}/src/movsviewer/chartview.py

@@ -231,7 +231,7 @@ class Chart(QChart):
         self.scroll(x_prev - x_curr, y_curr - y_prev)
 
 
-MONEY_HEADER = ColumnHeader('money')
+MONEY_HEADER = ColumnHeader('money', '€')
 
 
 @dataclass

{zeed_movs_viewer-0.0.1 → zeed_movs_viewer-0.0.2}/src/movsviewer/mainui.py

@@ -8,7 +8,6 @@ from guilib.chartwidget.viewmodel import (
     SortFilterViewModel as SortFilterViewModel2,
 )
 from guilib.multitabs.widget import MultiTabs
-from guilib.qwtplot.plot import Plot
 from guilib.searchsheet.widget import SearchSheet
 from PySide6.QtCore import QCoreApplication
 from PySide6.QtCore import QItemSelection
@@ -30,6 +29,7 @@ from PySide6.QtWidgets import QWidget
 
 from movsviewer.constants import MAINUI_UI_PATH
 from movsviewer.constants import SETTINGSUI_UI_PATH
+from movsviewer.plotutils import PlotAndSliderWidget
 from movsviewer.plotutils import load_infos
 from movsviewer.settings import Settings
 from movsviewer.validator import Validator
@@ -142,7 +142,7 @@ class NewMainui:
         for data_path in data_paths:
             sheet, model = self.new_search_sheet(data_path)
             model2 = SortFilterViewModel2()
-            plot = Plot(model2, None)
+            plot = PlotAndSliderWidget(model2, None)
             model2.update(load_infos((data_path, 'money')))
             idx = self.multi_tabs.add_double_box(sheet, plot, model.name)
             self.sheets_charts[data_path] = (sheet, model2, idx)

zeed_movs_viewer-0.0.2/src/movsviewer/plotutils.py

@@ -0,0 +1,90 @@
+from collections import defaultdict
+from datetime import date
+from datetime import timedelta
+from itertools import accumulate
+from operator import attrgetter
+from typing import TYPE_CHECKING
+
+from guilib.chartslider.chartslider import ChartSlider
+from guilib.chartwidget.model import Column
+from guilib.chartwidget.model import ColumnHeader
+from guilib.chartwidget.model import ColumnProto
+from guilib.chartwidget.model import Info
+from guilib.chartwidget.model import InfoProto
+from guilib.qwtplot.plot import Plot
+from movslib.reader import read
+from PySide6.QtWidgets import QVBoxLayout
+from PySide6.QtWidgets import QWidget
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+    from decimal import Decimal
+
+    from guilib.chartwidget.viewmodel import SortFilterViewModel
+    from movslib.model import Row
+    from movslib.model import Rows
+
+
+def _acc_reset_by_year(rows: 'Rows') -> 'Iterable[tuple[date, Decimal]]':
+    def func(a: tuple[date, 'Decimal'], b: 'Row') -> tuple[date, 'Decimal']:
+        if b.date.year != a[0].year:
+            return b.date, b.money
+
+        return b.date, a[1] + b.money
+
+    it = iter(sorted(rows, key=attrgetter('date')))
+    head = next(it)
+    return accumulate(it, func, initial=(head.date, head.money))
+
+
+def _acc(rows: 'Rows') -> 'Iterable[tuple[date, Decimal]]':
+    def func(a: tuple[date, 'Decimal'], b: 'Row') -> tuple[date, 'Decimal']:
+        return b.date, a[1] + b.money
+
+    it = iter(sorted(rows, key=attrgetter('date')))
+    head = next(it)
+    return accumulate(it, func, initial=(head.date, head.money))
+
+
+def load_infos(*fn_names: tuple[str, str]) -> list[InfoProto]:
+    tmp = defaultdict[date, list[ColumnProto]](list)
+    for fn, name in fn_names:
+        _, rows = read(fn, name)
+
+        ch = ColumnHeader(rows.name, '€')
+        for d, m in _acc(rows):
+            tmp[d].append(Column(ch, m))
+
+        ch_year = ColumnHeader(f'{rows.name} (by year)', '€')
+        for d, m in _acc_reset_by_year(rows):
+            tmp[d].append(Column(ch_year, m))
+
+    sorted_days = sorted(tmp)
+
+    # add +/- 1 months of padding
+    ret: list[InfoProto] = []
+    ret.append(Info(sorted_days[0] - timedelta(days=30), []))
+    ret.extend(Info(d, tmp[d]) for d in sorted_days)
+    ret.append(Info(sorted_days[-1] + timedelta(days=30), []))
+
+    return ret
+
+
+class PlotAndSliderWidget(QWidget):
+    """Composition of a Plot and a (Chart)Slider."""
+
+    def __init__(
+        self, model: 'SortFilterViewModel', parent: QWidget | None
+    ) -> None:
+        super().__init__(parent)
+
+        plot = Plot(model, self)
+        chart_slider = ChartSlider(model, self, dates_column=0)
+
+        layout = QVBoxLayout(self)
+        layout.addWidget(plot)
+        layout.addWidget(chart_slider)
+        self.setLayout(layout)
+
+        chart_slider.start_date_changed.connect(plot.start_date_changed)
+        chart_slider.end_date_changed.connect(plot.end_date_changed)

zeed_movs_viewer-0.0.1/src/movsviewer/plotutils.py

@@ -1,38 +0,0 @@
-from collections import defaultdict
-from datetime import date
-from itertools import accumulate
-from operator import attrgetter
-from typing import TYPE_CHECKING
-
-from guilib.chartwidget.model import Column
-from guilib.chartwidget.model import ColumnHeader
-from guilib.chartwidget.model import ColumnProto
-from guilib.chartwidget.model import Info
-from guilib.chartwidget.model import InfoProto
-from movslib.movs import read_txt
-
-if TYPE_CHECKING:
-    from collections.abc import Iterable
-    from decimal import Decimal
-
-    from movslib.model import Row
-    from movslib.model import Rows
-
-
-def _acc(rows: 'Rows') -> 'Iterable[tuple[date, Decimal]]':
-    def func(a: 'tuple[date, Decimal]', b: 'Row') -> 'tuple[date, Decimal]':
-        return (b.date, a[1] + b.money)
-
-    it = iter(sorted(rows, key=attrgetter('date')))
-    head = next(it)
-    return accumulate(it, func, initial=(head.date, head.money))
-
-
-def load_infos(*fn_names: tuple[str, str]) -> list[InfoProto]:
-    tmp = defaultdict[date, list[ColumnProto]](list)
-    for fn, name in fn_names:
-        _, rows = read_txt(fn, name)
-        ch = ColumnHeader(rows.name)
-        for d, m in _acc(rows):
-            tmp[d].append(Column(ch, m))
-    return [Info(d, tmp[d]) for d in sorted(tmp)]