diff --git a/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx b/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx index 4b2ed835fb41691a33681a3d9b65ed4bd23a21ab..7e1df96619ba3a095b1c136feee8a07edfea2ca8 100644 --- a/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx +++ b/graphics/VP1/VP1Gui/src/VP1AvailEvents.cxx @@ -52,7 +52,8 @@ public: } EventID & operator= (const EventID & o ) - { + { + if (&o == this) return *this; eventNumber = o.eventNumber; runNumber = o.runNumber; return *this; diff --git a/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx b/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx index 1070d758a1f2f13f80d939620df43ae67651f4fa..46a46fb9cafe543c4208e698394a101b16c46b4a 100644 --- a/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx +++ b/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx @@ -371,7 +371,7 @@ QString VP1EventDisplayEditor::getEventDetailsLabel() QString evtstr = "Run: "+QString::number(_runNumber)+"\n" + "Event: "+QString::number(_eventNumber)+"\n" - + QString(time>0 ? QDateTime::fromTime_t(_eventTimestamp).toString(Qt::ISODate).replace('T',' ')+ " CEST" : ""); + + QString(QDateTime::fromTime_t(_eventTimestamp).toString(Qt::ISODate).replace('T',' ')+ " CEST" ); //VP1Msg::messageVerbose(evtstr); diff --git a/graphics/VP1/VP1Gui/src/VP1EventDisplaySceneView.cxx b/graphics/VP1/VP1Gui/src/VP1EventDisplaySceneView.cxx index 7097451c93b932ab1b626ab0db08aa280c9ae8aa..c71cd98ed988660ae836f30a0c46f7fb55b31e68 100644 --- a/graphics/VP1/VP1Gui/src/VP1EventDisplaySceneView.cxx +++ b/graphics/VP1/VP1Gui/src/VP1EventDisplaySceneView.cxx @@ -37,9 +37,10 @@ void GraphicsView::wheelEvent(QWheelEvent *e) } VP1EventDisplaySceneView::VP1EventDisplaySceneView(const QString &name, bool preview, QWidget *parent) -: QFrame(parent) +: QFrame(parent),_frame(nullptr),_line(nullptr) { _preview = preview; + setFrameStyle(Sunken | StyledPanel); diff --git a/graphics/VP1/VP1Gui/src/VP1Gui.cxx b/graphics/VP1/VP1Gui/src/VP1Gui.cxx index b68737bb2160e82730d1ca62be369d72b947e75d..ee9f174560f32ed976887fb50f93bcfb6de2c980 100644 --- a/graphics/VP1/VP1Gui/src/VP1Gui.cxx +++ b/graphics/VP1/VP1Gui/src/VP1Gui.cxx @@ -25,14 +25,20 @@ //____________________________________________________________________ class VP1Gui::Imp { public: - Imp() : the_scheduler(0) {} + Imp() : the_scheduler(nullptr), sg(nullptr), detstore(nullptr), + svclocator(nullptr), toolSvc(nullptr), + initialvp1files{}, + initialCruiseSeconds{}, + localFileCacheLimit{}{ + //nop + } VP1ExecutionScheduler * the_scheduler; //We hold the arguments here until init is called: - StoreGateSvc* sg; - StoreGateSvc* detstore; - ISvcLocator* svclocator; - IToolSvc*toolSvc; + StoreGateSvc * sg; + StoreGateSvc * detstore; + ISvcLocator * svclocator; + IToolSvc * toolSvc; QStringList initialvp1files; QString initialCruiseMode; unsigned initialCruiseSeconds; diff --git a/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx b/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx index 3b0b2eec8ac7c7fd7bf77fd68a76b6e1de61f1f9..9387ce6f557b4b48e1b043d3b62777ea6fe74f81 100644 --- a/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx +++ b/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx @@ -23,7 +23,13 @@ //____________________________________________________________________ class VP1IncomingMessageDialog::Imp { public: - Imp(const VP1ExternalRequest& r) : request(r) {} + Imp(const VP1ExternalRequest& r) : tabmanager{}, channelmanager{}, requestqueue{},request(r), + lcdNumber_pending{}, lcdNumber_pendingsender{}, lcdNumber_pendingexactsame{}, + blockallmessages{}, pushButton_allclear{}, pushButton_senderclear{}, + pushButton_messageclear{}, messages_blockedsenders{}, messages_blockedexactmessages{} + { + //nop + } VP1TabManager* tabmanager; VP1ChannelManager* channelmanager; QQueue<VP1ExternalRequest>* requestqueue; diff --git a/graphics/VP1/VP1Gui/src/VP1TabManager.cxx b/graphics/VP1/VP1Gui/src/VP1TabManager.cxx index d765693ed93507cb1fc9c60404e7d29890cf7ac8..9254081b5c904d45658c5c1129cb5ce67a9b8dcb 100644 --- a/graphics/VP1/VP1Gui/src/VP1TabManager.cxx +++ b/graphics/VP1/VP1Gui/src/VP1TabManager.cxx @@ -53,7 +53,9 @@ class VP1TabManager::Imp { public: //Constructor, tabwidget & channel manager: Imp(VP1TabManager*tm,VP1TabWidget* tw, VP1ChannelManager* cm) - : tabmanager(tm), tabwidget(tw),channelmanager(cm),selecteddockwidget(0), + : tabmanager(tm), tabwidget(tw),channelmanager(cm), + dontEmitVisibilityChanges{}, + selecteddockwidget(0), fullscreen_dockwidget(0),fullscreen_channelwidget(0), fullscreen_tabindex(-1),fullscreen_tab(0),tabcruisemode(false) {} @@ -130,12 +132,10 @@ VP1TabManager::~VP1TabManager(){ //___________________________________________________________________________________ -void VP1TabManager::launchStereoEditorCurrentTab() -{ +void VP1TabManager::launchStereoEditorCurrentTab(){ VP1Msg::messageVerbose("VP1TabManager::launchStereoEditorCurrentTab()"); - - if (dynamic_cast<IVP13DStandardChannelWidget*>(selectedChannelWidget()) ) { - IVP13DStandardChannelWidget* channel = dynamic_cast<IVP13DStandardChannelWidget*>(selectedChannelWidget()); + IVP13DStandardChannelWidget* channel = dynamic_cast<IVP13DStandardChannelWidget*>(selectedChannelWidget()); + if (channel ) { channel->launchStereoEditor(); } }