Skip to content

Commit

Permalink
Merge 4632c27 into 4e49f07
Browse files Browse the repository at this point in the history
  • Loading branch information
ExcaliburZero committed Jun 28, 2020
2 parents 4e49f07 + 4632c27 commit 834bc1c
Show file tree
Hide file tree
Showing 10 changed files with 290 additions and 290 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: python
python:
- "3.5"
- "3.5-dev"
- "3.6"
- "3.6-dev"
- "3.7"
- "3.8"
- "3.8-dev"

install:
- pip install coveralls
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
include_package_data=True,
package_data={
'': 'LICENSE'
'': ['LICENSE']
},

classifiers=[
Expand Down
80 changes: 40 additions & 40 deletions test/expected/test_plot_file.obj
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
o data
v 0.0882604523489 -0.65464110699 -0.662800648276
v 0.0882604523489 -0.65464110699 -0.462800648276
v -0.111739547651 -0.65464110699 -0.462800648276
v -0.111739547651 -0.65464110699 -0.662800648276
v 0.0882604523489 -0.45464110699 -0.662800648276
v 0.0882604523489 -0.45464110699 -0.462800648276
v -0.111739547651 -0.45464110699 -0.462800648276
v -0.111739547651 -0.45464110699 -0.662800648276
v 0.08826045234892675 -0.6546411069897778 -0.6628006482763701
v 0.08826045234892675 -0.6546411069897778 -0.46280064827637013
v -0.11173954765107326 -0.6546411069897778 -0.46280064827637013
v -0.11173954765107326 -0.6546411069897778 -0.6628006482763701
v 0.08826045234892675 -0.4546411069897779 -0.6628006482763701
v 0.08826045234892675 -0.4546411069897779 -0.46280064827637013
v -0.11173954765107326 -0.4546411069897779 -0.46280064827637013
v -0.11173954765107326 -0.4546411069897779 -0.6628006482763701
f 1 2 3 4
f 5 8 7 6
f 1 5 6 2
f 2 6 7 3
f 3 7 8 4
f 5 1 4 8
v 0.146958190604 -0.180277002327 -0.0765499729885
v 0.146958190604 -0.180277002327 0.123450027012
v -0.0530418093957 -0.180277002327 0.123450027012
v -0.0530418093957 -0.180277002327 -0.0765499729885
v 0.146958190604 0.0197229976725 -0.0765499729885
v 0.146958190604 0.0197229976725 0.123450027012
v -0.0530418093957 0.0197229976725 0.123450027012
v -0.0530418093957 0.0197229976725 -0.0765499729885
v 0.14695819060429294 -0.18027700232746807 -0.07654997298848457
v 0.14695819060429294 -0.18027700232746807 0.12345002701151545
v -0.053041809395707074 -0.18027700232746807 0.12345002701151545
v -0.053041809395707074 -0.18027700232746807 -0.07654997298848457
v 0.14695819060429294 0.01972299767253194 -0.07654997298848457
v 0.14695819060429294 0.01972299767253194 0.12345002701151545
v -0.053041809395707074 0.01972299767253194 0.12345002701151545
v -0.053041809395707074 0.01972299767253194 -0.07654997298848457
f 9 10 11 12
f 13 16 15 14
f 9 13 14 10
f 10 14 15 11
f 11 15 16 12
f 13 9 12 16
v 0.968726526179 0.440045288385 -0.633488114512
v 0.968726526179 0.440045288385 -0.433488114512
v 0.768726526179 0.440045288385 -0.433488114512
v 0.768726526179 0.440045288385 -0.633488114512
v 0.968726526179 0.640045288385 -0.633488114512
v 0.968726526179 0.640045288385 -0.433488114512
v 0.768726526179 0.640045288385 -0.433488114512
v 0.768726526179 0.640045288385 -0.633488114512
v 0.9687265261794196 0.4400452883847834 -0.6334881145119758
v 0.9687265261794196 0.4400452883847834 -0.4334881145119759
v 0.7687265261794196 0.4400452883847834 -0.4334881145119759
v 0.7687265261794196 0.4400452883847834 -0.6334881145119758
v 0.9687265261794196 0.6400452883847834 -0.6334881145119758
v 0.9687265261794196 0.6400452883847834 -0.4334881145119759
v 0.7687265261794196 0.6400452883847834 -0.4334881145119759
v 0.7687265261794196 0.6400452883847834 -0.6334881145119758
f 17 18 19 20
f 21 24 23 22
f 17 21 22 18
f 18 22 23 19
f 19 23 24 20
f 21 17 20 24
v -0.55741466846 -0.618151560477 0.24588789842
v -0.55741466846 -0.618151560477 0.44588789842
v -0.75741466846 -0.618151560477 0.44588789842
v -0.75741466846 -0.618151560477 0.24588789842
v -0.55741466846 -0.418151560477 0.24588789842
v -0.55741466846 -0.418151560477 0.44588789842
v -0.75741466846 -0.418151560477 0.44588789842
v -0.75741466846 -0.418151560477 0.24588789842
v -0.5574146684601015 -0.6181515604772925 0.24588789841985234
v -0.5574146684601015 -0.6181515604772925 0.4458878984198523
v -0.7574146684601014 -0.6181515604772925 0.4458878984198523
v -0.7574146684601014 -0.6181515604772925 0.24588789841985234
v -0.5574146684601015 -0.4181515604772925 0.24588789841985234
v -0.5574146684601015 -0.4181515604772925 0.4458878984198523
v -0.7574146684601014 -0.4181515604772925 0.4458878984198523
v -0.7574146684601014 -0.4181515604772925 0.24588789841985234
f 25 26 27 28
f 29 32 31 30
f 25 29 30 26
f 26 30 31 27
f 27 31 32 28
f 29 25 28 32
v -0.146530500673 0.51302438141 0.626950837357
v -0.146530500673 0.51302438141 0.826950837357
v -0.346530500673 0.51302438141 0.826950837357
v -0.346530500673 0.51302438141 0.626950837357
v -0.146530500673 0.71302438141 0.626950837357
v -0.146530500673 0.71302438141 0.826950837357
v -0.346530500673 0.71302438141 0.826950837357
v -0.346530500673 0.71302438141 0.626950837357
v -0.14653050067253803 0.5130243814097543 0.6269508373569782
v -0.14653050067253803 0.5130243814097543 0.8269508373569782
v -0.34653050067253804 0.5130243814097543 0.8269508373569782
v -0.34653050067253804 0.5130243814097543 0.6269508373569782
v -0.14653050067253803 0.7130243814097542 0.6269508373569782
v -0.14653050067253803 0.7130243814097542 0.8269508373569782
v -0.34653050067253804 0.7130243814097542 0.8269508373569782
v -0.34653050067253804 0.7130243814097542 0.6269508373569782
f 33 34 35 36
f 37 40 39 38
f 33 37 38 34
Expand Down
64 changes: 32 additions & 32 deletions test/expected/test_plot_file_category.obj
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
o A
v 0.032283877689 -0.554405811625 -0.596342306409
v 0.032283877689 -0.554405811625 -0.396342306409
v -0.167716122311 -0.554405811625 -0.396342306409
v -0.167716122311 -0.554405811625 -0.596342306409
v 0.032283877689 -0.354405811625 -0.596342306409
v 0.032283877689 -0.354405811625 -0.396342306409
v -0.167716122311 -0.354405811625 -0.396342306409
v -0.167716122311 -0.354405811625 -0.596342306409
v 0.03228387768901421 -0.5544058116246152 -0.5963423064087884
v 0.03228387768901421 -0.5544058116246152 -0.3963423064087884
v -0.16771612231098582 -0.5544058116246152 -0.3963423064087884
v -0.16771612231098582 -0.5544058116246152 -0.5963423064087884
v 0.03228387768901421 -0.35440581162461515 -0.5963423064087884
v 0.03228387768901421 -0.35440581162461515 -0.3963423064087884
v -0.16771612231098582 -0.35440581162461515 -0.3963423064087884
v -0.16771612231098582 -0.35440581162461515 -0.5963423064087884
f 1 2 3 4
f 5 8 7 6
f 1 5 6 2
f 2 6 7 3
f 3 7 8 4
f 5 1 4 8
v 0.0864567755378 -0.0173807615228 0.167261241912
v 0.0864567755378 -0.0173807615228 0.367261241912
v -0.113543224462 -0.0173807615228 0.367261241912
v -0.113543224462 -0.0173807615228 0.167261241912
v 0.0864567755378 0.182619238477 0.167261241912
v 0.0864567755378 0.182619238477 0.367261241912
v -0.113543224462 0.182619238477 0.367261241912
v -0.113543224462 0.182619238477 0.167261241912
v 0.08645677553780283 -0.017380761522797356 0.1672612419124241
v 0.08645677553780283 -0.017380761522797356 0.36726124191242415
v -0.11354322446219718 -0.017380761522797356 0.36726124191242415
v -0.11354322446219718 -0.017380761522797356 0.1672612419124241
v 0.08645677553780283 0.18261923847720266 0.1672612419124241
v 0.08645677553780283 0.18261923847720266 0.36726124191242415
v -0.11354322446219718 0.18261923847720266 0.36726124191242415
v -0.11354322446219718 0.18261923847720266 0.1672612419124241
f 9 10 11 12
f 13 16 15 14
f 9 13 14 10
f 10 14 15 11
f 11 15 16 12
f 13 9 12 16
o B
v 0.844877345421 0.684882765533 -0.558162128993
v 0.844877345421 0.684882765533 -0.358162128993
v 0.644877345421 0.684882765533 -0.358162128993
v 0.644877345421 0.684882765533 -0.558162128993
v 0.844877345421 0.884882765533 -0.558162128993
v 0.844877345421 0.884882765533 -0.358162128993
v 0.644877345421 0.884882765533 -0.358162128993
v 0.644877345421 0.884882765533 -0.558162128993
v 0.8448773454208438 0.6848827655334262 -0.558162128992728
v 0.8448773454208438 0.6848827655334262 -0.3581621289927279
v 0.6448773454208439 0.6848827655334262 -0.3581621289927279
v 0.6448773454208439 0.6848827655334262 -0.558162128992728
v 0.8448773454208438 0.8848827655334262 -0.558162128992728
v 0.8448773454208438 0.8848827655334262 -0.3581621289927279
v 0.6448773454208439 0.8848827655334262 -0.3581621289927279
v 0.6448773454208439 0.8848827655334262 -0.558162128992728
f 17 18 19 20
f 21 24 23 22
f 17 21 22 18
f 18 22 23 19
f 19 23 24 20
f 21 17 20 24
o C
v -0.563617998648 -0.513096192386 0.587243193489
v -0.563617998648 -0.513096192386 0.787243193489
v -0.763617998648 -0.513096192386 0.787243193489
v -0.763617998648 -0.513096192386 0.587243193489
v -0.563617998648 -0.313096192386 0.587243193489
v -0.563617998648 -0.313096192386 0.787243193489
v -0.763617998648 -0.313096192386 0.787243193489
v -0.763617998648 -0.313096192386 0.587243193489
v -0.5636179986476609 -0.5130961923860138 0.5872431934890909
v -0.5636179986476609 -0.5130961923860138 0.7872431934890909
v -0.7636179986476609 -0.5130961923860138 0.7872431934890909
v -0.7636179986476609 -0.5130961923860138 0.5872431934890909
v -0.5636179986476609 -0.3130961923860138 0.5872431934890909
v -0.5636179986476609 -0.3130961923860138 0.7872431934890909
v -0.7636179986476609 -0.3130961923860138 0.7872431934890909
v -0.7636179986476609 -0.3130961923860138 0.5872431934890909
f 25 26 27 28
f 29 32 31 30
f 25 29 30 26
Expand Down
72 changes: 36 additions & 36 deletions test/expected/test_plot_file_scale_function_maxabs_scale.obj
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
o data
v 0.225 0.119298245614 0.241726618705
v 0.225 0.119298245614 0.441726618705
v 0.025 0.119298245614 0.441726618705
v 0.025 0.119298245614 0.241726618705
v 0.225 0.319298245614 0.241726618705
v 0.225 0.319298245614 0.441726618705
v 0.025 0.319298245614 0.441726618705
v 0.025 0.319298245614 0.241726618705
v 0.225 0.11929824561403507 0.24172661870503595
v 0.225 0.11929824561403507 0.44172661870503593
v 0.024999999999999994 0.11929824561403507 0.44172661870503593
v 0.024999999999999994 0.11929824561403507 0.24172661870503595
v 0.225 0.3192982456140351 0.24172661870503595
v 0.225 0.3192982456140351 0.44172661870503593
v 0.024999999999999994 0.3192982456140351 0.44172661870503593
v 0.024999999999999994 0.3192982456140351 0.24172661870503595
f 1 2 3 4
f 5 8 7 6
f 1 5 6 2
f 2 6 7 3
f 3 7 8 4
f 5 1 4 8
v 0.25 0.233333333333 0.313669064748
v 0.25 0.233333333333 0.513669064748
v 0.05 0.233333333333 0.513669064748
v 0.05 0.233333333333 0.313669064748
v 0.25 0.433333333333 0.313669064748
v 0.25 0.433333333333 0.513669064748
v 0.05 0.433333333333 0.513669064748
v 0.05 0.433333333333 0.313669064748
v 0.25 0.2333333333333333 0.31366906474820144
v 0.25 0.2333333333333333 0.5136690647482014
v 0.04999999999999999 0.2333333333333333 0.5136690647482014
v 0.04999999999999999 0.2333333333333333 0.31366906474820144
v 0.25 0.43333333333333335 0.31366906474820144
v 0.25 0.43333333333333335 0.5136690647482014
v 0.04999999999999999 0.43333333333333335 0.5136690647482014
v 0.04999999999999999 0.43333333333333335 0.31366906474820144
f 9 10 11 12
f 13 16 15 14
f 9 13 14 10
f 10 14 15 11
f 11 15 16 12
f 13 9 12 16
v 0.6 0.382456140351 0.245323741007
v 0.6 0.382456140351 0.445323741007
v 0.4 0.382456140351 0.445323741007
v 0.4 0.382456140351 0.245323741007
v 0.6 0.582456140351 0.245323741007
v 0.6 0.582456140351 0.445323741007
v 0.4 0.582456140351 0.445323741007
v 0.4 0.582456140351 0.245323741007
v 0.6 0.38245614035087716 0.2453237410071942
v 0.6 0.38245614035087716 0.4453237410071942
v 0.4 0.38245614035087716 0.4453237410071942
v 0.4 0.38245614035087716 0.2453237410071942
v 0.6 0.5824561403508772 0.2453237410071942
v 0.6 0.5824561403508772 0.4453237410071942
v 0.4 0.5824561403508772 0.4453237410071942
v 0.4 0.5824561403508772 0.2453237410071942
f 17 18 19 20
f 21 24 23 22
f 17 21 22 18
f 18 22 23 19
f 19 23 24 20
f 21 17 20 24
v -0.05 0.128070175439 0.353237410072
v -0.05 0.128070175439 0.553237410072
v -0.25 0.128070175439 0.553237410072
v -0.25 0.128070175439 0.353237410072
v -0.05 0.328070175439 0.353237410072
v -0.05 0.328070175439 0.553237410072
v -0.25 0.328070175439 0.553237410072
v -0.25 0.328070175439 0.353237410072
v -0.04999999999999999 0.12807017543859647 0.3532374100719424
v -0.04999999999999999 0.12807017543859647 0.5532374100719424
v -0.25 0.12807017543859647 0.5532374100719424
v -0.25 0.12807017543859647 0.3532374100719424
v -0.04999999999999999 0.3280701754385965 0.3532374100719424
v -0.04999999999999999 0.3280701754385965 0.5532374100719424
v -0.25 0.3280701754385965 0.5532374100719424
v -0.25 0.3280701754385965 0.3532374100719424
f 25 26 27 28
f 29 32 31 30
f 25 29 30 26
Expand All @@ -57,12 +57,12 @@ f 27 31 32 28
f 29 25 28 32
v 0.125 0.4 0.4
v 0.125 0.4 0.6
v -0.075 0.4 0.6
v -0.075 0.4 0.4
v -0.07500000000000001 0.4 0.6
v -0.07500000000000001 0.4 0.4
v 0.125 0.6 0.4
v 0.125 0.6 0.6
v -0.075 0.6 0.6
v -0.075 0.6 0.4
v -0.07500000000000001 0.6 0.6
v -0.07500000000000001 0.6 0.4
f 33 34 35 36
f 37 40 39 38
f 33 37 38 34
Expand Down

0 comments on commit 834bc1c

Please sign in to comment.