Merge pull request #18 from nishitomo206/develop

v0.1

README.md

@@ -1,4 +1,6 @@
-# pyopentd
+# pyopentd v0.1
+
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 （開発中）
 
@@ -30,7 +32,7 @@ Thermal DesktopのAPIであるOpenTDをpythonで触るためのライブラリ
     ```
 
 2. ./pyopentd/src/pyopentd/ディレクトリにある、\_\_init\_\_.pyを除く全pythonファイルの"/OpenTDv62/v4.0_6.2.0.7__65e6d95ed5c2e178/"の行を自分のものに変更する。
-3. windows powershellを開いて元のディレクトリ（README.mdと同じ階層）に移動。
+3. windows powershellを開いてルートディレクトリ（README.mdと同じ階層）に移動。
 
     ``` PowerShell
     cd pyopentd
@@ -45,3 +47,7 @@ Thermal DesktopのAPIであるOpenTDをpythonで触るためのライブラリ
 ## サンプルを実行
 
 ./sample/sample.ipynb がサンプルファイルになっているので、ファイルを開いて実行してみて下さい。
+
+## 質問、問い合わせ、その他なんでも
+
+お気軽に nishitomo206@gmail.com にお問い合わせください。

sample/sample.ipynb

@@ -114,7 +114,7 @@
     "# orbit.Case Set 2 以外は動かないので注意。\n",
     "group_name = 'orbit'\n",
     "caseset_name = 'Case Set 2'\n",
-    "case = td.GetCaseSet(caseset_name, group_name)"
+    "case = td.get_caseset(caseset_name, group_name)"
    ]
   },
   {
@@ -243,7 +243,7 @@
    ],
    "source": [
     "# 軌道情報の取得\n",
-    "orbit_name = pt.get_orbit_name_from_caseset(case)\n",
+    "orbit_name = case.get_orbit_name()\n",
     "print(orbit_name)\n",
     "df_orbit = td.get_orbit(orbit_name)\n",
     "df_orbit.head()"
@@ -256,7 +256,7 @@
    "outputs": [],
    "source": [
     "# 実行\n",
-    "case.Run()"
+    "case.run()"
    ]
   },
   {
@@ -280,7 +280,7 @@
     }
    ],
    "source": [
-    "sav_name = case.SindaOptions.SaveFilename\n",
+    "sav_name = case.origin.SindaOptions.SaveFilename\n",
     "print(sav_name)"
    ]
   },
@@ -301,7 +301,7 @@
     }
    ],
    "source": [
-    "sav_path = f'./td_model/{case.UserDirectory}/{sav_name}'\n",
+    "sav_path = f'./td_model/{case.origin.UserDirectory}/{sav_name}'\n",
     "sav_path"
    ]
   },
@@ -360,7 +360,7 @@
     "df_orbit_modify = get_attitude(savefile.times, df_orbit)\n",
     "# df_orbit_modify\n",
     "df_time = pd.DataFrame(savefile.times, columns=['Times'])\n",
-    "df_case = pd.DataFrame([f'{case.GroupName}.{case.Name}']*len(savefile.times), columns=['case'])"
+    "df_case = pd.DataFrame([f'{case.origin.GroupName}.{case.origin.Name}']*len(savefile.times), columns=['case'])"
    ]
   },
   {
@@ -773,11 +773,8 @@
   }
  ],
  "metadata": {
-  "interpreter": {
-   "hash": "c3623eeadeff90687f25f628eb47808eede64c694dd73d054ce108ebd32f6903"
-  },
   "kernelspec": {
-   "display_name": "Python 3.8.10 ('.venv_py38')",
+   "display_name": "Python 3.8.10 ('.venv_py38': venv)",
    "language": "python",
    "name": "python3"
   },
@@ -793,7 +790,12 @@
    "pygments_lexer": "ipython3",
    "version": "3.8.10"
   },
-  "orig_nbformat": 4
+  "orig_nbformat": 4,
+  "vscode": {
+   "interpreter": {
+    "hash": "c3623eeadeff90687f25f628eb47808eede64c694dd73d054ce108ebd32f6903"
+   }
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

setup.py

@@ -3,53 +3,52 @@
 # License: MIT License
 
 from setuptools import setup, find_packages
+
 # import src.pyopentd
 from src import pyopentd
 
 DESCRIPTION = ""
-NAME = 'pyopentd'
-AUTHOR = 'Tomoki Nishikawa'
-AUTHOR_EMAIL = 'nishitomo206@gmail.com'
-URL = 'https://github.com/nishitomo206/pyopentd'
-LICENSE = 'MIT License'
-DOWNLOAD_URL = 'https://github.com/nishitomo206/pyopentd'
+NAME = "pyopentd"
+AUTHOR = "Tomoki Nishikawa"
+AUTHOR_EMAIL = "nishitomo206@gmail.com"
+URL = "https://github.com/nishitomo206/pyopentd"
+LICENSE = "MIT License"
+DOWNLOAD_URL = "https://github.com/nishitomo206/pyopentd"
 VERSION = pyopentd.__version__
 # PYTHON_REQUIRES = ">=3.6"
 
-INSTALL_REQUIRES = [
-]
+INSTALL_REQUIRES = []
 
-EXTRAS_REQUIRE = {
-}
+EXTRAS_REQUIRE = {}
 
 # PACKAGES = [
 #     'pyopentd'
 # ]
 
-CLASSIFIERS = [
-]
+CLASSIFIERS = []
 
 # with open('README.rst', 'r') as fp:
 #     readme = fp.read()
 # with open('CONTACT.txt', 'r') as fp:
 #     contacts = fp.read()
 # long_description = readme + '\n\n' + contacts
 
-setup(name=NAME,
-      author=AUTHOR,
-      author_email=AUTHOR_EMAIL,
-      maintainer=AUTHOR,
-      maintainer_email=AUTHOR_EMAIL,
-      description=DESCRIPTION,
+setup(
+    name=NAME,
+    author=AUTHOR,
+    author_email=AUTHOR_EMAIL,
+    maintainer=AUTHOR,
+    maintainer_email=AUTHOR_EMAIL,
+    description=DESCRIPTION,
     #   long_description=long_description,
-      license=LICENSE,
-      url=URL,
-      version=VERSION,
-      download_url=DOWNLOAD_URL,
+    license=LICENSE,
+    url=URL,
+    version=VERSION,
+    download_url=DOWNLOAD_URL,
     #   python_requires=PYTHON_REQUIRES,
-      install_requires=INSTALL_REQUIRES,
-      extras_require=EXTRAS_REQUIRE,
-      packages=find_packages(where='src'),
-      package_dir={'': 'src'},
-      classifiers=CLASSIFIERS
-    )
+    install_requires=INSTALL_REQUIRES,
+    extras_require=EXTRAS_REQUIRE,
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
+    classifiers=CLASSIFIERS,
+)

src/pyopentd/__init__.py

@@ -2,4 +2,4 @@
 from .result import *
 from .utils import *
 
-__version__ = '0.0.1'
+__version__ = "0.1"