Merge pull request #4 from AATrubilin/dev

Dev
aatrubilin · May 16, 2019 · 6a97d86 · 6a97d86
2 parents 9676747 + 1fff1bb
commit 6a97d86
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 60 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,24 @@
 Changelog
 =========
 
+Version 0.5
+===========
+*Released 2019-05-16*
+
+New Features
+
+- Added :meth:`trassir_script_framework.BaseUtils.save_pkl`
+- Added :meth:`trassir_script_framework.BaseUtils.load_pkl`
+- Added :class:`trassir_script_framework.Templates`
+- Added :meth:`trassir_script_framework.GUITemplate.delete`
+
+Changes
+
+- Fix ShotSaver examples
+- Rename Template to :class:`trassir_script_framework.GUITemplate`
+- Fix some errors in :meth:`trassir_script_framework.BaseUtils.image_to_base64`
+- Add extension to file_log in :meth:`trassir_script_framework.BaseUtils.get_logger`
+
 Version 0.4
 ===========
 *Released 2019-04-30*

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![GitHub release](https://img.shields.io/github/release/aatrubilin/trassir_script_framework.svg)](trassir_script_framework.py)
+![GitHub last commit](https://img.shields.io/github/last-commit/aatrubilin/trassir_script_framework.svg)
 [![Documentation Status](https://readthedocs.org/projects/trassir-script-framework/badge/?version=latest)](https://trassir-script-framework.readthedocs.io/ru/latest/?badge=latest)
 [![Build Status](https://travis-ci.org/AATrubilin/trassir_script_framework.svg?branch=master)](https://travis-ci.org/AATrubilin/trassir_script_framework)
 [![License](https://img.shields.io/github/license/aatrubilin/trassir_script_framework.svg)](LICENSE.md)

diff --git a/docs/source/script_framework.base_utils.rst b/docs/source/script_framework.base_utils.rst
@@ -41,6 +41,14 @@ base64_to_html_img
 ------------------
 .. automethod:: trassir_script_framework.BaseUtils.base64_to_html_img
 
+save_pkl
+--------
+.. automethod:: trassir_script_framework.BaseUtils.save_pkl
+
+load_pkl
+--------
+.. automethod:: trassir_script_framework.BaseUtils.load_pkl
+
 get_operator_gui
 ----------------
 .. automethod:: trassir_script_framework.BaseUtils.get_operator_gui

diff --git a/docs/source/script_framework.template.rst b/docs/source/script_framework.template.rst
@@ -1,4 +1,4 @@
-Template
-========
-.. autoclass:: trassir_script_framework.Template
+GUITemplate
+===========
+.. autoclass:: trassir_script_framework.GUITemplate
     :members:
diff --git a/docs/source/script_framework.tr_objects.rst b/docs/source/script_framework.tr_objects.rst
@@ -18,6 +18,11 @@ Users
 .. autoclass:: trassir_script_framework.Users
     :members:
 
+Templates
+---------
+.. autoclass:: trassir_script_framework.Templates
+    :members:
+
 PosTerminals
 ------------
 .. autoclass:: trassir_script_framework.PosTerminals