implemented empty drawlogical volume - until g4 will fix it

Author: maureeungaro

.github/workflows/test.yml

@@ -1,5 +1,7 @@
 name: Test
 
+run-name: triggered by ${{ inputs.triggered_by || 'manual' }}
+
 permissions:
   contents: read
 
@@ -12,6 +14,11 @@ concurrency:
 
 on:
   workflow_dispatch:
+    inputs:
+      triggered_by:
+        description: 'What triggered this run'
+        required: false
+        default: 'manual'
   pull_request:
     paths-ignore:
       - "**/*.md"

gemc/gtree/gtree.cc

@@ -11,6 +11,7 @@
 #include <QTextEdit>
 #include <QVBoxLayout>
 #include <QColorDialog>
+#include <QMessageBox>
 #include <QSignalBlocker>
 #include <QTimer>
 
@@ -638,17 +639,23 @@ void GTree::onTreeItemClicked(QTreeWidgetItem* item, int /*column*/) {
             opacitySlider->setVisible(true);
         }
 
-        // Update the inspect button with the selected volume's leaf name.
+        // Update the inspect and draw-overlaps buttons with the selected volume's leaf name.
         if (inspectButton) {
             const QString leaf = QString::fromStdString(G4Ttree_item::vname_from_v4name(current_volume_name));
             inspectButton->setText(tr("Inspect %1").arg(leaf));
             inspectButton->setVisible(true);
         }
+        if (drawOverlapsButton) {
+            const QString leaf = QString::fromStdString(G4Ttree_item::vname_from_v4name(current_volume_name));
+            drawOverlapsButton->setText(tr("Draw Logical Overlaps %1").arg(leaf));
+            drawOverlapsButton->setVisible(true);
+        }
     }
     else {
         styleButtons->setVisible(false);
         opacitySlider->setVisible(false);
         if (inspectButton) inspectButton->setVisible(false);
+        if (drawOverlapsButton) drawOverlapsButton->setVisible(false);
         // Systems don't have a single material etc.
         materialLabel->setText(tr(""));
         massLabel->setText(tr(""));
@@ -824,6 +831,16 @@ void GTree::inspectVolume() {
 }
 
 
+// Warn that /vis/drawLogicalVolume is not yet usable due to a Geant4 11.4.1 TOOLSSG bug.
+void GTree::drawOverlapsWarning() {
+    QMessageBox::warning(this,
+        tr("Not yet implemented"),
+        tr("Draw Logical Overlaps will be implemented when Geant4 fixes the\n"
+           "G4ToolsSGSceneHandler::GetOrCreateNode \"World mis-match\" crash\n"
+           "triggered by /vis/drawLogicalVolume in Geant4 11.4.1."));
+}
+
+
 // Convert slider position to alpha and apply it to the currently selected volume.
 void GTree::onOpacitySliderChanged(int value) {
     if (current_volume_name.empty())

gemc/gtree/gtree.h

@@ -361,6 +361,17 @@ class GTree : public QWidget, public GBase<GTree>
      */
     QPushButton* inspectButton = nullptr;
 
+    /**
+     * \brief Full-width button that will invoke /vis/drawLogicalVolume for overlap visualization.
+     *
+     * Not yet functional: blocked by a Geant4 11.4.1 TOOLSSG bug
+     * (G4ToolsSGSceneHandler::GetOrCreateNode throws "World mis-match" FatalException
+     * for the standalone PVPlacement created by G4LogicalVolumeModel).
+     * Displays a warning until the upstream fix is available.
+     * The label is updated to "Draw Logical Overlaps <volumename>" whenever a volume is selected.
+     */
+    QPushButton* drawOverlapsButton = nullptr;
+
     /**
      * \brief Build the internal system/volume model from the supplied volume map.
      * \param g4volumes_map Map from full volume names to `G4Volume*` wrappers.
@@ -504,6 +515,15 @@ private slots:
      */
     void inspectVolume();
 
+    /**
+     * \brief Show a warning that Draw Logical Overlaps is not yet implemented.
+     *
+     * /vis/drawLogicalVolume crashes in Geant4 11.4.1 with the TOOLSSG driver
+     * (G4ToolsSGSceneHandler::GetOrCreateNode "World mis-match" FatalException).
+     * This slot will be wired to the real implementation once Geant4 is fixed.
+     */
+    void drawOverlapsWarning();
+
     /**
      * \brief Advance one step of the twinkle color animation; restore original on completion.
      */

gemc/gtree/right_widget.cc

@@ -106,6 +106,17 @@ QWidget* GTree::right_widget() {
     connect(inspectButton, &QPushButton::clicked, this, &GTree::inspectVolume);
     blayout->addWidget(inspectButton);
 
+    // Draw Logical Overlaps button: not yet functional — blocked by Geant4 11.4.1 TOOLSSG bug.
+    blayout->addSpacing(4);
+    drawOverlapsButton = new QPushButton(bottomPanel);
+    drawOverlapsButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    drawOverlapsButton->setStyleSheet(
+        "QPushButton { border: 2px solid black; border-radius: 4px; padding: 4px 8px; }"
+        "QPushButton:hover { background-color: palette(highlight); color: palette(highlighted-text); }"
+    );
+    connect(drawOverlapsButton, &QPushButton::clicked, this, &GTree::drawOverlapsWarning);
+    blayout->addWidget(drawOverlapsButton);
+
     // Hidden until a volume or system is selected in the tree.
     bottomPanel->setVisible(false);
 

releases/0.3.md

@@ -12,6 +12,7 @@ This version includes:
 - `GEMC_PLUGIN_PATH` and `-plugin_path` for external plugin discovery
 - Pre-parse plugin options hook for dynamic plugin option registration
 - ROOT gstreamer and event-action bug fixes
+- Fixed geometry-tree opacity slider resetting volume color to original
 - Plotting tests for digitizing-SD examples and Cherenkov photon hit maps
 
 <br/>
@@ -142,6 +143,12 @@ This version includes:
   semi-transparent lighter background to the parameters box so it stands out; the parameters box
   is hidden when a system node is selected; all numeric parameter values are formatted to a
   maximum of three decimal places and values smaller than 10⁻⁷ are shown as 0.
+- Fixed a bug in the geometry-tree opacity slider where adjusting a volume's opacity
+  would silently reset its color to the original definition value. `GTree::set_color`
+  now updates the cached `G4Ttree_item` model entry and includes the current opacity in
+  the `/vis/geometry/set/colour` command, so color and opacity are always kept in sync.
+  The twinkle-animation restore path received the same fix so the model is consistent
+  after the animation completes.
 - Replaced the separate `punit`, `aunit`, and `vunit` fields in `gparticle` with
   direct `value*unit` notation on each kinematic field (e.g. `p: 4*GeV`,
   `theta: 23*deg`, `vz: -10*cm`). A plain number without a unit is still accepted
@@ -427,3 +434,12 @@ Both x86_64 and ARM64 platforms are supported.
   carry non-empty parameter data; added `formatVal()` in `gtree.cc` to format all numeric
   parameter tokens to at most three significant decimal places and to collapse values smaller
   than 10⁻⁷ to zero.
+- Fixed geometry-tree color/opacity desync: `GTree::set_color` was sending the
+  `/vis/geometry/set/colour` command without updating the `G4Ttree_item` model cache and
+  without including the alpha channel, so a subsequent opacity-slider change read stale RGB
+  values from the model and reset the visible color. `set_color` now calls
+  `item->set_color(c)`, reads `item->get_opacity()` to preserve the current alpha, and
+  appends it to the colour command. Changed `G4Ttree_item::set_color` to accept
+  `const QColor&`. The twinkle restore branch in `onTwinkleStep` now also calls
+  `item->set_color(twinkleSavedColor)` and `item->set_opacity(twinkleSavedOpacity)` before
+  issuing the restore command, keeping the model consistent after animation.