diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 97679de97..d7a254b3f 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -95,23 +95,27 @@ void qDetectorMain::SetUpWidgetWindow(const string fName){ layoutTabs->addWidget(tabs); - // creating the messages tab before the plots and detector to catch config stdout - tab_messages = new qTabMessages (this); cout<<"Messages ready"<insertTab(Messages, tab_messages, "Messages"); + // settings up detector SetUpDetector(fName); + // plot setup - myPlot = new qDrawPlot(dockWidgetPlot,myDet);cout<<"DockPlot ready"<setWidget(myPlot); //settings messages to have the det reference tab_messages->SetDetectorReference(myDet); // creating all the other tab widgets tab_measurement = new qTabMeasurement (this, myDet,myPlot); cout<<"Measurement ready"<insertTab(Advanced, scroll[Advanced], "Advanced"); tabs->insertTab(Debugging, scroll[Debugging], "Debugging"); tabs->insertTab(Developer, scroll[Developer], "Developer"); - // Prefer this to expand and not have scroll buttons - tabs->insertTab(Messages, tab_messages, "Messages"); +//swap tabs so that messages is last tab + tabs->tabBar()->moveTab(tabs->indexOf(tab_messages),Messages); + tabs->setCurrentIndex(Measurement); + +//other tab properties // Default tab color defaultTabColor = tabs->tabBar()->tabTextColor(DataOutput); //Set the current tab(measurement) to blue as it is the current one diff --git a/slsDetectorGui/src/qTabMessages.cpp b/slsDetectorGui/src/qTabMessages.cpp index 7d22b7395..d0c357788 100644 --- a/slsDetectorGui/src/qTabMessages.cpp +++ b/slsDetectorGui/src/qTabMessages.cpp @@ -25,7 +25,7 @@ using namespace std; //------------------------------------------------------------------------------------------------------------------------------------------------- -qTabMessages::qTabMessages(QWidget *parent):QWidget(parent),myDet(0){ +qTabMessages::qTabMessages(QWidget *parent):QWidget(parent),myDet(0),qout(NULL){ SetupWidgetWindow(); Initialization(); } @@ -65,7 +65,7 @@ void qTabMessages::SetupWidgetWindow(){ gridLayout->addItem(new QSpacerItem(15,10,QSizePolicy::Fixed,QSizePolicy::Fixed),2,0); gridLayout->addWidget(dispLog,3,0,1,5); - qout=new qDebugStream(cout,cerr, this);cout<<"working!"<