Skip to content

Commit 337bb38

Browse files
committed
Merge branch 'developement'
2 parents 09e9a16 + 7c27755 commit 337bb38

26 files changed

+1445
-378
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,7 @@ logo*
145145

146146
test.py
147147

148-
hasher.py
148+
hasher.py
149+
150+
# ignore my issues test scripts
151+
issue*.py

.readthedocs.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
# Required
5+
version: 2
6+
7+
# Set the OS, Python version and other tools you might need
8+
build:
9+
os: ubuntu-22.04
10+
tools:
11+
python: "3.11"
12+
13+
# Build documentation in the "docs/" directory with Sphinx
14+
sphinx:
15+
configuration: docs/conf.py
16+
17+
# Optionally build your docs in additional formats such as PDF and ePub
18+
# formats:
19+
# - pdf
20+
# - epub
21+
22+
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
23+
python:
24+
install:
25+
- requirements: requirements/requirements-dev.txt

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## 0.6.1
4+
5+
* Added human modelling classes SWKHmiWorkbench and SWKHumanCatalog. Please note these are not documented in the CATIA
6+
V5 Basic Help file. Example of usage also added.
7+
* Added new class method Application.input_box(). @ptm-tm
8+
* fixed test issue with cat materials where catia env has multiple start-up paths.
9+
* fixed issue with HybridShapeFactory.add_new_sphere for cases where an axis isn't defined.
10+
* fixes to RenderingMaterials class methods. @deloarts
11+
* added new enum type geometrical_feature_type to support HybridShapeFactory.get_geometrical_feature_type().
12+
313
## 0.6.0
414

515
* Removed deprecated method Product.get_products() use Product.products instead.

CONTRIBUTORS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ Mithro86
1919
ptm-tm
2020

2121
marciolrc
22+
23+
whatDdev

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __getattr__(cls, name):
3636
author = 'Paul Bourne'
3737

3838
# The short X.Y version
39-
version = '0.6.0'
39+
version = '0.6.1'
4040
# The full version, including alpha/beta/rc tags
4141
release = version
4242

docs/examples.rst

Lines changed: 80 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Index
1414

1515
:ref:`DRAFTING EXAMPLES<Example Drafting>`
1616

17+
:ref:`HUMAN MODELLING EXAMPLES<Example Human Modelling>`
18+
1719
:ref:`HYBRID BODIES EXAMPLES<Example Hybrid Bodies>`
1820

1921
:ref:`HYBRID SHAPE FACTORY EXAMPLES<Example Hybrid Shape Factory>`
@@ -22,6 +24,8 @@ Index
2224

2325
:ref:`HYBRID SKETCH & SHAPE FACTORY EXAMPLES<Example Hybrid Sketch Factory & Shape Factory>`
2426

27+
:ref:`INERTIA EXAMPLES<Example Inertia>`
28+
2529
:ref:`LICENSE SETTINGS EXAMPLES<Example License Settings>`
2630

2731
:ref:`LOGGING EXAMPLES<Example Logging>`
@@ -68,6 +72,7 @@ pathlib.Path module.
6872
`Asssembly Convetor - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__assembly_convetor__001.py>`_
6973

7074

75+
7176
.. _Example Bom Custom:
7277

7378
BOM CUSTOM EXAMPLES
@@ -81,6 +86,7 @@ Write the contents of a product to a html file.
8186
`BOM Custom - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__bom_custom_001.py>`_
8287

8388

89+
8490
.. _Example Constraints:
8591

8692
CONSTRAINTS EXAMPLES
@@ -95,6 +101,7 @@ also show further usage of constraints.
95101
`Constraints - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__constraints_001.py>`_
96102

97103

104+
98105
.. _Example Document:
99106

100107
DOCUMENT EXAMPLES
@@ -126,6 +133,7 @@ Close a catia file.
126133
`Document - 003 <https://github.com/evereux/pycatia/blob/master/examples/example__document__003.py>`_
127134

128135

136+
129137
.. _Example Drafting:
130138

131139
DRAFTING EXAMPLES
@@ -142,6 +150,21 @@ Drafting: create a border template in the background view of the currently opene
142150
`Drafting - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__drafting__001.py>`_
143151

144152

153+
154+
.. _Example Human Modelling:
155+
156+
HUMAN MODELLING EXAMPLES
157+
------------------------
158+
159+
Human Modelling - Example 1
160+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
161+
162+
Add a female manikin to the product in the sitting position.
163+
164+
`Human Modelling - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__human_modelling__001.py>`_
165+
166+
167+
145168
.. _Example Hybrid Bodies:
146169

147170
HYBRID BODIES EXAMPLES
@@ -155,6 +178,7 @@ Make body in work object and intersect with another body.
155178
`Hybrid Bodies - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__hybrid_bodies__001.py>`_
156179

157180

181+
158182
.. _Example Hybrid Shape Factory:
159183

160184
HYBRID SHAPE FACTORY EXAMPLES
@@ -215,6 +239,18 @@ origin ZX plane.
215239
`Hybrid Shape Factory - 005 <https://github.com/evereux/pycatia/blob/master/examples/example__hybrid_shape_factory__005.py>`_
216240

217241

242+
Hybrid Shape Factory - Example 6
243+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
244+
245+
How to add a new sphere when a reference axis system isn't required.
246+
247+
Requirements: A geometrical set named "ConstructionGeometry". A point within the ConstructionGeometry named "Point.1".
248+
249+
`Hybrid Shape Factory - 006 <https://github.com/evereux/pycatia/blob/master/examples/example__hybrid_shape_factory__006.py>`_
250+
251+
252+
253+
218254
.. _Example Hybrid Shape Factory & Shape Factory:
219255

220256
HYBRID SHAPE FACTORY & SHAPE FACTORY EXAMPLES
@@ -228,6 +264,7 @@ Hybrid Shape Factory & Shape Factory - Example 1
228264
`Hybrid Shape Factory & Shape Factory - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__hybrid_shape_factory__shape_factory__001.py>`_
229265

230266

267+
231268
.. _Example Hybrid Sketch Factory & Shape Factory:
232269

233270
HYBRID SKETCH & SHAPE FACTORY EXAMPLES
@@ -242,6 +279,21 @@ Creates a square in a sketch and fully constrains it. Sketch then used to pad.
242279
`Hybrid Sketch & Shape Factory - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__hybrid_sketch__shape_factory__001.py>`_
243280

244281

282+
283+
.. _Example Inertia:
284+
285+
INERTIA EXAMPLES
286+
----------------
287+
288+
Inertia - Example 1
289+
~~~~~~~~~~~~~~~~~~~
290+
291+
Measure Inertia of MainBody in CATPArt.
292+
293+
`Inertia - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__inertia__001.py>`_
294+
295+
296+
245297
.. _Example License Settings:
246298

247299
LICENSE SETTINGS EXAMPLES
@@ -255,6 +307,7 @@ Basic license checking.
255307
`License Settings - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__license_settings__001.py>`_
256308

257309

310+
258311
.. _Example Logging:
259312

260313
LOGGING EXAMPLES
@@ -268,6 +321,7 @@ Logging.
268321
`Logging - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__logging__001.py>`_
269322

270323

324+
271325
.. _Example Material Interfaces:
272326

273327
MATERIAL INTERFACES EXAMPLES
@@ -288,6 +342,7 @@ Creates a new product and applies the material to it.
288342
`Material - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__material__001.py>`_
289343

290344

345+
291346
.. _Example Message Box:
292347

293348
MESSAGE BOX EXAMPLES
@@ -301,6 +356,7 @@ This creates a message box with the buttons abort, retry ignore and displays the
301356
`Message Box - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__message_box__001.py>`_
302357

303358

359+
304360
.. _Example Parameters:
305361

306362
PARAMETERS EXAMPLES
@@ -317,6 +373,15 @@ each parameter along with its name, value and its associated parameter set.
317373
`Parameters - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__parameters__001.py>`_
318374

319375

376+
Parameters - Example 2
377+
~~~~~~~~~~~~~~~~~~~~~~
378+
379+
Change the Length value of parameter named Thickness.
380+
381+
`Parameters - 002 <https://github.com/evereux/pycatia/blob/master/examples/example__parameters__002.py>`_
382+
383+
384+
320385
.. _Example Product:
321386

322387
PRODUCT EXAMPLES
@@ -377,6 +442,7 @@ Get the Inertia of a product using product.get_technical object and print it's m
377442
`Product - 006 <https://github.com/evereux/pycatia/blob/master/examples/example__product__006.py>`_
378443

379444

445+
380446
.. _Example Selection:
381447

382448
SELECTION EXAMPLES
@@ -398,13 +464,21 @@ Prompt the user to select a product and get it's bounding box parameters
398464

399465

400466
Selection - Example 2
401-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
467+
~~~~~~~~~~~~~~~~~~~~~
402468

403469
Usage of the Selection.select_element2 class method which accepts two selection inputs.
404470

405471
`Selection - 002 <https://github.com/evereux/pycatia/blob/master/examples/example__selection__002.py>`_
406472

407473

474+
Selection - Example 3
475+
~~~~~~~~~~~~~~~~~~~~~
476+
477+
Usage of the Selection.select_element2 to select a geometrical feature and report it's properties in a message window.
478+
479+
`Selection - 003 <https://github.com/evereux/pycatia/blob/master/examples/example__selection__003.py>`_
480+
481+
408482

409483
.. _Example Shape Factory:
410484

@@ -428,6 +502,7 @@ Mirror the main body of the part using shape_factory.add_new_symmetry_2.
428502
`Shape Factory - 002 <https://github.com/evereux/pycatia/blob/master/examples/example__shape_factory__002.py>`_
429503

430504

505+
431506
.. _Example Space Analysis:
432507

433508

@@ -458,11 +533,12 @@ Find all points in the CATPart and print to console and export to csv.
458533
`Example 3 <https://github.com/evereux/pycatia/blob/master/examples/example__space_analysis__003.py>`_
459534

460535

461-
SPECS AND GEOMETRY WINDOW EXAMPLES
462-
----------------------------------
463536

464537
.. _Example Specs And Geometry Window:
465538

539+
SPECS AND GEOMETRY WINDOW EXAMPLES
540+
----------------------------------
541+
466542
Specs And Geometry Window - Example 1
467543
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
468544

@@ -475,6 +551,7 @@ capture and then turned back on.
475551
`Specs And Geometry Window - 001 <https://github.com/evereux/pycatia/blob/master/examples/example__specs_and_geom_window__001.py>`_
476552

477553

554+
478555
.. _Example Visual Properties:
479556

480557
VISUAL PROPERTIES EXAMPLES

docs/installation.rst

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,36 @@ The Short Version
1414
This assumes python 3.9 or later is already installed and you know how and
1515
when (all the time really) to use `virtual environments <https://docs.python.org/3/tutorial/venv.html>`_.
1616

17+
You can either install pycatia from pypi.org using `pip install` or clone the repository from github.
18+
19+
Do not do both within the same folder structure.
20+
21+
pypi
22+
~~~~
23+
1724
To install from `pypi <https://pypi.org/>`_::
1825

1926
pip install pycatia
2027

28+
To upgrade your current installed version::
29+
30+
pip install pycatia --upgrade
31+
32+
github
33+
~~~~~~
2134

2235
To get the latest master version from github::
2336

2437
git clone https://github.com/evereux/pycatia.git
38+
# change directory into cloned project
39+
cd pycatia
40+
# install the python virtual env
41+
python -m virtualenv env
42+
# activate the virtual env
43+
env\Scripts\activate
2544
# install the pycatia requirements
2645
pip install -r requirements\requirements.txt
2746

28-
To upgrade your current installed version::
29-
30-
pip install pycatia --upgrade
31-
3247

3348
The Long Version
3449
----------------
@@ -74,7 +89,7 @@ environment away from the python installation itself.
7489

7590
* Activate the virtual environment::
7691

77-
env\Scripts\Activate
92+
env\Scripts\activate
7893

7994

8095
You should see the command prompt change to something like this::

0 commit comments

Comments
 (0)