diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp index b8a35e1f7bde46a2a0c35819cc93ba5b33484374..f0068d5540b11f2a58e3becff806e93e6e50a2fe 100644 --- a/GUI/coregui/Models/ApplicationModels.cpp +++ b/GUI/coregui/Models/ApplicationModels.cpp @@ -116,9 +116,9 @@ void ApplicationModels::resetModels() m_instrumentModel->insertNewItem(Constants::DetectorType, m_instrumentModel->indexOfItem(instrument)); m_instrumentModel->insertNewItem(Constants::BeamType, m_instrumentModel->indexOfItem(instrument)); - m_realDataModel->insertNewItem(Constants::RealDataType); - m_realDataModel->insertNewItem(Constants::RealDataType); - m_realDataModel->insertNewItem(Constants::RealDataType); +// m_realDataModel->insertNewItem(Constants::RealDataType); +// m_realDataModel->insertNewItem(Constants::RealDataType); +// m_realDataModel->insertNewItem(Constants::RealDataType); } diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp index 5e51f0fcb714745f47a94d34d16f4ca6b502bdd8..6e4dce56dfeb1f4d4e047c5cd9c600b0bfa18daa 100644 --- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp +++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp @@ -21,18 +21,33 @@ #include <QVBoxLayout> #include <QDebug> +namespace { +const int widget_minimum_size_hint = 64; +const int widget_size_hint = 128; +} + ItemSelectorWidget::ItemSelectorWidget(QWidget *parent) : QWidget(parent) , m_listView(new QListView(this)) , m_model(0) { - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); QVBoxLayout *verticalLayout = new QVBoxLayout; verticalLayout->addWidget(m_listView); setLayout(verticalLayout); } +QSize ItemSelectorWidget::sizeHint() const +{ + return QSize(widget_size_hint, widget_size_hint*4); +} + +QSize ItemSelectorWidget::minimumSizeHint() const +{ + return QSize(widget_minimum_size_hint, widget_minimum_size_hint); +} + void ItemSelectorWidget::setModel(SessionModel *model) { if(model == m_model) diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h index 02afc358dffb4a7722b5929d95a2c013410278fd..db68b790ae62842da719a927103748cf085be1e0 100644 --- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h +++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h @@ -35,8 +35,8 @@ class BA_CORE_API_ ItemSelectorWidget : public QWidget public: ItemSelectorWidget(QWidget *parent = 0); - QSize sizeHint() const { return QSize(200, 400); } - QSize minimumSizeHint() const { return QSize(128, 200); } + QSize sizeHint() const; + QSize minimumSizeHint() const; void setModel(SessionModel *model); diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp index 9d01e9c5cbe9040d7f9b05f764bb0a5be74c0cf3..0b3e5b03f04535a23f4dc14b25e71502fad25f33 100644 --- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp +++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp @@ -20,11 +20,21 @@ #include <QVBoxLayout> #include <QDebug> +namespace { +const int widget_size_hint = 1024; +const int widget_minimum_size_hint = 256; +} + ItemStackWidget::ItemStackWidget(QWidget *parent) : QWidget(parent) , m_stackedWidget(new QStackedWidget) , m_model(0) { + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setMinimumSize(widget_minimum_size_hint, widget_minimum_size_hint); + + m_stackedWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + QVBoxLayout *layout = new QVBoxLayout; layout->setMargin(0); layout->setSpacing(0); @@ -42,6 +52,16 @@ void ItemStackWidget::setModel(SessionModel *model) connectModel(); } +QSize ItemStackWidget::sizeHint() const +{ + return QSize(widget_size_hint, widget_size_hint); +} + +QSize ItemStackWidget::minimumSizeHint() const +{ + return QSize(widget_minimum_size_hint, widget_minimum_size_hint); +} + void ItemStackWidget::onModelAboutToBeReset() { qDebug() << "ItemStackWidget::onModelAboutToBeReset()"; diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h index 7e6c844d17b84161fb8e1876e64a9700d6b398a4..718dc1df413279356521d4307f1b27bf4d0b9385 100644 --- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h +++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h @@ -38,6 +38,9 @@ public: void setModel(SessionModel *model); virtual void setItem(SessionItem *item) = 0; + QSize sizeHint() const; + QSize minimumSizeHint() const; + public slots: virtual void onModelAboutToBeReset(); virtual void onRowsAboutToBeRemoved(const QModelIndex &parent,int first,int); diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp index e4b640d282609322616f26cb91b67e2a3277d79a..58f0266a9974b1527cbd40d37666f6c0c3947d25 100644 --- a/GUI/coregui/Views/ImportDataView.cpp +++ b/GUI/coregui/Views/ImportDataView.cpp @@ -42,6 +42,7 @@ ImportDataView::ImportDataView(MainWindow *mainWindow) m_splitter->setCollapsible(0, false); m_splitter->setCollapsible(1, false); + mainLayout->addWidget(m_toolBar); mainLayout->addWidget(m_splitter); diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp index ee5c7f6308637f6e22fb3a4c380ab14e90f06834..bc29b4b0a66e5d5ce6c9aaf7421667255ac65e18 100644 --- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp +++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp @@ -76,6 +76,8 @@ void ImportDataToolBar::onImportDataAction() SessionItem *realDataItem = m_model->insertNewItem(Constants::RealDataType); IntensityDataItem *intensityDataItem = dynamic_cast<IntensityDataItem *>(m_model->insertNewItem(Constants::IntensityDataType, realDataItem->index())); intensityDataItem->setOutputData(data); + m_selectionModel->clearSelection(); + m_selectionModel->select(realDataItem->index(), QItemSelectionModel::Select); } } diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp index 5857d1d63b225191bd52619ed88f6a4a19413451..822572ada7bddd1a3b29f6933a541b5bb4527d2a 100644 --- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp +++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp @@ -21,6 +21,7 @@ #include "IntensityDataItem.h" #include <QVBoxLayout> #include <QLabel> +#include <QDebug> RealDataEditorWidget::RealDataEditorWidget(QWidget *parent) : QWidget(parent) @@ -36,10 +37,11 @@ RealDataEditorWidget::RealDataEditorWidget(QWidget *parent) void RealDataEditorWidget::setItem(SessionItem *item) { -// m_label->setText(item->displayName()); - + // m_label->setText(item->displayName()); + qDebug() << "AAAAA ->setItem"; IntensityDataItem *intensityData = dynamic_cast<IntensityDataItem *>(item->getItem(RealDataItem::T_INTENSITY_DATA)); Q_ASSERT(intensityData); Q_ASSERT(intensityData->getOutputData()); m_colorMap->setItem(intensityData); + qDebug() << "AAAAA -> done!"; } diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h index 4f653292f8c573420e27fe802d8e7bba1c68b8dc..810d5f01dfa0fdb6c1ca9ee52fb6e3a3375ca168 100644 --- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h +++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h @@ -30,7 +30,7 @@ public: RealDataEditorWidget(QWidget *parent = 0); // QSize sizeHint() const { return QSize(200, 400); } - QSize minimumSizeHint() const { return QSize(200, 200); } +// QSize minimumSizeHint() const { return QSize(200, 200); } void setItem(class SessionItem *item); diff --git a/GUI/coregui/mainwindow/mainwindow_constants.h b/GUI/coregui/mainwindow/mainwindow_constants.h index 6564833d3d5dc3635c8357e14f88997dfdd86354..f764f3087230d04d0f4ab8520bdc855b49da61f5 100644 --- a/GUI/coregui/mainwindow/mainwindow_constants.h +++ b/GUI/coregui/mainwindow/mainwindow_constants.h @@ -55,7 +55,7 @@ const unsigned int MAIN_THEME_COLOR = 0x086FA1; const unsigned int BUTTON_COLOR = 0x044362; const unsigned int BUTTON_TEXT_COLOR = 0xFFFFFF; -const unsigned int REALTIME_WIDGET_WIDTH_HINT = 480 ; +const unsigned int REALTIME_WIDGET_WIDTH_HINT = 480; // }