From f5fee9ae355ab67cadcd440bc2d3455d10368e5c Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 1 Oct 2021 16:36:58 +0200 Subject: [PATCH 1/8] Fixing a lot of bugs of packages. --- linux/debian/compat | 1 - linux/debian/install | 1 - linux/flatpak/eu.ad5001.LogarithmPlotter.json | 2 +- linux/sign-deb.sh | 24 ++++++++++ package-linux.sh | 4 +- setup.py | 44 +++++++++++++------ 6 files changed, 58 insertions(+), 18 deletions(-) delete mode 100644 linux/debian/compat delete mode 100644 linux/debian/install create mode 100755 linux/sign-deb.sh diff --git a/linux/debian/compat b/linux/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/linux/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/linux/debian/install b/linux/debian/install deleted file mode 100644 index a93c044..0000000 --- a/linux/debian/install +++ /dev/null @@ -1 +0,0 @@ -logarithmplotter usr/bin/ diff --git a/linux/flatpak/eu.ad5001.LogarithmPlotter.json b/linux/flatpak/eu.ad5001.LogarithmPlotter.json index 5648e3a..4ca208e 100644 --- a/linux/flatpak/eu.ad5001.LogarithmPlotter.json +++ b/linux/flatpak/eu.ad5001.LogarithmPlotter.json @@ -23,12 +23,12 @@ ], "modules": [ "python3-pyside2.json", - { "name": "LogarithmPlotter", "buildsystem": "simple", "config-opts": ["no-debuginfo-compression"], "build-commands": [ + "rm -rf .git", "PREFIX=\"/app/share\" FLATPAK_INSTALL=1 python3 setup.py install --prefix=/app" ], "sources": [ diff --git a/linux/sign-deb.sh b/linux/sign-deb.sh new file mode 100755 index 0000000..ff11a01 --- /dev/null +++ b/linux/sign-deb.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# This script is used to sign the LogarithmPlotter deb directly from it's DSC file. +# Adapted from https://github.com/astraw/stdeb/issues/181 + +PPA_ARCHIVE="ppa:ad5001/logarithmplotter" + +cd ../deb_dist + +# create a temporary folder +mkdir tmp -p +cd tmp +rm -rf * + +# DSC file variables +dsc_file="$(find ../ -regextype sed -regex ".*/*\-ppa[0-9]*.dsc" | cut -c 4-)" +source_package_name="$(echo $dsc_file | cut -c -$(expr ${#dsc_file} - 4))" + +# extract and sign the files +dpkg-source -x "../$dsc_file" +cd "$(find . -type d | head -n 2 | tail -n 1 | cut -c 3-)" # go to the (only) directory. +debuild -S -sa -k"mail@ad5001.eu" + +# upload package to my PPA +dput $PPA_ARCHIVE "../${source_package_name}_source.changes" diff --git a/package-linux.sh b/package-linux.sh index 7760b08..506c5df 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -1,6 +1,8 @@ #!/bin/bash -python3 setup.py --command-packages=stdeb.command sdist_dsc --package logarithmplotter --copyright-file linux/debian/copyright --suite hirsute --recommends "$(cat linux/debian/recommends)" --depends "$(cat linux/debian/depends)" --section science bdist_deb +python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ + --package logarithmplotter --copyright-file linux/debian/copyright --suite hirsute --depends3 "$(cat linux/debian/depends)" --section science \ + --upstream-version-suffix "-patch1" --debian-version "ppa1" bdist_deb # Flatpak building FLATPAK_BUILDER=$(which flatpak-builder) diff --git a/setup.py b/setup.py index 8b47858..ef20ae4 100644 --- a/setup.py +++ b/setup.py @@ -20,23 +20,35 @@ import setuptools import os import sys +print(sys.argv) + current_dir = os.path.realpath(os.path.dirname(os.path.realpath(__file__))) if "PREFIX" not in os.environ and sys.platform == 'linux': - if "XDG_DATA_HOME" in os.environ: - os.environ["PREFIX"] = os.environ["XDG_DATA_HOME"] - else : - try: - # Checking if we have permission to write to root. - from os import makedirs, rmdir - makedirs("/usr/share/applications/test") - rmdir("/usr/share/applications/test") - os.environ["PREFIX"] = "/usr/share" - except: - os.environ["PREFIX"] = os.environ["HOME"] + "/.local/share" + from getopt import getopt + optlist, args = getopt(sys.argv, '', ['prefix=', 'root=']) + for arg,value in optlist: + if arg == "prefix": + os.environ["PREFIX"] = value + if "PREFIX" not in os.environ and sys.platform == 'linux': + if "XDG_DATA_HOME" in os.environ: + os.environ["PREFIX"] = os.environ["XDG_DATA_HOME"] + else: + try: + # Checking if we have permission to write to root. + from os import makedirs, rmdir + makedirs("/usr/share/applications/test") + rmdir("/usr/share/applications/test") + os.environ["PREFIX"] = "/usr/share" + except: + os.environ["PREFIX"] = os.environ["HOME"] + "/.local/share" from LogarithmPlotter import __VERSION__ as pkg_version +if "--remove-git-version" in sys.argv: + pkg_version = pkg_version.split(".dev0")[0] + sys.argv.remove("--remove-git-version") + CLASSIFIERS = """ Environment :: Graphic Environment :: X11 Applications :: Qt @@ -70,7 +82,11 @@ def package_data(): data_files = [] if sys.platform == 'linux': - data_files.append((os.environ["PREFIX"] + '/applications/', ['linux/logarithmplotter.desktop'])) + data_files.append(('share/applications/', ['linux/logarithmplotter.desktop'])) + data_files.append(('share/mime/packages/', ['linux/x-logarithm-plot.xml'])) + data_files.append(('share/icons/hicolor/scalable/mimetypes/', ['linux/application-x-logarithm-plot.svg'])) + data_files.append(('share/icons/hicolor/scalable/apps/', ['logplotter.svg'])) + """data_files.append((os.environ["PREFIX"] + '/applications/', ['linux/logarithmplotter.desktop'])) data_files.append((os.environ["PREFIX"] + '/mime/packages/', ['linux/x-logarithm-plot.xml'])) data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', ['linux/application-x-logarithm-plot.svg'])) data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', ['logplotter.svg'])) @@ -94,7 +110,7 @@ if sys.platform == 'linux': os.remove(os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') os.remove(os.environ["PREFIX"] + '/mime/packages/x-logarithm-plot.xml') os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg') - os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg') + os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg')""" setuptools.setup( install_requires=([] if "FLATPAK_INSTALL" in os.environ else ["PySide2"]), @@ -111,7 +127,7 @@ setuptools.setup( author_email='mail@ad5001.eu', license=('GPLv3'), - url='https://apps.ad5001.eu/logarithmplotter', + url='https://apps.ad5001.eu/logarithmplotter/', classifiers=CLASSIFIERS, zip_safe=False, From 26a5d6565b78b545a8abdda6e8cd3b329dd6d6c4 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Fri, 1 Oct 2021 17:35:50 +0200 Subject: [PATCH 2/8] Updating CI link. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 738fdff..71e6653 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ![icon](https://git.ad5001.eu/Ad5001/LogarithmicPlotter/raw/branch/master/logplotter.svg) LogarithmPlotter -[![Build Status](https://ci.ad5001.eu/api/badges/Ad5001/LogarithmPlotter/status.svg)](https://ci.ad5001.eu/Ad5001/LogarithmicPlotter) +[![Build Status](https://ci.ad5001.eu/api/badges/Ad5001/LogarithmPlotter/status.svg)](https://ci.ad5001.eu/Ad5001/LogarithmPlotter) Create graphs with logarithm scales, namely BODE diagrams. From e1d839e9afdf543aaf6d70ff2cc5cb49f6490da1 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 23 Oct 2021 14:40:23 +0200 Subject: [PATCH 3/8] Updating deb versioning. --- package-linux.sh | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-linux.sh b/package-linux.sh index 506c5df..9e46527 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -1,8 +1,8 @@ #!/bin/bash python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ - --package logarithmplotter --copyright-file linux/debian/copyright --suite hirsute --depends3 "$(cat linux/debian/depends)" --section science \ - --upstream-version-suffix "-patch1" --debian-version "ppa1" bdist_deb + --package logarithmplotter --copyright-file linux/debian/copyright --suite impish --depends3 "$(cat linux/debian/depends)" --section science \ + --debian-version "ppa1" bdist_deb # Flatpak building FLATPAK_BUILDER=$(which flatpak-builder) diff --git a/setup.py b/setup.py index ef20ae4..376324c 100644 --- a/setup.py +++ b/setup.py @@ -119,7 +119,7 @@ setuptools.setup( name='logarithmplotter', version=pkg_version, - description='Browse and use online services, free of account', + description='Create graphs with logarithm scales.', long_description=read_file("README.md"), keywords='logarithm plotter graph creator bode diagram', From ffe09a2b3d47c52f12790b60227690d1b734551e Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 12 Jan 2022 14:39:23 +0100 Subject: [PATCH 4/8] Beginning v0.1.3 Confined packages (snapcraft & flatpak) won't show error messages related to update checks. --- LogarithmPlotter/__init__.py | 4 ++-- LogarithmPlotter/__main__.py | 2 +- LogarithmPlotter/config.py | 2 +- LogarithmPlotter/logarithmplotter.py | 2 +- LogarithmPlotter/native.py | 2 +- .../qml/eu/ad5001/LogarithmPlotter/About.qml | 4 ++-- .../qml/eu/ad5001/LogarithmPlotter/Alert.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml | 2 +- .../eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/FileDialog.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/History.qml | 2 +- .../eu/ad5001/LogarithmPlotter/HistoryBrowser.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/Icon.qml | 2 +- .../eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml | 2 +- .../ad5001/LogarithmPlotter/LogarithmPlotter.qml | 2 +- .../LogarithmPlotter/ObjectLists/EditorDialog.qml | 2 +- .../ObjectLists/ObjectCreationGrid.qml | 2 +- .../LogarithmPlotter/ObjectLists/ObjectLists.qml | 2 +- .../LogarithmPlotter/PickLocationOverlay.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/Settings.qml | 2 +- .../qml/eu/ad5001/LogarithmPlotter/TextSetting.qml | 2 +- LogarithmPlotter/update.py | 6 ++++-- README.md | 4 +++- linux/debian/changelog | 8 +++++++- ...eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml | 6 ++++-- linux/eu.ad5001.LogarithmPlotter.metainfo.xml | 6 ++++-- linux/install_local.sh | 2 +- linux/snapcraft/launcher/launch-logarithmplotter | 2 +- package-linux.sh | 2 +- setup.py | 14 ++++++++++---- snapcraft.yaml | 2 +- 32 files changed, 60 insertions(+), 40 deletions(-) diff --git a/LogarithmPlotter/__init__.py b/LogarithmPlotter/__init__.py index aa63184..1691f80 100644 --- a/LogarithmPlotter/__init__.py +++ b/LogarithmPlotter/__init__.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ """ from shutil import which -__VERSION__ = "0.1.2" +__VERSION__ = "0.1.3" is_release = False diff --git a/LogarithmPlotter/__main__.py b/LogarithmPlotter/__main__.py index 983dd6b..0b950d2 100644 --- a/LogarithmPlotter/__main__.py +++ b/LogarithmPlotter/__main__.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/config.py b/LogarithmPlotter/config.py index 36ea724..db904b7 100644 --- a/LogarithmPlotter/config.py +++ b/LogarithmPlotter/config.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/logarithmplotter.py b/LogarithmPlotter/logarithmplotter.py index 1e534f2..2b105b8 100644 --- a/LogarithmPlotter/logarithmplotter.py +++ b/LogarithmPlotter/logarithmplotter.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/native.py b/LogarithmPlotter/native.py index dc7797d..e867c8b 100644 --- a/LogarithmPlotter/native.py +++ b/LogarithmPlotter/native.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml index c850f63..eb5e32f 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/About.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -85,7 +85,7 @@ D.Dialog { wrapMode: Text.WordWrap textFormat: Text.RichText font.pixelSize: 13 - text: "Copyright © 2021 Ad5001 <mail@ad5001.eu>
+ text: "Copyright © 2022 Ad5001 <mail@ad5001.eu>

This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml index b820f51..5309eec 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Alert.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml index b0cf8a6..653f482 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml index a5086fb..6cda799 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ComboBoxSetting.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml index c958f42..eeaa69b 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/FileDialog.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml index 8a78855..2758b24 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/GreetScreen.qml @@ -1,7 +1,7 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml index 198af79..8d00ecf 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml index 27f0d7e..27caabb 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/HistoryBrowser.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml index bdeee56..1a24031 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Icon.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml index 93c94eb..5488fe0 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml index d0a0356..2311c4d 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml index 803faea..89a39ae 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/EditorDialog.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml index 508e38f..25a256d 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml index 5bc2d7b..c3b5310 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml index 44465e2..c684836 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml index 3a0207f..38a30c0 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Settings.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml index 77c62ba..5c20f36 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/TextSetting.qml @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/update.py b/LogarithmPlotter/update.py index afd9ef7..35df66f 100644 --- a/LogarithmPlotter/update.py +++ b/LogarithmPlotter/update.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ from PySide2.QtCore import Qt, QRunnable, QThreadPool, QThread, QObject, Signal from urllib.request import urlopen from urllib.error import HTTPError, URLError +from sys import argv class UpdateInformation(QObject): got_update_info = Signal(bool, str, bool) @@ -67,7 +68,8 @@ def check_for_updates(current_version, window): """ Checks for updates in the background, and sends an alert with information. """ - + if "--no-check-for-updates" in argv: + return # def cb(show_alert, msg_text, update_available): pass if show_alert: diff --git a/README.md b/README.md index 71e6653..bcf5d1d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -# ![icon](https://git.ad5001.eu/Ad5001/LogarithmicPlotter/raw/branch/master/logplotter.svg) LogarithmPlotter +# ![icon](https://git.ad5001.eu/Ad5001/LogarithmPlotter/raw/branch/master/logplotter.svg) LogarithmPlotter [![Build Status](https://ci.ad5001.eu/api/badges/Ad5001/LogarithmPlotter/status.svg)](https://ci.ad5001.eu/Ad5001/LogarithmPlotter) +[![On flathub](https://img.shields.io/flathub/v/eu.ad5001.LogarithmPlotter?label=on%20flathub)](https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter) +[![On Snapcraft](https://badgen.net/snapcraft/v/logarithmplotter?label=on%20snapcraft)](https://snapcraft.io/logarithmplotter) Create graphs with logarithm scales, namely BODE diagrams. diff --git a/linux/debian/changelog b/linux/debian/changelog index da00b9a..4d6e2fa 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +logarithmplotter (0.1.3) unstable; urgency=medium + + * Fixed bug: Confined packages (snapcraft & flatpak) won't show error messages related to update checks. + + -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0200 + logarithmplotter (0.1.2) unstable; urgency=medium * Fixed bug: Unable to move Bode diagrams elements when having deleted the sum element. @@ -8,7 +14,7 @@ logarithmplotter (0.1.2) unstable; urgency=medium -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0200 -logarithmplotter (0.1.dev0) UNRELEASED; urgency=medium +logarithmplotter (0.1) UNRELEASED; urgency=medium * Initial release. diff --git a/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml b/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml index a2940a0..69298ee 100644 --- a/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml +++ b/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml @@ -30,8 +30,8 @@ - Network - Feed + Science + Education https://apps.ad5001.eu/logarithmplotter/ https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues/ @@ -42,9 +42,11 @@ + + Ad5001 mail@ad5001.eu diff --git a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml index df8cf2b..9a3c399 100644 --- a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml +++ b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml @@ -30,8 +30,8 @@ - Network - Feed + Science + Education https://apps.ad5001.eu/logarithmplotter/ https://git.ad5001.eu/Ad5001/LogarithmPlotter/issues/ @@ -42,9 +42,11 @@ + + Ad5001 mail@ad5001.eu diff --git a/linux/install_local.sh b/linux/install_local.sh index 21f7ddc..714cc0b 100644 --- a/linux/install_local.sh +++ b/linux/install_local.sh @@ -1,7 +1,7 @@ #!/bin/bash # # AccountFree - Browse and use online services, free of account. -# Copyright (C) 2021 Ad5001 +# Copyright (C) 2022 Ad5001 # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/linux/snapcraft/launcher/launch-logarithmplotter b/linux/snapcraft/launcher/launch-logarithmplotter index bda53ea..1c28d0d 100755 --- a/linux/snapcraft/launcher/launch-logarithmplotter +++ b/linux/snapcraft/launcher/launch-logarithmplotter @@ -11,4 +11,4 @@ set \ #export QT_QPA_PLATFORMTHEME=kde # Finally run the next part of the command chain -exec "${@}" +exec "${@} --no-check-for-updates" diff --git a/package-linux.sh b/package-linux.sh index 9e46527..361161a 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -1,7 +1,7 @@ #!/bin/bash python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ - --package logarithmplotter --copyright-file linux/debian/copyright --suite impish --depends3 "$(cat linux/debian/depends)" --section science \ + --package logarithmplotter --copyright-file linux/debian/copyright --suite sid --depends3 "$(cat linux/debian/depends)" --section science \ --debian-version "ppa1" bdist_deb # Flatpak building diff --git a/setup.py b/setup.py index 376324c..75b474f 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ """ * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -86,7 +86,7 @@ if sys.platform == 'linux': data_files.append(('share/mime/packages/', ['linux/x-logarithm-plot.xml'])) data_files.append(('share/icons/hicolor/scalable/mimetypes/', ['linux/application-x-logarithm-plot.svg'])) data_files.append(('share/icons/hicolor/scalable/apps/', ['logplotter.svg'])) - """data_files.append((os.environ["PREFIX"] + '/applications/', ['linux/logarithmplotter.desktop'])) + data_files.append((os.environ["PREFIX"] + '/applications/', ['linux/logarithmplotter.desktop'])) data_files.append((os.environ["PREFIX"] + '/mime/packages/', ['linux/x-logarithm-plot.xml'])) data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', ['linux/application-x-logarithm-plot.svg'])) data_files.append((os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', ['logplotter.svg'])) @@ -98,7 +98,6 @@ if sys.platform == 'linux': os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/', exist_ok=True) os.makedirs(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/', exist_ok=True) os.makedirs(os.environ["PREFIX"] + '/metainfo/', exist_ok=True) - copyfile(current_dir + '/linux/logarithmplotter.desktop', os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') copyfile(current_dir + '/linux/x-logarithm-plot.xml', os.environ["PREFIX"] + '/mime/packages/x-logarithm-plot.xml') copyfile(current_dir + '/linux/application-x-logarithm-plot.svg', os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg') @@ -106,11 +105,18 @@ if sys.platform == 'linux': if "FLATPAK_INSTALL" in os.environ: copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml', os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml') + copyfile(current_dir + '/linux/flatpak/logarithmplotter.desktop', + os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') + else: + copyfile(current_dir + '/linux/eu.ad5001.LogarithmPlotter.metainfo.xml', + os.environ["PREFIX"] + '/metainfo/eu.ad5001.LogarithmPlotter.metainfo.xml') + copyfile(current_dir + '/linux/logarithmplotter.desktop', + os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') elif sys.argv[1] == "uninstall": os.remove(os.environ["PREFIX"] + '/applications/logarithmplotter.desktop') os.remove(os.environ["PREFIX"] + '/mime/packages/x-logarithm-plot.xml') os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg') - os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg')""" + os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg') setuptools.setup( install_requires=([] if "FLATPAK_INSTALL" in os.environ else ["PySide2"]), diff --git a/snapcraft.yaml b/snapcraft.yaml index 99646dd..c049967 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,6 @@ name: logarithmplotter title: LogarithmPlotter -version: '0.1.2' +version: '0.1.3' summary: 2D plotter software to make BODE plots, sequences and repartition functions. description: | LogarithmPlotter is, as it's name suggests, a plotter made with logarithm scales in mind. With an object system similar to [Geogebra](https://geogebra.org)'s, it allows dynamic creation of plots with very few limitations. From 492e715f005baf7bb9509fad9363b9a8d9d2760c Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 12 Jan 2022 14:52:00 +0100 Subject: [PATCH 5/8] Fixing bug for formulas of type (x + y) / z simplifications. --- LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js index ecd38fb..2ac90a6 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js @@ -134,7 +134,7 @@ function simplifyExpression(str) { ], [ // Decomposition way 2 /(^.?|[+-] |\()\((([-.\d\w] [*/] )?[-\d\w.]+) ([+\-]) (([-.\d\w] [*/] )?[\d\w.+]+)\) ([*/]) ([-.\d\w]+)(.?$| [+-]|\))/g, - "$1$8 $7 $2 $4 $8 $7 $5$9" + "$1$2 $7 $8 $4 $5 $7 $8$9" ], [ // Factorisation of π elements. /(([-\d\w.]+ [*/] )*)(pi|π)(( [/*] [-\d\w.]+)*) ([+-]) (([-\d\w.]+ [*/] )*)(pi|π)(( [/*] [-\d\w.]+)*)?/g, From be8e7361aab68920f41f4a1c0d4a93b149011352 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 12 Jan 2022 18:47:17 +0100 Subject: [PATCH 6/8] Updating copyrights, fixing bugs related to non continuous domains. --- .../qml/eu/ad5001/LogarithmPlotter/js/historylib.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/mathlib.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objects.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/common.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/function.js | 8 +++++--- .../qml/eu/ad5001/LogarithmPlotter/js/objs/gainbode.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/phasebode.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/point.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/repartition.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.js | 2 +- .../eu/ad5001/LogarithmPlotter/js/objs/sommegainsbode.js | 2 +- .../eu/ad5001/LogarithmPlotter/js/objs/sommephasesbode.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/text.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/parameters.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/parsing/ast.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/parsing/builder.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/parsing/common.js | 2 +- .../eu/ad5001/LogarithmPlotter/js/parsing/reference.js | 2 +- .../eu/ad5001/LogarithmPlotter/js/parsing/tokenizer.js | 2 +- .../qml/eu/ad5001/LogarithmPlotter/js/utils.js | 2 +- 22 files changed, 26 insertions(+), 24 deletions(-) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.js index 887859f..cae0769 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.js index 5a25431..2c52844 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.js index c9443df..52bfde8 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.js index 1818dfc..7ab6308 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.js index 6629cb7..7cbfaab 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.js index 3570b49..8b11990 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -135,16 +135,18 @@ class Function extends Common.ExecutableObject { var previousY; if(definitionDomain instanceof MathLib.SpecialDomain && definitionDomain.moveSupported) { // Point based functions. - previousX = definitionDomain.previous(previousX) + previousX = definitionDomain.next(previousX) if(previousX === null) previousX = definitionDomain.next(canvas.px2x(0)) previousY = expr.execute(previousX) if(!drawPoints && !drawDash) return while(previousX !== null && canvas.x2px(previousX) < canvas.canvasSize.width) { - var currentX = definitionDomain.next(previousX) + // Reconverted for canvas to fix for logarithmic scales. + var currentX = definitionDomain.next(canvas.px2x(canvas.x2px(previousX)+pxprecision)); var currentY = expr.execute(currentX) if(currentX === null) break; if((definitionDomain.includes(currentX) || definitionDomain.includes(previousX)) && (destinationDomain.includes(currentY) || destinationDomain.includes(previousY))) { + console.log(drawDash, drawPoints) if(drawDash) canvas.drawDashedLine(ctx, canvas.x2px(previousX), canvas.y2px(previousY), canvas.x2px(currentX), canvas.y2px(currentY)) if(drawPoints) { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/gainbode.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/gainbode.js index d385862..7ecd963 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/gainbode.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/gainbode.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/phasebode.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/phasebode.js index c2f2bbd..63dba8b 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/phasebode.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/phasebode.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.js index 28869b9..db3839a 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/repartition.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/repartition.js index fe7f7d9..2d29d0d 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/repartition.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/repartition.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.js index 2cda49e..bbd53b2 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommegainsbode.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommegainsbode.js index 27af613..57f0ec7 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommegainsbode.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommegainsbode.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommephasesbode.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommephasesbode.js index 9b4d487..4d0c6f8 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommephasesbode.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sommephasesbode.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.js index 6a183a4..45fd633 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.js index d66cb3e..c6eae5d 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.js index f8ecf8c..1eca5ae 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/ast.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/ast.js index 4a10d2d..82d07f1 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/ast.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/ast.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/builder.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/builder.js index d0ac2c6..d705491 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/builder.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/builder.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/common.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/common.js index ffc00b1..120411f 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/common.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/common.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/reference.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/reference.js index 26c5013..48ad2a8 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/reference.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/reference.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/tokenizer.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/tokenizer.js index e4eb533..dbb7abd 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/tokenizer.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/tokenizer.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js index 2ac90a6..1ba5241 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js @@ -1,6 +1,6 @@ /** * LogarithmPlotter - Create graphs with logarithm scales. - * Copyright (C) 2021 Ad5001 + * Copyright (C) 2022 Ad5001 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 93add357e688a2a9f098ad8aeccc9b96d26fa8d6 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 12 Jan 2022 18:57:02 +0100 Subject: [PATCH 7/8] Fixing windows building --- win/installer.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/installer.nsi b/win/installer.nsi index c9518bf..662a659 100644 --- a/win/installer.nsi +++ b/win/installer.nsi @@ -157,7 +157,7 @@ Section "" File *.dll File *.pyd File *.md - File *.manifest + ;File *.manifest File *.zip File *.bmp File *.ico From 6141658be21301cc7a69acdf06b0ccfb1c5553e2 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 19 Jan 2022 16:37:05 +0100 Subject: [PATCH 8/8] v0.1.3 release, adding changelog --- CHANGELOG.md | 25 +++++++++++++++++++ .../eu/ad5001/LogarithmPlotter/js/utils.js | 2 +- linux/debian/changelog | 9 ++++--- ...5001.LogarithmPlotter.metainfo.flatpak.xml | 1 + linux/eu.ad5001.LogarithmPlotter.metainfo.xml | 1 + 5 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6b1543f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,25 @@ +# Changelog + +## v0.1.3 (18 Jan 2022) + + * Fixed bug: Confined packages (snapcraft & flatpak) won't show error messages related to update checks. + * FIxed bug: Equations of the form (x + y) / z were not being simplified properly. + + -- Ad5001 Wed, 19 Jan 2022 20:00:00 +0100 + +## v0.1.2 (30 Sep 2021) + + * Fixed bug: Unable to move Bode diagrams elements when having deleted the sum element. + * Fixed bug: Names were not not being changed from previous object when editing a new one. + * Fixed bug: Bode Magnitude was not drawn far enough + * Fixed bug: Bode Magnitude had undefined ending. + * Fixed other bugs from v0.1.1. + + -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0100 + +## v0.1 (26 Aug 2021) + + * Initial release. + + -- Ad5001 Mon, 06 Jun 2021 08:48:28 +0100 + diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js index 1ba5241..27757a6 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/utils.js @@ -199,7 +199,7 @@ function simplifyExpression(str) { } ], [// Starting & ending parenthesis if not needed. - /^\((.*)\)$/g, + /^\s*\((.*)\)\s*$/g, function(match, middle) { var str = middle // Replace all groups diff --git a/linux/debian/changelog b/linux/debian/changelog index 4d6e2fa..3be2375 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,8 +1,9 @@ -logarithmplotter (0.1.3) unstable; urgency=medium +logarithmplotter (0.1.3) stable; urgency=medium * Fixed bug: Confined packages (snapcraft & flatpak) won't show error messages related to update checks. + * FIxed bug: Equations of the form (x + y) / z were not being simplified properly. - -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0200 + -- Ad5001 Wed, 19 Jan 2022 20:00:00 +0100 logarithmplotter (0.1.2) unstable; urgency=medium @@ -12,10 +13,10 @@ logarithmplotter (0.1.2) unstable; urgency=medium * Fixed bug: Bode Magnitude had undefined ending. * Fixed other bugs from v0.1.1. - -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0200 + -- Ad5001 Mon, 30 Sep 2021 20:00:00 +0100 logarithmplotter (0.1) UNRELEASED; urgency=medium * Initial release. - -- Ad5001 Mon, 06 Jun 2021 08:48:28 +0200 + -- Ad5001 Thu, 26 Aug 2021 08:48:28 +0100 diff --git a/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml b/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml index 69298ee..cf5d55f 100644 --- a/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml +++ b/linux/eu.ad5001.LogarithmPlotter.metainfo.flatpak.xml @@ -43,6 +43,7 @@ + diff --git a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml index 9a3c399..7253dfa 100644 --- a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml +++ b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml @@ -43,6 +43,7 @@ +