From c2d094f02eef55421791022c5987194c896790d6 Mon Sep 17 00:00:00 2001 From: tonyzyl Date: Sat, 5 Aug 2023 00:33:41 +0800 Subject: [PATCH 1/3] added env, fix errorlog bug --- README.md | 11 +++- dexpi2graph_python/dexpi2graphML-ad@TUDO.py | 2 +- environment.yml | 73 +++++++++++++++++++++ 3 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 environment.yml diff --git a/README.md b/README.md index 6a32ab4..a29e576 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,8 @@ A application for Windows 10 will be available soon. ### Python installation 1. Install Python (anaconda) from https://www.anaconda.com/products/individual -2. Load the following python libraries +2. Download the folder dexpi2graph_python. +3. Load the following python libraries - [NetworkX](https://networkx.org/) (vers. 2.4) [2] - [Matplotlib](https://matplotlib.org/) (vers. 3.2.2) [3] - [Pandas](https://pandas.pydata.org/) (vers. 1.0.5) [4] @@ -42,8 +43,12 @@ A application for Windows 10 will be available soon. - [PySimpleGUI](https://pysimplegui.readthedocs.io/en/latest/) (vers. 4.56.0) [7] - [lxml](https://lxml.de/) (vers. 4.5.2) [8] - [openpyxl]() (vers. 3.0.9) [9] -3. Download the folder dexpi2graph_python. -4. Running the script *dexpi2graphML.py* starts the converter. + + or create a new conda environment via + ``` + conda env create --name envname --file=environment.yml + ``` +4. Running the script *dexpi2graphML-ad@TUDO.py* from main directory and starts the converter. ## How to Use: The *DEXPI2graphML converter* consists a graphical user interface (GUI) shown in Figure 2. diff --git a/dexpi2graph_python/dexpi2graphML-ad@TUDO.py b/dexpi2graph_python/dexpi2graphML-ad@TUDO.py index 82f25b0..e37abbe 100644 --- a/dexpi2graph_python/dexpi2graphML-ad@TUDO.py +++ b/dexpi2graph_python/dexpi2graphML-ad@TUDO.py @@ -93,7 +93,7 @@ window.FindElement('_output_').Update('') file = values['selected_plot'][0][:-4] error_file = './Output/errorLog/'+file+'_ErrorLog.xlsx' - error_df = pd.read_excel(error_file) + error_df = pd.read_excel(error_file, engine='openpyxl') for i in range(0, len(error_df)): print(error_df['Warning'][i]) print(error_df['Node(s)'][i]) diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000..00527ef --- /dev/null +++ b/environment.yml @@ -0,0 +1,73 @@ +channels: + - conda-forge + - defaults +dependencies: + - _libgcc_mutex=0.1=conda_forge + - _openmp_mutex=4.5=2_gnu + - blas=1.0=mkl + - ca-certificates=2023.05.30=h06a4308_0 + - certifi=2022.12.7=py37h06a4308_0 + - click=8.0.4=py37h06a4308_0 + - cycler=0.11.0=pyhd3eb1b0_0 + - decorator=5.1.1=pyhd3eb1b0_0 + - et_xmlfile=1.1.0=py37h06a4308_0 + - flit-core=3.6.0=pyhd3eb1b0_0 + - freetype=2.12.1=h4a9f257_0 + - icu=58.2=he6710b0_3 + - importlib-metadata=4.11.3=py37h06a4308_0 + - intel-openmp=2021.4.0=h06a4308_3561 + - joblib=1.1.1=py37h06a4308_0 + - jpeg=9e=h5eee18b_1 + - kiwisolver=1.4.4=py37h6a678d5_0 + - lcms2=2.12=h3be6417_0 + - ld_impl_linux-64=2.38=h1181459_1 + - libffi=3.4.4=h6a678d5_0 + - libgcc-ng=13.1.0=he5830b7_0 + - libgomp=13.1.0=he5830b7_0 + - libnsl=2.0.0=h5eee18b_0 + - libpng=1.6.39=h5eee18b_0 + - libstdcxx-ng=11.2.0=h1234567_1 + - libtiff=4.2.0=hecacb30_2 + - libwebp-base=1.2.4=h5eee18b_1 + - libxml2=2.10.3=hcbfbd50_0 + - libxslt=1.1.37=h2085143_0 + - libzlib=1.2.13=hd590300_5 + - lxml=4.5.2=py37he3881c9_1 + - lz4-c=1.9.4=h6a678d5_0 + - matplotlib=3.2.2=1 + - matplotlib-base=3.2.2=py37hef1b27d_0 + - mkl=2021.4.0=h06a4308_640 + - mkl-service=2.4.0=py37h7f8727e_0 + - mkl_fft=1.3.1=py37hd3c417c_0 + - mkl_random=1.2.2=py37h51133e4_0 + - ncurses=6.4=h6a678d5_0 + - networkx=2.4=py_1 + - nltk=3.5=pyhd8ed1ab_1 + - numpy=1.21.5=py37h6c91a56_3 + - numpy-base=1.21.5=py37ha15fc14_3 + - olefile=0.46=py37_0 + - openpyxl=3.0.9=pyhd8ed1ab_0 + - openssl=3.0.10=h7f8727e_0 + - pandas=1.0.5=py37h0da4684_0 + - pillow=7.2.0=py37h718be6c_2 + - pip=22.3.1=py37h06a4308_0 + - pyparsing=3.0.9=py37h06a4308_0 + - pysimplegui=4.56.0=pyhd8ed1ab_0 + - python=3.7.12=hf930737_100_cpython + - python-dateutil=2.8.2=pyhd3eb1b0_0 + - python_abi=3.7=3_cp37m + - pytz=2022.7=py37h06a4308_0 + - readline=8.2=h5eee18b_0 + - regex=2022.7.9=py37h5eee18b_0 + - setuptools=58.0.4=py37h06a4308_0 + - six=1.16.0=pyhd3eb1b0_1 + - sqlite=3.41.2=h5eee18b_0 + - tk=8.6.12=h1ccaba5_0 + - tornado=6.2=py37h5eee18b_0 + - tqdm=4.64.1=py37h06a4308_0 + - typing_extensions=4.4.0=py37h06a4308_0 + - wheel=0.38.4=py37h06a4308_0 + - xz=5.2.10=h5eee18b_1 + - zipp=3.11.0=py37h06a4308_0 + - zlib=1.2.13=hd590300_5 + - zstd=1.5.5=hc292b87_0 \ No newline at end of file From 980f500868aa9b7138c490c53a184c101a5a3f9f Mon Sep 17 00:00:00 2001 From: tonyzyl Date: Sat, 5 Aug 2023 10:46:08 +0800 Subject: [PATCH 2/3] update env --- environment.yml | 138 ++++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/environment.yml b/environment.yml index 00527ef..c74559c 100644 --- a/environment.yml +++ b/environment.yml @@ -2,72 +2,72 @@ channels: - conda-forge - defaults dependencies: - - _libgcc_mutex=0.1=conda_forge - - _openmp_mutex=4.5=2_gnu - - blas=1.0=mkl - - ca-certificates=2023.05.30=h06a4308_0 - - certifi=2022.12.7=py37h06a4308_0 - - click=8.0.4=py37h06a4308_0 - - cycler=0.11.0=pyhd3eb1b0_0 - - decorator=5.1.1=pyhd3eb1b0_0 - - et_xmlfile=1.1.0=py37h06a4308_0 - - flit-core=3.6.0=pyhd3eb1b0_0 - - freetype=2.12.1=h4a9f257_0 - - icu=58.2=he6710b0_3 - - importlib-metadata=4.11.3=py37h06a4308_0 - - intel-openmp=2021.4.0=h06a4308_3561 - - joblib=1.1.1=py37h06a4308_0 - - jpeg=9e=h5eee18b_1 - - kiwisolver=1.4.4=py37h6a678d5_0 - - lcms2=2.12=h3be6417_0 - - ld_impl_linux-64=2.38=h1181459_1 - - libffi=3.4.4=h6a678d5_0 - - libgcc-ng=13.1.0=he5830b7_0 - - libgomp=13.1.0=he5830b7_0 - - libnsl=2.0.0=h5eee18b_0 - - libpng=1.6.39=h5eee18b_0 - - libstdcxx-ng=11.2.0=h1234567_1 - - libtiff=4.2.0=hecacb30_2 - - libwebp-base=1.2.4=h5eee18b_1 - - libxml2=2.10.3=hcbfbd50_0 - - libxslt=1.1.37=h2085143_0 - - libzlib=1.2.13=hd590300_5 - - lxml=4.5.2=py37he3881c9_1 - - lz4-c=1.9.4=h6a678d5_0 - - matplotlib=3.2.2=1 - - matplotlib-base=3.2.2=py37hef1b27d_0 - - mkl=2021.4.0=h06a4308_640 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.1=py37hd3c417c_0 - - mkl_random=1.2.2=py37h51133e4_0 - - ncurses=6.4=h6a678d5_0 - - networkx=2.4=py_1 - - nltk=3.5=pyhd8ed1ab_1 - - numpy=1.21.5=py37h6c91a56_3 - - numpy-base=1.21.5=py37ha15fc14_3 - - olefile=0.46=py37_0 - - openpyxl=3.0.9=pyhd8ed1ab_0 - - openssl=3.0.10=h7f8727e_0 - - pandas=1.0.5=py37h0da4684_0 - - pillow=7.2.0=py37h718be6c_2 - - pip=22.3.1=py37h06a4308_0 - - pyparsing=3.0.9=py37h06a4308_0 - - pysimplegui=4.56.0=pyhd8ed1ab_0 - - python=3.7.12=hf930737_100_cpython - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python_abi=3.7=3_cp37m - - pytz=2022.7=py37h06a4308_0 - - readline=8.2=h5eee18b_0 - - regex=2022.7.9=py37h5eee18b_0 - - setuptools=58.0.4=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_1 - - sqlite=3.41.2=h5eee18b_0 - - tk=8.6.12=h1ccaba5_0 - - tornado=6.2=py37h5eee18b_0 - - tqdm=4.64.1=py37h06a4308_0 - - typing_extensions=4.4.0=py37h06a4308_0 - - wheel=0.38.4=py37h06a4308_0 - - xz=5.2.10=h5eee18b_1 - - zipp=3.11.0=py37h06a4308_0 - - zlib=1.2.13=hd590300_5 - - zstd=1.5.5=hc292b87_0 \ No newline at end of file + - _libgcc_mutex=0.1 + - _openmp_mutex=4.5 + - blas=1.0 + - ca-certificates=2023.05.30 + - certifi=2022.12.7 + - click=8.0.4 + - cycler=0.11.0 + - decorator=5.1.1 + - et_xmlfile=1.1.0 + - flit-core=3.6.0 + - freetype=2.12.1 + - icu=58.2 + - importlib-metadata=4.11.3 + - intel-openmp=2021.4.0 + - joblib=1.1.1 + - jpeg=9e + - kiwisolver=1.4.4 + - lcms2=2.12 + - ld_impl_linux-64=2.38 + - libffi=3.4.4 + - libgcc-ng=13.1.0 + - libgomp=13.1.0 + - libnsl=2.0.0 + - libpng=1.6.39 + - libstdcxx-ng=11.2.0 + - libtiff=4.2.0 + - libwebp-base=1.2.4 + - libxml2=2.10.3 + - libxslt=1.1.37 + - libzlib=1.2.13 + - lxml=4.5.2 + - lz4-c=1.9.4 + - matplotlib=3.2.2 + - matplotlib-base=3.2.2 + - mkl=2021.4.0 + - mkl-service=2.4.0 + - mkl_fft=1.3.1 + - mkl_random=1.2.2 + - ncurses=6.4 + - networkx=2.4 + - nltk=3.5 + - numpy=1.21.5 + - numpy-base=1.21.5 + - olefile=0.46 + - openpyxl=3.0.9 + - openssl=3.0.10 + - pandas=1.0.5 + - pillow=7.2.0 + - pip=22.3.1 + - pyparsing=3.0.9 + - pysimplegui=4.56.0 + - python=3.7.12 + - python-dateutil=2.8.2 + - python_abi=3.7 + - pytz=2022.7 + - readline=8.2 + - regex=2022.7.9 + - setuptools=58.0.4 + - six=1.16.0 + - sqlite=3.41.2 + - tk=8.6.12 + - tornado=6.2 + - tqdm=4.64.1 + - typing_extensions=4.4.0 + - wheel=0.38.4 + - xz=5.2.10 + - zipp=3.11.0 + - zlib=1.2.13 + - zstd=1.5.5 \ No newline at end of file From c01b117df2cf9a7fdb66dcd662add17902995800 Mon Sep 17 00:00:00 2001 From: tonyzyl Date: Sat, 5 Aug 2023 11:31:51 +0800 Subject: [PATCH 3/3] update env --- environment.yml | 70 ++++--------------------------------------------- 1 file changed, 5 insertions(+), 65 deletions(-) diff --git a/environment.yml b/environment.yml index c74559c..5470947 100644 --- a/environment.yml +++ b/environment.yml @@ -2,72 +2,12 @@ channels: - conda-forge - defaults dependencies: - - _libgcc_mutex=0.1 - - _openmp_mutex=4.5 - - blas=1.0 - - ca-certificates=2023.05.30 - - certifi=2022.12.7 - - click=8.0.4 - - cycler=0.11.0 - - decorator=5.1.1 - - et_xmlfile=1.1.0 - - flit-core=3.6.0 - - freetype=2.12.1 - - icu=58.2 - - importlib-metadata=4.11.3 - - intel-openmp=2021.4.0 - - joblib=1.1.1 - - jpeg=9e - - kiwisolver=1.4.4 - - lcms2=2.12 - - ld_impl_linux-64=2.38 - - libffi=3.4.4 - - libgcc-ng=13.1.0 - - libgomp=13.1.0 - - libnsl=2.0.0 - - libpng=1.6.39 - - libstdcxx-ng=11.2.0 - - libtiff=4.2.0 - - libwebp-base=1.2.4 - - libxml2=2.10.3 - - libxslt=1.1.37 - - libzlib=1.2.13 - - lxml=4.5.2 - - lz4-c=1.9.4 - - matplotlib=3.2.2 - - matplotlib-base=3.2.2 - - mkl=2021.4.0 - - mkl-service=2.4.0 - - mkl_fft=1.3.1 - - mkl_random=1.2.2 - - ncurses=6.4 + - python=3.7 - networkx=2.4 - - nltk=3.5 - - numpy=1.21.5 - - numpy-base=1.21.5 - - olefile=0.46 - - openpyxl=3.0.9 - - openssl=3.0.10 + - matplotlib=3.2.2 - pandas=1.0.5 + - nltk=3.5 - pillow=7.2.0 - - pip=22.3.1 - - pyparsing=3.0.9 - pysimplegui=4.56.0 - - python=3.7.12 - - python-dateutil=2.8.2 - - python_abi=3.7 - - pytz=2022.7 - - readline=8.2 - - regex=2022.7.9 - - setuptools=58.0.4 - - six=1.16.0 - - sqlite=3.41.2 - - tk=8.6.12 - - tornado=6.2 - - tqdm=4.64.1 - - typing_extensions=4.4.0 - - wheel=0.38.4 - - xz=5.2.10 - - zipp=3.11.0 - - zlib=1.2.13 - - zstd=1.5.5 \ No newline at end of file + - lxml=4.5.2 + - openpyxl=3.0.9