Skip to content

Remove remaining occurences of GDSPY #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README_developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ Notice that using the `conda env update` command might introduce inconsistencies
### Setup without conda: in a virtual environment (alternative setup)

#### Prerequisites
The package dependency `gdspy`, needs C++ compilation to successfully install in a base or virtualenv. Make sure the right compiler is installed on your machine if you encounter errors during the installation process described above.
**Windows** you can install the `Visual C++ x.0` using the [C++ Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/). Be sure to select the most current versions of `MSVC` and `Windows SDK`, as suggested in [this wiki](https://wiki.python.org/moin/WindowsCompilers) referenced by the gdspy documentation.
The package dependency `gdstk`, needs C++ compilation to successfully install in a base or virtualenv. Make sure the right compiler is installed on your machine if you encounter errors during the installation process described above.
**Windows** you can install the `Visual C++ x.0` using the [C++ Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/). Be sure to select the most current versions of `MSVC` and `Windows SDK`, as suggested in [this wiki](https://wiki.python.org/moin/WindowsCompilers).
**Linux** on Ubuntu or other Debian based systems, execute the following command `sudo apt-get install gcc g++`. Linux users might encounter other python-related errors during creation of the virtualenv or during qiskit-metal installation. You might be able to deal with those by executing `sudo apt-get install python3-dev python3-venv`. Be sure to customize the `python3` string if you are trying to use a custom installation of python.

#### Install
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ Once inside `JupyterLab`, you can switch to the newly created Metal kernel to us
Without conda: Virtual environment setup (alternative setup)
------------------------------------------------------------

**On Windows, do this first:** It is recommended that you first install `Visual C++ 14.0`, required for a successful install of `gdspy`.
If you do not have `Visual C++ 14.0` installed, you will be notified to install it when `gdspy` attempts to install.
**On Windows, do this first:** It is recommended that you first install `Visual C++ x.0`, required for a successful install of `gdstk`.
If you do not have `Visual C++ x.0` installed, you will be notified to install it when `gdstk` attempts to install.
You can do this by downloading and installing `C++ Build Tools <https://visualstudio.microsoft.com/visual-cpp-build-tools/>`_.
Be sure to select the latest versions of `MSVCv142 - VS 2019 C++ x64/x86 build tools` and `Windows 10 SDK` in the installer as suggested in `this wiki <https://wiki.python.org/moin/WindowsCompilers>`_ referenced by the gdspy documentation.
Be sure to select the latest versions of `MSVC` and `Windows SDK` in the installer as suggested in `this wiki <https://wiki.python.org/moin/WindowsCompilers>`_.

To use a Python virtual environment, execute these commands in the top-level of the repository:

Expand Down
4 changes: 2 additions & 2 deletions docs/tut/3-Renderers/3.2-Export-your-design-to-GDS.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion qiskit_metal/_gui/elements_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ElementsWindow(QMainWindow):
Extends the `QMainWindow` class.

PySide6 Signal / Slots Extensions:
The UI can call up to this class to execeute button clicks for instance
The UI can call up to this class to execute button clicks for instance
Extensiosn in qt designer on signals/slots are linked to this class
"""

Expand Down
9 changes: 4 additions & 5 deletions qiskit_metal/_gui/main_window_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@
from PySide6.QtGui import QIcon
from PySide6.QtWidgets import QApplication, QFileDialog, QMainWindow, QMessageBox, QDockWidget

from .. import Dict, config
from .. import config
from ..toolbox_python._logging import setup_logger
from . import __version__
from .main_window_ui import Ui_MainWindow
from .utility._handle_qt_messages import slot_catch_error
from .widgets.log_widget.log_metal import LogHandler_for_QTextLog

Expand All @@ -44,7 +43,7 @@ def __init__(self):
""""""
super().__init__()
# Set manually
self.handler = None # type: QMainWindowBaseHandler
self.handler: QMainWindowBaseHandler = None
self.force_close = False

@property
Expand Down Expand Up @@ -152,7 +151,7 @@ def get_screenshot(self,
path = Path(name + '.' + type_).resolve()

# grab the main window
screenshot = self.grab() # type: QtGui.QPixMap
screenshot: QtGui.QPixmap = self.grab()
screenshot.save(str(path), type_)

# copy to clipboard
Expand Down Expand Up @@ -618,7 +617,7 @@ def kick_start_qApp():
try:
from IPython import get_ipython
ipython = get_ipython()
ipython.magic('gui qt6')
ipython.run_line_magic("gui", "qt6")

except Exception as e:
print("exception")
Expand Down
6 changes: 3 additions & 3 deletions qiskit_metal/_gui/widgets/edit_component/component_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import ast
import inspect
from pathlib import Path
from typing import TYPE_CHECKING, Union
from typing import TYPE_CHECKING, List, Union

import numpy as np
import PySide6
Expand Down Expand Up @@ -188,8 +188,8 @@ def __init__(self, gui: 'MetalGUI', parent: QtWidgets.QWidget):
color: #000000;
""")
self.src_doc = create_QTextDocument(self.ui.textSource)
self._html_css_lex = None # type: pygments.formatters.html.HtmlFormatter
self.src_widgets = [] # type: List[QtWidgets.QWidget]
self._html_css_lex: pygments.formatters.html.HtmlFormatter = None
self.src_widgets: List[QtWidgets.QWidget] = []

# Help stylesheet
document = self.ui.textHelp.document()
Expand Down
6 changes: 3 additions & 3 deletions qiskit_metal/_gui/widgets/plot_widget/plot_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# copyright notice, and modified files need to carry a notice indicating
# that they have been altered from the originals.
"""Main module that handles the entier plot window which is docked inside the
mmain window.
main window.

This can be undocked and can have its own toolbar. this is largley why i
ddecied to use a QMainWindow, so that we can have inner docking and
This can be undocked and can have its own toolbar. this is largley why I
decided to use a QMainWindow, so that we can have inner docking and
toolbars available.
"""

Expand Down
2 changes: 1 addition & 1 deletion qiskit_metal/designs/design_flipchip.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def add_chip_info(self):
parser for "self.p" for design base. For now, just hard code in
something.
# GDSPY is using numbers based on 1 meter unit.
# GDSTK is using numbers based on 1 meter unit.
# When the gds file is exported, data is converted to "user-selected" units.
# centered at (0,0) and 9 by 6 size.
Expand Down
2 changes: 1 addition & 1 deletion qiskit_metal/designs/design_multiplanar.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _add_layer_stack(self) -> LayerStackHandler:
def _add_chip_info(self):
"""Used to determine size of fill box by either 'size' data or box_plus_buffer.
GDSPY is using numbers based on 1 meter unit.
GDSTK is using numbers based on 1 meter unit.
When the gds file is exported, data is converted to "user-selected" units.
centered at (0,0) and 9 by 6 size.
Expand Down
2 changes: 1 addition & 1 deletion qiskit_metal/designs/design_planar.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def add_chip_info(self):
parser for "self.p" for design base. For now, just hard code in
something.
# GDSPY is using numbers based on 1 meter unit.
# GDSTK is using numbers based on 1 meter unit.
# When the gds file is exported, data is converted to "user-selected" units.
# centered at (0,0) and 9 by 6 size.
Expand Down
Loading
Loading