Import Geant4 10.3.1 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 101789 2016-11-28 15:31:24Z gcosmo $
|
||||
$Id: History 102539 2017-02-08 14:06:50Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,11 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
13th January Laurent Garnier (interfaces-V10-02-15)
|
||||
- G4UIQt:
|
||||
o Fix bugzilla 1933. I check was missing to avoid a NULL pointer
|
||||
o Avoid problem on close when deleting objects
|
||||
|
||||
25th November 2016 Laurent Garnier (interfaces-V10-02-13-interfaces-V10-02-14)
|
||||
- G4UIQt:
|
||||
o Fix a bug on Qt5.7 with an extra whitespace
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIQt.cc 101789 2016-11-28 15:31:24Z gcosmo $
|
||||
// $Id: G4UIQt.cc 102539 2017-02-08 14:06:50Z gcosmo $
|
||||
//
|
||||
// L. Garnier
|
||||
|
||||
@@ -208,6 +208,7 @@ G4UIQt::G4UIQt (
|
||||
CreateIcons();
|
||||
|
||||
fMainWindow = new QMainWindow();
|
||||
fMainWindow->setAttribute(Qt::WA_DeleteOnClose);
|
||||
|
||||
fMainWindow->setCorner( Qt::TopLeftCorner, Qt::LeftDockWidgetArea );
|
||||
fMainWindow->setCorner( Qt::TopRightCorner, Qt::RightDockWidgetArea );
|
||||
@@ -270,10 +271,6 @@ G4UIQt::~G4UIQt(
|
||||
masterG4coutDestination = 0; // set to cout when UI is deleted
|
||||
#endif
|
||||
}
|
||||
|
||||
if (fMainWindow!=NULL) {
|
||||
delete fMainWindow;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4241,7 +4238,9 @@ void G4UIQt::ChangeCursorAction(const QString& action) {
|
||||
fPickSelected = false;
|
||||
list.at(i)->setChecked(FALSE);
|
||||
G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/set/picking false");
|
||||
fPickInfosDialog->hide();
|
||||
if (fPickInfosDialog) {
|
||||
fPickInfosDialog->hide();
|
||||
}
|
||||
} else if (list.at(i)->data().toString () == "rotate") {
|
||||
fRotateSelected = false;
|
||||
list.at(i)->setChecked(FALSE);
|
||||
|
||||
Reference in New Issue
Block a user