CQ-editor 0.3.dev0__tar.gz → 0.4.0__tar.gz

{cq_editor-0.3.dev0 → cq_editor-0.4.0}/CQ_editor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: CQ-editor
-Version: 0.3.dev0
+Version: 0.4.0
 Summary: CadQuery plugin to create a mesh of an assembly with corresponding data
 Author: CadQuery Developers
 Maintainer: CadQuery Developers
@@ -216,11 +216,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cadquery
 Requires-Dist: pyqtgraph
-Requires-Dist: spyder==5
+Requires-Dist: spyder<6,>=5.5.6
 Requires-Dist: path
 Requires-Dist: logbook
 Requires-Dist: requests
-Requires-Dist: qtconsole==5.4.1
+Requires-Dist: qtconsole<5.6.0,>=5.5.1
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pluggy; extra == "test"
@@ -259,10 +259,6 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
 
 ## Installation - Pre-Built Packages (Recommended)
 
-~~### Release Packages~~
-
-~~Stable release builds which do not require Anaconda are attached to the [latest release](https://github.com/CadQuery/CQ-editor/releases). Download installer for your operating system, extract it, and run the CQ-editor script for your OS (CQ-editor.cmd for Windows, CQ-editor.sh for Linux and MacOS). On Windows you should be able to simply double-click on CQ-editor.cmd. On Linux and MacOS you may need to make the script executable with `chmod +x CQ-editor.sh` and run the script from the command line. The script contains an environment variable export that may be required to get CQ-editor to launch correctly on MacOS Big Sur, so it is better to use the script than to launch CQ-editor directly.~~
-
 ### Development Packages
 
 Development builds are also available, but can be unstable and should be used at your own risk. You can download the newest build [here](https://github.com/CadQuery/CQ-editor/releases/tag/nightly). Install and run the `run.sh` (Linux/MacOS) or `run.bat` (Windows) script in the root CQ-editor directory. The CQ-editor window should launch.
@@ -292,7 +288,7 @@ micromamba install -n base -c cadquery cq-editor
 micromamba run -n base cq-editor
 ```
 
-On some linux distributions (e.g. `Ubuntu 18.04`) it might be necessary to install additonal packages:
+On some linux distributions (e.g. `Ubuntu 18.04`+) it might be necessary to install additonal packages:
 ```
 sudo apt install libglu1-mesa libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev
 ```
@@ -301,6 +297,14 @@ On Fedora 29 the packages can be installed as follows:
 dnf install -y mesa-libGLU mesa-libGL mesa-libGLU-devel
 ```
 
+## Installation (pip)
+
+A newer installation option (starting with 0.3.0) is to install via pip. Being a newer option, there may be issues that are not present with the conda installation method. It has worked well in testing so far though.
+
+```
+pip install CQ-editor
+```
+
 ## Usage
 
 ### Showing Objects

{cq_editor-0.3.dev0 → cq_editor-0.4.0}/CQ_editor.egg-info/requires.txt

@@ -1,10 +1,10 @@
 cadquery
 pyqtgraph
-spyder==5
+spyder<6,>=5.5.6
 path
 logbook
 requests
-qtconsole==5.4.1
+qtconsole<5.6.0,>=5.5.1
 
 [dev]
 black

{cq_editor-0.3.dev0 → cq_editor-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: CQ-editor
-Version: 0.3.dev0
+Version: 0.4.0
 Summary: CadQuery plugin to create a mesh of an assembly with corresponding data
 Author: CadQuery Developers
 Maintainer: CadQuery Developers
@@ -216,11 +216,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cadquery
 Requires-Dist: pyqtgraph
-Requires-Dist: spyder==5
+Requires-Dist: spyder<6,>=5.5.6
 Requires-Dist: path
 Requires-Dist: logbook
 Requires-Dist: requests
-Requires-Dist: qtconsole==5.4.1
+Requires-Dist: qtconsole<5.6.0,>=5.5.1
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pluggy; extra == "test"
@@ -259,10 +259,6 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
 
 ## Installation - Pre-Built Packages (Recommended)
 
-~~### Release Packages~~
-
-~~Stable release builds which do not require Anaconda are attached to the [latest release](https://github.com/CadQuery/CQ-editor/releases). Download installer for your operating system, extract it, and run the CQ-editor script for your OS (CQ-editor.cmd for Windows, CQ-editor.sh for Linux and MacOS). On Windows you should be able to simply double-click on CQ-editor.cmd. On Linux and MacOS you may need to make the script executable with `chmod +x CQ-editor.sh` and run the script from the command line. The script contains an environment variable export that may be required to get CQ-editor to launch correctly on MacOS Big Sur, so it is better to use the script than to launch CQ-editor directly.~~
-
 ### Development Packages
 
 Development builds are also available, but can be unstable and should be used at your own risk. You can download the newest build [here](https://github.com/CadQuery/CQ-editor/releases/tag/nightly). Install and run the `run.sh` (Linux/MacOS) or `run.bat` (Windows) script in the root CQ-editor directory. The CQ-editor window should launch.
@@ -292,7 +288,7 @@ micromamba install -n base -c cadquery cq-editor
 micromamba run -n base cq-editor
 ```
 
-On some linux distributions (e.g. `Ubuntu 18.04`) it might be necessary to install additonal packages:
+On some linux distributions (e.g. `Ubuntu 18.04`+) it might be necessary to install additonal packages:
 ```
 sudo apt install libglu1-mesa libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev
 ```
@@ -301,6 +297,14 @@ On Fedora 29 the packages can be installed as follows:
 dnf install -y mesa-libGLU mesa-libGL mesa-libGLU-devel
 ```
 
+## Installation (pip)
+
+A newer installation option (starting with 0.3.0) is to install via pip. Being a newer option, there may be issues that are not present with the conda installation method. It has worked well in testing so far though.
+
+```
+pip install CQ-editor
+```
+
 ## Usage
 
 ### Showing Objects

{cq_editor-0.3.dev0 → cq_editor-0.4.0}/README.md

@@ -26,10 +26,6 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
 
 ## Installation - Pre-Built Packages (Recommended)
 
-~~### Release Packages~~
-
-~~Stable release builds which do not require Anaconda are attached to the [latest release](https://github.com/CadQuery/CQ-editor/releases). Download installer for your operating system, extract it, and run the CQ-editor script for your OS (CQ-editor.cmd for Windows, CQ-editor.sh for Linux and MacOS). On Windows you should be able to simply double-click on CQ-editor.cmd. On Linux and MacOS you may need to make the script executable with `chmod +x CQ-editor.sh` and run the script from the command line. The script contains an environment variable export that may be required to get CQ-editor to launch correctly on MacOS Big Sur, so it is better to use the script than to launch CQ-editor directly.~~
-
 ### Development Packages
 
 Development builds are also available, but can be unstable and should be used at your own risk. You can download the newest build [here](https://github.com/CadQuery/CQ-editor/releases/tag/nightly). Install and run the `run.sh` (Linux/MacOS) or `run.bat` (Windows) script in the root CQ-editor directory. The CQ-editor window should launch.
@@ -59,7 +55,7 @@ micromamba install -n base -c cadquery cq-editor
 micromamba run -n base cq-editor
 ```
 
-On some linux distributions (e.g. `Ubuntu 18.04`) it might be necessary to install additonal packages:
+On some linux distributions (e.g. `Ubuntu 18.04`+) it might be necessary to install additonal packages:
 ```
 sudo apt install libglu1-mesa libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev
 ```
@@ -68,6 +64,14 @@ On Fedora 29 the packages can be installed as follows:
 dnf install -y mesa-libGLU mesa-libGL mesa-libGLU-devel
 ```
 
+## Installation (pip)
+
+A newer installation option (starting with 0.3.0) is to install via pip. Being a newer option, there may be issues that are not present with the conda installation method. It has worked well in testing so far though.
+
+```
+pip install CQ-editor
+```
+
 ## Usage
 
 ### Showing Objects

{cq_editor-0.3.dev0 → cq_editor-0.4.0}/cq_editor/__main__.py

@@ -3,18 +3,18 @@ import argparse
 
 from PyQt5.QtWidgets import QApplication
 
-NAME = 'CQ-editor'
+NAME = "CQ-editor"
 
-#need to initialize QApp here, otherewise svg icons do not work on windows
-app = QApplication(sys.argv,
-                   applicationName=NAME)
+# need to initialize QApp here, otherewise svg icons do not work on windows
+app = QApplication(sys.argv, applicationName=NAME)
 
 from .main_window import MainWindow
 
+
 def main():
 
     parser = argparse.ArgumentParser(description=NAME)
-    parser.add_argument('filename',nargs='?',default=None)
+    parser.add_argument("filename", nargs="?", default=None)
 
     args = parser.parse_args(app.arguments()[1:])
 

cq_editor-0.4.0/cq_editor/_version.py

@@ -0,0 +1 @@
+__version__ = "0.4.0"

{cq_editor-0.3.dev0 → cq_editor-0.4.0}/cq_editor/cq_utils.py

@@ -8,8 +8,11 @@ from types import SimpleNamespace
 from OCP.XCAFPrs import XCAFPrs_AISObject
 from OCP.TopoDS import TopoDS_Shape
 from OCP.AIS import AIS_InteractiveObject, AIS_Shape
-from OCP.Quantity import \
-    Quantity_TOC_RGB as TOC_RGB, Quantity_Color, Quantity_NOC_GOLD as GOLD
+from OCP.Quantity import (
+    Quantity_TOC_RGB as TOC_RGB,
+    Quantity_Color,
+    Quantity_NOC_GOLD as GOLD,
+)
 from OCP.Graphic3d import Graphic3d_NOM_JADE, Graphic3d_MaterialAspect
 
 from PyQt5.QtGui import QColor
@@ -25,26 +28,33 @@ def is_cq_obj(obj):
     return isinstance(obj, (Workplane, Shape, Assembly, Sketch))
 
 
-def find_cq_objects(results : dict):
+def find_cq_objects(results: dict):
 
-    return {k:SimpleNamespace(shape=v,options={}) for k,v in results.items() if is_cq_obj(v)}
+    return {
+        k: SimpleNamespace(shape=v, options={})
+        for k, v in results.items()
+        if is_cq_obj(v)
+    }
 
 
-def to_compound(obj : Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Shape], cq.Sketch]):
+def to_compound(
+    obj: Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Shape], cq.Sketch],
+):
 
     vals = []
 
-    if isinstance(obj,cq.Workplane):
+    if isinstance(obj, cq.Workplane):
         vals.extend(obj.vals())
-    elif isinstance(obj,cq.Shape):
+    elif isinstance(obj, cq.Shape):
         vals.append(obj)
-    elif isinstance(obj,list) and isinstance(obj[0],cq.Workplane):
-        for o in obj: vals.extend(o.vals())
-    elif isinstance(obj,list) and isinstance(obj[0],cq.Shape):
+    elif isinstance(obj, list) and isinstance(obj[0], cq.Workplane):
+        for o in obj:
+            vals.extend(o.vals())
+    elif isinstance(obj, list) and isinstance(obj[0], cq.Shape):
         vals.extend(obj)
     elif isinstance(obj, TopoDS_Shape):
         vals.append(cq.Shape.cast(obj))
-    elif isinstance(obj,list) and isinstance(obj[0],TopoDS_Shape):
+    elif isinstance(obj, list) and isinstance(obj[0], TopoDS_Shape):
         vals.extend(cq.Shape.cast(o) for o in obj)
     elif isinstance(obj, cq.Sketch):
         if obj._faces:
@@ -52,21 +62,32 @@ def to_compound(obj : Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.
         else:
             vals.extend(obj._edges)
     else:
-        raise ValueError(f'Invalid type {type(obj)}')
+        raise ValueError(f"Invalid type {type(obj)}")
 
     return cq.Compound.makeCompound(vals)
 
 
-def to_workplane(obj : cq.Shape):
+def to_workplane(obj: cq.Shape):
 
-    rv = cq.Workplane('XY')
-    rv.objects = [obj,]
+    rv = cq.Workplane("XY")
+    rv.objects = [
+        obj,
+    ]
 
     return rv
 
 
-def make_AIS(obj : Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Shape], cq.Assembly, AIS_InteractiveObject],
-             options={}):
+def make_AIS(
+    obj: Union[
+        cq.Workplane,
+        List[cq.Workplane],
+        cq.Shape,
+        List[cq.Shape],
+        cq.Assembly,
+        AIS_InteractiveObject,
+    ],
+    options={},
+):
 
     shape = None
 
@@ -82,28 +103,29 @@ def make_AIS(obj : Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Sha
     set_material(ais, DEFAULT_MATERIAL)
     set_color(ais, DEFAULT_FACE_COLOR)
 
-    if 'alpha' in options:
-        set_transparency(ais, options['alpha'])
-    if 'color' in options:
-        set_color(ais, to_occ_color(options['color']))
-    if 'rgba' in options:
-        r,g,b,a = options['rgba']
-        set_color(ais, to_occ_color((r,g,b)))
+    if "alpha" in options:
+        set_transparency(ais, options["alpha"])
+    if "color" in options:
+        set_color(ais, to_occ_color(options["color"]))
+    if "rgba" in options:
+        r, g, b, a = options["rgba"]
+        set_color(ais, to_occ_color((r, g, b)))
         set_transparency(ais, a)
 
-    return ais,shape
+    return ais, shape
 
 
-def export(obj : Union[cq.Workplane, List[cq.Workplane]], type : str,
-           file, precision=1e-1):
+def export(
+    obj: Union[cq.Workplane, List[cq.Workplane]], type: str, file, precision=1e-1
+):
 
     comp = to_compound(obj)
 
-    if type == 'stl':
+    if type == "stl":
         comp.exportStl(file, tolerance=precision)
-    elif type == 'step':
+    elif type == "step":
         comp.exportStep(file)
-    elif type == 'brep':
+    elif type == "brep":
         comp.exportBrep(file)
 
 
@@ -116,17 +138,14 @@ def to_occ_color(color) -> Quantity_Color:
             elif isinstance(color[0], float):
                 color = QColor.fromRgbF(*color)
             else:
-                raise ValueError('Unknown color format')
+                raise ValueError("Unknown color format")
         else:
             color = QColor(color)
 
-    return Quantity_Color(color.redF(),
-                          color.greenF(),
-                          color.blueF(),
-                          TOC_RGB)
+    return Quantity_Color(color.redF(), color.greenF(), color.blueF(), TOC_RGB)
 
 
-def get_occ_color(obj : Union[AIS_InteractiveObject, Quantity_Color]) -> QColor:
+def get_occ_color(obj: Union[AIS_InteractiveObject, Quantity_Color]) -> QColor:
 
     if isinstance(obj, AIS_InteractiveObject):
         color = Quantity_Color()
@@ -137,7 +156,7 @@ def get_occ_color(obj : Union[AIS_InteractiveObject, Quantity_Color]) -> QColor:
     return QColor.fromRgbF(color.Red(), color.Green(), color.Blue())
 
 
-def set_color(ais : AIS_Shape, color : Quantity_Color) -> AIS_Shape:
+def set_color(ais: AIS_Shape, color: Quantity_Color) -> AIS_Shape:
 
     drawer = ais.Attributes()
     drawer.SetupOwnShadingAspect()
@@ -146,7 +165,7 @@ def set_color(ais : AIS_Shape, color : Quantity_Color) -> AIS_Shape:
     return ais
 
 
-def set_material(ais : AIS_Shape, material: Graphic3d_MaterialAspect) -> AIS_Shape:
+def set_material(ais: AIS_Shape, material: Graphic3d_MaterialAspect) -> AIS_Shape:
 
     drawer = ais.Attributes()
     drawer.SetupOwnShadingAspect()
@@ -155,7 +174,7 @@ def set_material(ais : AIS_Shape, material: Graphic3d_MaterialAspect) -> AIS_Sha
     return ais
 
 
-def set_transparency(ais : AIS_Shape, alpha: float) -> AIS_Shape:
+def set_transparency(ais: AIS_Shape, alpha: float) -> AIS_Shape:
 
     drawer = ais.Attributes()
     drawer.SetupOwnShadingAspect()
@@ -184,13 +203,13 @@ def reload_cq():
     reload(cq.occ_impl.exporters.dxf)
     reload(cq.occ_impl.exporters.amf)
     reload(cq.occ_impl.exporters.json)
-    #reload(cq.occ_impl.exporters.assembly)
+    # reload(cq.occ_impl.exporters.assembly)
     reload(cq.occ_impl.exporters)
     reload(cq.assembly)
     reload(cq)
 
 
-def is_obj_empty(obj : Union[cq.Workplane,cq.Shape]) -> bool:
+def is_obj_empty(obj: Union[cq.Workplane, cq.Shape]) -> bool:
 
     rv = False
 

{cq_editor-0.3.dev0 → cq_editor-0.4.0}/cq_editor/cqe_run.py

@@ -1,13 +1,13 @@
 import os, sys, asyncio
 
-if 'CASROOT' in os.environ:
-    del os.environ['CASROOT']
+if "CASROOT" in os.environ:
+    del os.environ["CASROOT"]
 
-if sys.platform == 'win32':
+if sys.platform == "win32":
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 from cq_editor.__main__ import main
 
 
-if __name__ == '__main__':
-    main()
+if __name__ == "__main__":
+    main()

cq_editor-0.4.0/cq_editor/icons.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Fri May 25 14:47:10 2018
+
+@author: adam
+"""
+
+from PyQt5.QtGui import QIcon
+
+from . import icons_res
+
+_icons = {"app": QIcon(":/images/icons/cadquery_logo_dark.svg")}
+
+import qtawesome as qta
+
+_icons_specs = {
+    "new": (("fa.file-o",), {}),
+    "open": (("fa.folder-open-o",), {}),
+    # borrowed from spider-ide
+    "autoreload": [
+        ("fa.repeat", "fa.clock-o"),
+        {
+            "options": [
+                {"scale_factor": 0.75, "offset": (-0.1, -0.1)},
+                {"scale_factor": 0.5, "offset": (0.25, 0.25)},
+            ]
+        },
+    ],
+    "save": (("fa.save",), {}),
+    "save_as": (
+        ("fa.save", "fa.pencil"),
+        {
+            "options": [
+                {
+                    "scale_factor": 1,
+                },
+                {"scale_factor": 0.8, "offset": (0.2, 0.2)},
+            ]
+        },
+    ),
+    "run": (("fa.play",), {}),
+    "delete": (("fa.trash",), {}),
+    "delete-many": (
+        (
+            "fa.trash",
+            "fa.trash",
+        ),
+        {
+            "options": [
+                {"scale_factor": 0.8, "offset": (0.2, 0.2), "color": "gray"},
+                {"scale_factor": 0.8},
+            ]
+        },
+    ),
+    "help": (("fa.life-ring",), {}),
+    "about": (("fa.info",), {}),
+    "preferences": (("fa.cogs",), {}),
+    "inspect": (
+        ("fa.cubes", "fa.search"),
+        {"options": [{"scale_factor": 0.8, "offset": (0, 0), "color": "gray"}, {}]},
+    ),
+    "screenshot": (("fa.camera",), {}),
+    "screenshot-save": (
+        ("fa.save", "fa.camera"),
+        {
+            "options": [
+                {"scale_factor": 0.8},
+                {"scale_factor": 0.8, "offset": (0.2, 0.2)},
+            ]
+        },
+    ),
+    "toggle-comment": (("fa.hashtag",), {}),
+}
+
+
+def icon(name):
+
+    if name in _icons:
+        return _icons[name]
+
+    args, kwargs = _icons_specs[name]
+
+    return qta.icon(*args, **kwargs)