From 7cc126db00d2dd0372342befee8a50b351653e60 Mon Sep 17 00:00:00 2001
From: Ad5001
Date: Sat, 14 Aug 2021 16:13:14 +0200
Subject: [PATCH] Changing version to v0.1 with potential git version, changing
type display request function to displayType and displayTypeMultiple
---
LogarithmPlotter/__init__.py | 23 ++-
LogarithmPlotter/logarithmplotter.py | 2 +-
LogarithmPlotter/logarithmplotter.svg | 138 +-----------------
.../ObjectLists/ObjectCreationGrid.qml | 2 +-
.../ObjectLists/ObjectLists.qml | 4 +-
.../eu/ad5001/LogarithmPlotter/js/objects.js | 44 ++++--
README.md | 2 +-
...5001.LogarithmPlotter.metainfo.flatpak.xml | 4 +-
linux/eu.ad5001.LogarithmPlotter.metainfo.xml | 4 +-
mac/Info.plist | 2 +-
package-macosx.sh | 2 +-
snapcraft.yaml | 4 +-
win/installer.nsi | 2 +-
13 files changed, 76 insertions(+), 157 deletions(-)
diff --git a/LogarithmPlotter/__init__.py b/LogarithmPlotter/__init__.py
index 13f6a90..442e5e4 100644
--- a/LogarithmPlotter/__init__.py
+++ b/LogarithmPlotter/__init__.py
@@ -15,8 +15,29 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
"""
+from shutil import which
-__VERSION__ = "0.0.1.dev0"
+__VERSION__ = "0.1"
+is_release = False
+
+
+# Check if development version, if so get the date of the latest git patch
+# and append it to the version string.
+if which('git') is not None and not is_release:
+ from os.path import realpath, join, dirname, exists
+ from subprocess import check_output
+ from datetime import datetime
+ # Command to check date of latest git commit
+ cmd = ['git', 'log', '--format=%ci', '-n 1']
+ cwd = realpath(join(dirname(__file__), '..')) # Root AccountFree directory.
+ if exists(join(cwd, '.git')):
+ date_str = check_output(cmd, cwd=cwd).decode('utf-8').split(' ')[0]
+ try:
+ date = datetime.fromisoformat(date_str)
+ __VERSION__ += '.dev0+git' + date.strftime('%Y%m%d')
+ except ValueError:
+ # Date cannot be parsed, not git root?
+ pass
if __name__ == "__main__":
from .logarithmplotter import run
diff --git a/LogarithmPlotter/logarithmplotter.py b/LogarithmPlotter/logarithmplotter.py
index 4f6e88d..4e757e6 100644
--- a/LogarithmPlotter/logarithmplotter.py
+++ b/LogarithmPlotter/logarithmplotter.py
@@ -34,7 +34,7 @@ pwd = os.getcwd()
def get_linux_theme():
des = {
- "KDE": "Flat",
+ "KDE": "org.kde.desktop",
"gnome": "default",
"lxqt": "fusion",
"mate": "fusion",
diff --git a/LogarithmPlotter/logarithmplotter.svg b/LogarithmPlotter/logarithmplotter.svg
index 89b2b1b..69f819d 100644
--- a/LogarithmPlotter/logarithmplotter.svg
+++ b/LogarithmPlotter/logarithmplotter.svg
@@ -1,131 +1,9 @@
-
-
- It's primary use is to quickly create asymptotic Bode Diagrams, but it's extensible nature and ability to switch to non-logarithmic scales allow it to create other things with it, like sequences or statistical repartition functions.
+ It's primary use is to quickly create asymptotic Bode plots, but it's extensible nature and ability to switch to non-logarithmic scales allow it to create other things with it, like sequences or statistical repartition functions.
@@ -40,7 +40,7 @@
http://apps.ad5001.eu/img/full/logarithmplotter.png
-
+
diff --git a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml
index 061bd54..fbd3fa3 100644
--- a/linux/eu.ad5001.LogarithmPlotter.metainfo.xml
+++ b/linux/eu.ad5001.LogarithmPlotter.metainfo.xml
@@ -17,7 +17,7 @@
LogarithmPlotter is, as it's name suggests, a plotter made with logarithm scales in mind. With an object system similar to Geogebra's, it allows dynamic creation of plots with very few limitations.
- It's primary use is to quickly create asymptotic Bode Diagrams, but it's extensible nature and ability to switch to non-logarithmic scales allow it to create other things with it, like sequences or statistical repartition functions.
+ It's primary use is to quickly create asymptotic Bode plots, but it's extensible nature and ability to switch to non-logarithmic scales allow it to create other things with it, like sequences or statistical repartition functions.