setupEM 0.1.22__tar.gz → 0.2.1__tar.gz

{setupem-0.1.22 → setupem-0.2.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: setupEM
-Version: 0.1.22
+Version: 0.2.1
 Summary: Python tool for configuration of gds2palace workflow with GUI.
 Author-email: Volker Muehlhaus <volker@muehlhaus.com>
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: gds2palace>=0.1.16
+Requires-Dist: gds2palace>=0.3.2
 Requires-Dist: PySide6
 Requires-Dist: scipy
 Requires-Dist: requests

{setupem-0.1.22 → setupem-0.2.1}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "setupEM"
-version = "0.1.22"
+version = "0.2.1"
 description = "Python tool for configuration of gds2palace workflow with GUI."
 readme = "README.md"
 authors = [
     { name = "Volker Muehlhaus", email = "volker@muehlhaus.com" }
 ]
 dependencies = [
-    "gds2palace>=0.1.16",
+    "gds2palace>=0.3.2",
     "PySide6",
     "scipy",
     "requests",
@@ -22,6 +22,7 @@ requires-python = ">=3.9"
 
 [project.scripts]
 setupEM = "setupEM.setupEM:main"
+setupThermal = "setupEM.setupThermal:main"
 
 [tool.setuptools.package-data] 
 "setupEM" = ["data/*.xml"]

{setupem-0.1.22 → setupem-0.2.1}/src/setupEM/setupEM.py

@@ -21,6 +21,7 @@ import sys, json, os, pathlib, ast, webbrowser, argparse
 import numpy as np
 import importlib.metadata
 import requests
+import gdspy
 from scipy.interpolate import interp1d
 from PySide6.QtWidgets import (
     QApplication, QMainWindow, QWidget, QHBoxLayout, QVBoxLayout,
@@ -199,6 +200,8 @@ class FileInputTab(QWidget):
         self.main_layout.setAlignment(Qt.AlignTop)
 
         # ---------- GDSII FILE GROUP ----------
+        left_label_width = 220
+
         self.gds_group = QGroupBox("GDSII Layout File")
         self.gds_layout = QVBoxLayout()
 
@@ -217,8 +220,24 @@ class FileInputTab(QWidget):
         self.gds_layout.addLayout(self.gds_file_layout)
 
 
+        self.cellname_layout =  QHBoxLayout()
+        label = QLabel("Cellname")
+        label.setFixedWidth(left_label_width) 
+        self.cellname_layout.addWidget(label)
+        self.cellname_box = QComboBox()
+        self.cellname_box.setFixedWidth(250)
+        self.cellname_box.setStyleSheet(COMBO_STYLE_OPTIONAL)
+        self.cellname_box.addItems([""])
+        self.cellname_layout.addWidget(self.cellname_box)
+        self.cellname_label2 = QLabel(" (leave empty for default)")
+        self.cellname_layout.addWidget(self.cellname_label2)
+        self.cellname_layout.addStretch()
+        self.gds_layout.addLayout(self.cellname_layout)
+
+
         self.purpose_layout = QHBoxLayout()
         self.purpose_label1    = QLabel("Read this datatype (purpose):  ")
+        self.purpose_label1.setFixedWidth(left_label_width) 
         self.purpose_edit = QLineEdit("0")
         self.purpose_edit.setStyleSheet(EDIT_STYLE_OPTIONAL)
         self.purpose_edit.setFixedWidth(70)
@@ -230,9 +249,9 @@ class FileInputTab(QWidget):
         self.gds_layout.addLayout(self.purpose_layout)
 
 
-
         self.viamerge_layout = QHBoxLayout()
         self.viamerge_label1    = QLabel("Merge via arrays with spacing ")
+        self.viamerge_label1.setFixedWidth(left_label_width) 
         self.viamerge_edit = QLineEdit("0")
         self.viamerge_edit.setStyleSheet(EDIT_STYLE_OPTIONAL)
         self.viamerge_edit.setFixedWidth(70)
@@ -301,14 +320,27 @@ class FileInputTab(QWidget):
         filename, _ = QFileDialog.getOpenFileName(self, "Select GDSII File",previous_directory,"*.gds;;*.*")
         if filename:
             self.set_gds_file(filename)
+            self.update_cellnames_from_gds(filename)
 
 
+    def update_cellnames_from_gds(self, filename):
+        if filename:
+            # get top level cellnames now
+            lib = gdspy.GdsLibrary()
+            lib.read_gds(filename)
+            cellnames = list(lib.cells.keys())
+            self.cellname_box.clear()
+            self.cellname_box.addItem("")  # blank for default
+            for cellname in cellnames:
+                self.cellname_box.addItem(cellname)
+
     def set_gds_file(self, filename):
         # clear model name and target dir if they were auto-generated from previous model
         self.MainWindow.clear_modelname_and_targetdir()
         self.gds_file_edit.setText(filename)
         saved_values ["GdsFile"] = filename.replace('\\','/')
         # file is read when leaving the files tab
+        self.update_cellnames_from_gds(filename)
 
     def browse_XML_file(self):
         # start browsing from previous file location, if valid
@@ -338,6 +370,8 @@ class FileInputTab(QWidget):
         self.gds_file_edit.setText(get_saved_value("GdsFile","Please choose a file ===>"))
         XML = get_saved_value("SubstrateFile","Please choose a file ===>")
         self.XML_file_edit.setText(XML)
+        self.cellname_box.clear()
+        self.cellname_box.addItem(get_saved_value("cellname",""))        
         self.viamerge_edit.setText(str(get_saved_value("merge_polygon_size","0.5")))
         self.preprocess_gds_checkbox.setChecked(bool(get_saved_value("preprocess_gds",True)))
 
@@ -353,7 +387,8 @@ class FileInputTab(QWidget):
         saved_values ["GdsFile"] = self.gds_file_edit.text().replace('\\','/')
         saved_values ["SubstrateFile"] = self.XML_file_edit.text().replace('\\','/')
         saved_values ["preprocess_gds"] = self.preprocess_gds_checkbox.isChecked()
-        
+        saved_values ["cellname"] = self.cellname_box.currentText()
+
         try:
             merge_polygon_size = float(self.viamerge_edit.text())
         except Exception:
@@ -1794,6 +1829,7 @@ class ModelEditorTab(QWidget):
         add_text("\n# read geometries from GDSII")
         add_text("allpolygons = gds_reader.read_gds(settings['GdsFile'], "
                 "\n\tlayernumbers,"
+                "\n\tcellname=settings['cellname'], "
                 "\n\tpurposelist=settings['purpose'], "
                 "\n\tmetals_list=metals_list, \n\tpreprocess=settings['preprocess_gds'], "
                 "\n\tmerge_polygon_size=settings['merge_polygon_size']," 
@@ -1831,6 +1867,8 @@ class ModelEditorTab(QWidget):
                 add_text("if start_simulation:")
                 add_text("  try:")
                 add_text("      os.chdir(sim_path)")
+                add_text("      if sys.platform.startswith('linux'):")
+                add_text("          os.chmod('run_sim', 0o755)")
                 add_text("      subprocess.run(run_command, shell=True)")
                 add_text("  except:")
                 add_text("      print(f'Unable to run Palace using command ',run_command)\n")
@@ -1846,6 +1884,8 @@ class ModelEditorTab(QWidget):
                 add_text("if start_simulation:")
                 add_text("  try:")
                 add_text("      os.chdir(sim_path)")
+                add_text("      if sys.platform.startswith('linux'):")
+                add_text("          os.chmod('run_elmer', 0o755)")
                 add_text("      subprocess.run(run_command, shell=True)")
                 add_text("  except:")
                 add_text("      print(f'Unable to run Elmer using command ',run_command)\n")