Merge pull request #243 from PhysiCell-Tools/development

changes for PhysiCell 1.14.0
PhysiCell-Tools · Sep 16, 2024 · a6c48d8 · a6c48d8
2 parents c17ad51 + e2df4bd
commit a6c48d8
Show file tree

Hide file tree

Showing 23 changed files with 2,969 additions and 1,197 deletions.
diff --git a/bin/cell_def_tab.py b/bin/cell_def_tab.py
diff --git a/bin/config_tab.py b/bin/config_tab.py
diff --git a/bin/filters2D.py b/bin/filters2D.py
@@ -1,5 +1,6 @@
 from PyQt5 import QtCore, QtGui
 from PyQt5.QtWidgets import QFrame,QApplication,QWidget,QTabWidget,QFormLayout,QLineEdit, QGroupBox, QHBoxLayout,QVBoxLayout,QRadioButton,QLabel,QCheckBox,QComboBox,QScrollArea,  QMainWindow,QGridLayout, QPushButton, QFileDialog, QMessageBox, QStackedWidget, QSplitter
+from studio_classes import DoubleValidatorWidgetBounded
 # from PyQt5.QtWidgets import QCompleter, QSizePolicy
 # from PyQt5.QtCore import QSortFilterProxyModel
 # from PyQt5.QtSvg import QSvgWidget
@@ -130,15 +131,25 @@ def __init__(self, reset, vis_tab):   # we use vis_tab for some of the methods c
         glayout.addWidget(self.aspect_11_checkbox, idx_row,0,1,3) # w, row, column, rowspan, colspan
 
         #--------------------------
-        self.voxel_grid_checkbox = QCheckBox_custom('voxel grid')
+        idx_row += 1
+        glayout.addWidget(QLabel("Grids:"), idx_row,0,1,2) # w, row, column, rowspan, colspan
+
+        self.voxel_grid_checkbox = QCheckBox_custom('voxel')
         self.voxel_grid_checkbox.clicked.connect(self.voxel_grid_cb)
         idx_row += 1
-        glayout.addWidget(self.voxel_grid_checkbox, idx_row,0,1,2) # w, row, column, rowspan, colspan
+        glayout.addWidget(self.voxel_grid_checkbox, idx_row,0,1,1) # w, row, column, rowspan, colspan
 
         #------
-        self.mech_grid_checkbox = QCheckBox_custom('mech grid')
+        self.mech_grid_checkbox = QCheckBox_custom('mech')
         self.mech_grid_checkbox.clicked.connect(self.mech_grid_cb)
-        glayout.addWidget(self.mech_grid_checkbox, idx_row,2,1,1) # w, row, column, rowspan, colspan
+        glayout.addWidget(self.mech_grid_checkbox, idx_row,1,1,1) # w, row, column, rowspan, colspan
+
+        # self.mech_grid_size = QLineEdit_custom()
+        self.mech_grid_size = QLineEdit("30")
+        self.mech_grid_size.setFixedWidth(30)
+        self.mech_grid_size.textChanged.connect(self.mech_grid_size_changed)
+        self.mech_grid_size.setValidator(DoubleValidatorWidgetBounded(bottom=1, top=999))
+        glayout.addWidget(self.mech_grid_size , idx_row,2, 1,1) # w, row, column, rowspan, colspan
 
         #--------------------------
         self.save_png_checkbox = QCheckBox_custom('save frame*.png')
@@ -247,6 +258,13 @@ def voxel_grid_cb(self):
     def mech_grid_cb(self):
         self.vis_tab.mech_grid_cb(self.mech_grid_checkbox.isChecked())
 
+    def mech_grid_size_changed(self,sval):
+        # print("size=",sval)
+        try:
+            self.vis_tab.mech_voxel_size = float(sval)
+        except:
+            pass
+
     def save_png_cb(self):
         self.vis_tab.png_frame = 0
         self.vis_tab.save_png = self.save_png_checkbox.isChecked()

diff --git a/bin/filters3D.py b/bin/filters3D.py
@@ -210,6 +210,19 @@ def __init__(self, reset, vis_tab):   # we use vis_tab for some of the methods c
         #-----------
         idx_row += 1
         glayout.addWidget(QHLine(), idx_row,0,1,3) # w, row, column, rowspan, colspan
+
+        idx_row += 1
+        self.save_png_checkbox = QCheckBox_custom('save frame*.png')
+        self.save_png_checkbox.clicked.connect(self.save_png_cb)
+        idx_row += 1
+        glayout.addWidget(self.save_png_checkbox, idx_row,0,1,2) # w, row, column, rowspan, colspan
+
+        idx_row += 1
+        self.cells_csv_button = QPushButton("Save snap.csv")
+        self.cells_csv_button.setStyleSheet("background-color: lightgreen;")
+        self.cells_csv_button.clicked.connect(self.cells_csv_cb)
+        glayout.addWidget(self.cells_csv_button, idx_row,0,1,2) # w, row, column, rowspan, colspan
+
         idx_row += 1
         glayout.addWidget(QLabel("Keypress j (joystick) vs. t (trackball) "), idx_row,0,1,3) 
         idx_row += 1
@@ -379,6 +392,13 @@ def sphere_res_cb(self):
         # print("vis_base: sphere_res_cb(): = ",int(text))
         self.vis_tab.sphere_res_cb(int(text))
 
+    def save_png_cb(self):
+        self.vis_tab.png_frame = 0
+        self.vis_tab.save_png = self.save_png_checkbox.isChecked()
+
+    def cells_csv_cb(self):
+        self.vis_tab.write_cells_csv_cb()
+
     #----------
     def close_filterUI_cb(self):
         self.close()