lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.0.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-06-25 16:12:29 +02:00
parent c968e26a39
commit 6399a014b6
4200 changed files with 207479 additions and 237366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/Qt3D/src/G4Qt3DSceneHandler.cc
+15 -6
View File
@@ -128,7 +128,8 @@ G4Qt3DQEntity* G4Qt3DSceneHandler::CreateNewNode()
if (fReadyForTransients) { // All transients hang from this node
newNode = new G4Qt3DQEntity(fpTransientObjects);
newNode->setObjectName(fpModel->GetGlobalTag().c_str());
G4String name = fpModel? fpModel->GetGlobalTag(): "User";
newNode->setObjectName(name.c_str());
return newNode;
}
@@ -467,7 +468,7 @@ void G4Qt3DSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
}
}
void G4Qt3DSceneHandler::AddPrimitive(const G4Text& text) {
void G4Qt3DSceneHandler::AddPrimitive(const G4Text& /*text*/) {
#ifdef G4QT3DDEBUG
G4cout <<
"G4Qt3DSceneHandler::AddPrimitive(const G4Text& text) called.\n"
@@ -483,6 +484,7 @@ void G4Qt3DSceneHandler::AddPrimitive(const G4Text& text) {
"Text drawing doesn't work yet");
} // OK. Not working, but let it execute, which it does without error.
/* But it crashes after /vis/viewer/rebuild!!!
auto currentNode = CreateNewNode();
if (!currentNode) return; // Node not available
@@ -490,7 +492,8 @@ void G4Qt3DSceneHandler::AddPrimitive(const G4Text& text) {
auto position = fObjectTransformation*G4Translate3D(text.GetPosition());
auto transform = G4Qt3DUtils::CreateQTransformFrom(position);
transform->setScale(10);
// transform->setScale(10);
transform->setScale(0.1);
// auto currentEntity = new Qt3DCore::QEntity(currentNode);
@@ -499,8 +502,10 @@ void G4Qt3DSceneHandler::AddPrimitive(const G4Text& text) {
qtext->setParent(currentNode);
// qtext->setParent(currentEntity); // ?? Doesn't help
qtext->setText(text.GetText().c_str());
qtext->setHeight(100);
qtext->setWidth(1000);
// qtext->setHeight(100);
// qtext->setWidth(1000);
qtext->setHeight(20);
qtext->setWidth(100);
qtext->setColor(Qt::green);
qtext->setFont(QFont("Courier New", 10));
qtext->addComponent(transform);
@@ -520,6 +525,7 @@ void G4Qt3DSceneHandler::AddPrimitive(const G4Text& text) {
// currentNode->addComponent(material);
// currentNode->addComponent(transform);
// currentNode->addComponent(textMesh);
*/
}
void G4Qt3DSceneHandler::AddPrimitive(const G4Circle& circle)
@@ -704,7 +710,10 @@ void G4Qt3DSceneHandler::AddPrimitive(const G4Polyhedron& polyhedron)
if(isAuxilaryEdgeVisible||edgeFlag[2]>0)insertIfNew(Line(vertex[2],vertex[3]));
if(isAuxilaryEdgeVisible||edgeFlag[3]>0)insertIfNew(Line(vertex[3],vertex[0]));
} else {
G4cerr << "ERROR: polyhedron face with more than 4 edges" << G4endl;
G4cerr
<< "ERROR: polyhedron face with unexpected number of edges (" << nEdges << ')'
<< "\n Tag: " << fpModel->GetCurrentTag()
<< G4endl;
return;
}
} while (notLastFace);
source/visualization/Qt3D/src/G4Qt3DUtils.cc
+4 -4
View File
@@ -62,9 +62,9 @@ void G4Qt3DUtils::delete_entity_recursively(Qt3DCore::QNode *node){
#endif
Qt3DCore::QEntity* entity = dynamic_cast<Qt3DCore::QEntity*>(node);
if(entity == nullptr){
#ifdef G4QT3DDEBUG
G4String name = node->objectName().toStdString();
if (name == "") name = "X";
#ifdef G4QT3DDEBUG
G4Qt3DUtils::LogFile << (void*)node << ": "
<< "Deleting non-entity node " << name << std::endl;
#endif
@@ -73,9 +73,9 @@ void G4Qt3DUtils::delete_entity_recursively(Qt3DCore::QNode *node){
return;
}
for (auto component: entity->components()) {
#ifdef G4QT3DDEBUG
G4String name = component->objectName().toStdString();
if (name == "") name = "X";
#ifdef G4QT3DDEBUG
G4Qt3DUtils::LogFile << (void*)node << ": " << "Deleting component " << name
<< " of " << entity->objectName().toStdString() << std::endl;
#endif
@@ -104,17 +104,17 @@ void G4Qt3DUtils::delete_entity_recursively(Qt3DCore::QNode *node){
void G4Qt3DUtils::delete_components_and_children_of_entity_recursively(Qt3DCore::QNode *node){
Qt3DCore::QEntity* entity = dynamic_cast<Qt3DCore::QEntity*>(node);
if(entity == nullptr){
#ifdef G4QT3DDEBUG
G4String name = node->objectName().toStdString();
if (name == "") name = "X";
#ifdef G4QT3DDEBUG
G4Qt3DUtils::LogFile << (void*)node << ": " << "Found non-entity node " << name << std::endl;
#endif
return;
}
for (auto component: entity->components()){
#ifdef G4QT3DDEBUG
G4String name = component->objectName().toStdString();
if (name == "") name = "X";
#ifdef G4QT3DDEBUG
G4Qt3DUtils::LogFile << (void*)entity << ": " << "Deleting component " << name
<< " of " << entity->objectName().toStdString() << std::endl;
#endif
source/visualization/Qt3D/src/G4Qt3DViewer.cc
+7 -1
View File
@@ -247,7 +247,9 @@ G4bool G4Qt3DViewer::CompareForKernelVisit(G4ViewParameters& lastVP)
(lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ())||
(lastVP.IsPicking () != fVP.IsPicking ()) ||
(lastVP.GetVisAttributesModifiers() !=
fVP.GetVisAttributesModifiers())
fVP.GetVisAttributesModifiers()) ||
(lastVP.IsSpecialMeshRendering() !=
fVP.IsSpecialMeshRendering())
) {
return true;
}
@@ -265,6 +267,10 @@ G4bool G4Qt3DViewer::CompareForKernelVisit(G4ViewParameters& lastVP)
(lastVP.GetExplodeFactor () != fVP.GetExplodeFactor ()))
return true;
if (lastVP.IsSpecialMeshRendering() &&
(lastVP.GetSpecialMeshVolumes() != fVP.GetSpecialMeshVolumes()))
return true;
return false;
}