board separate module, filter updated and dark background for log

Author: maureeungaro

g4dialog/g4dialog.cc

@@ -2,44 +2,19 @@
 #include "g4dialog.h"
 #include "g4dialog_options.h" // Provides G4DIALOG_LOGGER constant and option definitions
 #include "tabs/gcommands.h"
-#include "gui_session.h"
 
-// geant4
-#include "G4UImanager.hh"
 
 
 G4Dialog::G4Dialog(const std::shared_ptr<GOptions>& gopt, QWidget* parent) :
 	GBase(gopt, G4DIALOG_LOGGER),
 	QWidget(parent) {
 	auto dialogTabs = new QTabWidget;
 
-	gboard   = new GBoard(gopt, this);
-	auto UIM = G4UImanager::GetUIpointer();
-
-	gui_session = std::make_unique<GUI_Session>(gopt, gboard);
-	UIM->SetCoutDestination(gui_session.get());
-
 	dialogTabs->addTab(new G4Commands(this), "Geant4 Commands");
-	dialogTabs->addTab(gboard, "Log");
 
 	auto* mainLayout = new QVBoxLayout;
 	mainLayout->addWidget(dialogTabs);
 	setLayout(mainLayout);
 
 	log->debug(NORMAL, "View and Utilities tabs added.");
 }
-
-
-G4Dialog::~G4Dialog() {
-
-	// Detach G4 cout/cerr from our GUI session (avoid dangling callback)
-	if (auto* UIM = G4UImanager::GetUIpointer()) {
-		// If available in your G4 version, prefer checking current destination:
-		// if (UIM->GetCoutDestination() == gui_session.get()) { ... }
-		UIM->SetCoutDestination(nullptr);
-	}
-
-	// Destroy the session *now*, before member teardown sequence
-	gui_session.reset();
-
-}

g4dialog/g4dialog.h

@@ -1,10 +1,5 @@
 #pragma once
 
-// g4dialog
-#include "tabs/gboard.h"
-#include "gui_session.h"
-#include "g4dialog_options.h"
-
 // qt
 #include <QtWidgets>
 
@@ -15,11 +10,6 @@ class G4Dialog : public GBase<G4Dialog>, public QWidget {
 
 public:
 	explicit G4Dialog(const std::shared_ptr<GOptions>& gopt, QWidget* parent = nullptr);
+	~G4Dialog() override = default;
 
-	~G4Dialog() override;
-
-
-private:
-	GBoard*             gboard;
-	std::unique_ptr<GUI_Session> gui_session;
 };

g4dialog/g4dialog_options.cc

@@ -8,7 +8,6 @@ namespace g4dialog {
 GOptions defineOptions() {
 
 	GOptions goptions(G4DIALOG_LOGGER);
-	goptions += GOptions(GBOARD_LOGGER);
 
 	return goptions;
 }

g4dialog/g4dialog_options.h

@@ -1,11 +1,9 @@
 #pragma once
 
-// glibrary
+// gemc
 #include "goptions.h"
 
 constexpr const char* G4DIALOG_LOGGER = "g4dialog";
-constexpr const char* GBOARD_LOGGER = "gboard";
-//constexpr const char* GBOARD_LOGGER = "gboard";
 
 namespace g4dialog {
 

g4dialog/meson.build

@@ -9,27 +9,22 @@ example_source = files('examples/g4dialog_example.cc')
 
 verbosities = [
     '-verbosity.g4dialog=2',
-    '-debug.g4dialog=true',
-    '-verbosity.gboard=2',
-    '-debug.gboard=true']
+    '-debug.g4dialog=true'
+]
 
 sources = files(
     'g4dialog.cc',
     'g4dialog_options.cc',
-    'gui_session.cc',
     'tabs/gcommands.cc',
-    'tabs/gboard.cc',
 )
 
 headers = files(
     'g4dialog.h',
     'g4dialog_options.h',
-    'gui_session.h',
 )
 
 moc_headers = files(
     'tabs/gcommands.h',
-    'tabs/gboard.h',
 )
 
 examples = {

g4dialog/tabs/gboard.cc

@@ -0,0 +1,51 @@
+// geant4
+#include "G4VisExecutive.hh"
+#include "G4RunManagerFactory.hh"
+
+// gboard
+#include "gboard.h"
+#include "gui_session.h"
+
+// qt
+#include <QApplication>
+#include <QMainWindow>
+#include <QTimer>
+
+int main(int argc, char* argv[]) {
+
+	QApplication app(argc, argv);
+
+	auto gopts =std::make_shared<GOptions>(argc, argv, gboard::defineOptions());
+	auto log = std::make_shared<GLogger>(gopts, SFUNCTION_NAME, GBOARD_LOGGER);
+
+	auto visManager = new G4VisExecutive;
+	visManager->Initialize();
+
+    // main window and controls
+	auto window = new QMainWindow();
+	window->setWindowTitle(QString::fromUtf8("displayUI example"));
+
+	auto* gboard = new GBoard(gopts, window);
+	window->setCentralWidget(gboard);
+
+	auto gui_session = std::make_unique<GUI_Session>(gopts, gboard);
+
+	log->info(0, "gboard example started");
+	int ret = EXIT_SUCCESS;
+
+	if (gopts->getSwitch("gui")) {
+		window->show();
+
+		// --- quit after 0.5 s ---
+		QTimer::singleShot(500, &app, &QCoreApplication::quit);  // ⬅️ key line :contentReference[oaicite:0]{index=0}
+
+		ret = QApplication::exec();    // returns when the timer fires
+	}
+
+	delete gboard;
+	delete window;
+	delete visManager;
+
+	return ret;
+
+}