diff --git a/slsDetectorGui/include/qDetectorMain.h b/slsDetectorGui/include/qDetectorMain.h index fd8b8c830..b4ec2cdb6 100644 --- a/slsDetectorGui/include/qDetectorMain.h +++ b/slsDetectorGui/include/qDetectorMain.h @@ -113,9 +113,8 @@ private: int isDeveloper; /**Sets up the layout of the widget - * @param fName file name of the config file at start up * */ - void SetUpWidgetWindow(const string fName); + void SetUpWidgetWindow(); /**Sets up detector * @param fName file name of the config file at start up diff --git a/slsDetectorGui/include/qTabMessages.h b/slsDetectorGui/include/qTabMessages.h index 49d722d46..ccc90691b 100644 --- a/slsDetectorGui/include/qTabMessages.h +++ b/slsDetectorGui/include/qTabMessages.h @@ -27,19 +27,15 @@ class qTabMessages:public QWidget{ public: /** \short The constructor - * @param parent is the parent tab widget + * @param parent is the parent tab widget + * @param det the detector reference */ - qTabMessages(QWidget *parent); + qTabMessages(QWidget *parent,multiSlsDetector*& detector); /** Destructor */ ~qTabMessages(); - /** Set the detetor reference - * @param det the detector reference - */ - void SetDetectorReference(multiSlsDetector*& detector){myDet = detector;}; - private: /** The sls detector object */ diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index d7a254b3f..676362488 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -64,7 +64,8 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, QWidget * } setupUi(this); - SetUpWidgetWindow(configFName); + SetUpDetector(configFName); + SetUpWidgetWindow(); Initialization(); } @@ -83,33 +84,21 @@ qDetectorMain::~qDetectorMain(){ //------------------------------------------------------------------------------------------------------------------------------------------------- -void qDetectorMain::SetUpWidgetWindow(const string fName){ +void qDetectorMain::SetUpWidgetWindow(){ // Layout layoutTabs= new QGridLayout; centralwidget->setLayout(layoutTabs); - -//tabs setup - tabs = new MyTabWidget(this); - 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 +//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 +//tabs setup + tabs = new MyTabWidget(this); + layoutTabs->addWidget(tabs); cout<<"DockPlot ready"<insertTab(Advanced, scroll[Advanced], "Advanced"); tabs->insertTab(Debugging, scroll[Debugging], "Debugging"); tabs->insertTab(Developer, scroll[Developer], "Developer"); + //no scroll buttons this way + tabs->insertTab(Messages, tab_messages, "Messages"); //swap tabs so that messages is last tab - tabs->tabBar()->moveTab(tabs->indexOf(tab_messages),Messages); + tabs->tabBar()->moveTab(tabs->indexOf(tab_measurement), Measurement); + tabs->tabBar()->moveTab(tabs->indexOf(tab_settings), Settings); + tabs->tabBar()->moveTab(tabs->indexOf(tab_dataoutput), DataOutput); + tabs->tabBar()->moveTab(tabs->indexOf(tab_plot), Plot); + tabs->tabBar()->moveTab(tabs->indexOf(tab_actions), Actions); + tabs->tabBar()->moveTab(tabs->indexOf(tab_advanced), Advanced); + tabs->tabBar()->moveTab(tabs->indexOf(tab_debugging), Debugging); + tabs->tabBar()->moveTab(tabs->indexOf(tab_developer), Developer); + tabs->tabBar()->moveTab(tabs->indexOf(tab_messages), Messages); tabs->setCurrentIndex(Measurement); //other tab properties @@ -156,10 +156,7 @@ void qDetectorMain::SetUpWidgetWindow(const string fName){ // mode setup - to set up the tabs initially as disabled, not in form so done here #ifdef VERBOSE - cout << "Setting Debug Mode to 0\n" - "Setting Expert Mode to 0\n" - "Setting Developer Mode to " << isDeveloper << "" - "\nSetting Dockable Mode to false\n" << endl; + cout << "Setting Debug Mode to 0\nSetting Expert Mode to 0\nSetting Developer Mode to " << isDeveloper << "\nSetting Dockable Mode to false\n" << endl; #endif tabs->setTabEnabled(Debugging,false); tabs->setTabEnabled(Advanced,false); @@ -191,6 +188,9 @@ void qDetectorMain::SetUpDetector(const string fName){ //instantiate detector and set window title myDet = new multiSlsDetector(detID); + //create messages tab to capture config file loading logs + tab_messages = new qTabMessages (this,myDet); cout<<"Messages ready"<