More accurate handling of deleted instrument in InsturmentEditorWidget.

GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp

@@ -74,6 +74,13 @@ void DetectorEditorWidget::subscribeToItem()
     init_SubDetector_Widget();
 }
 
+void DetectorEditorWidget::unsubscribeFromItem()
+{
+    m_currentDetector = nullptr;
+    remove_SubDetectorWidget();
+    m_detectorTypeEditor->clearEditor();
+}
+
 void DetectorEditorWidget::init_SubDetector_Widget()
 {
     if (m_currentDetector == instrumentItem()->detectorItem())
@@ -81,11 +88,7 @@ void DetectorEditorWidget::init_SubDetector_Widget()
 
     m_currentDetector = instrumentItem()->detectorItem();
 
-    if (m_subDetectorWidget)
-        m_groupBox->layout()->removeWidget(m_subDetectorWidget);
-
-    delete m_subDetectorWidget;
-    m_subDetectorWidget = 0;
+    remove_SubDetectorWidget();
 
     if (m_currentDetector->modelType() == Constants::SphericalDetectorType) {
         m_subDetectorWidget = new SphericalDetectorWidget(m_columnResizer, m_currentDetector);
@@ -100,6 +103,15 @@ void DetectorEditorWidget::init_SubDetector_Widget()
     m_groupBox->layout()->addWidget(m_subDetectorWidget);
 }
 
+void DetectorEditorWidget::remove_SubDetectorWidget()
+{
+    if (m_subDetectorWidget)
+        m_groupBox->layout()->removeWidget(m_subDetectorWidget);
+
+    delete m_subDetectorWidget;
+    m_subDetectorWidget = 0;
+}
+
 InstrumentItem* DetectorEditorWidget::instrumentItem()
 {
     return dynamic_cast<InstrumentItem*>(currentItem());

GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h

@@ -40,9 +40,11 @@ private slots:
 
 protected:
     virtual void subscribeToItem();
+    virtual void unsubscribeFromItem();
 
 private:
     void init_SubDetector_Widget();
+    void remove_SubDetectorWidget();
     InstrumentItem* instrumentItem();
 
     ColumnResizer* m_columnResizer;

GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp

@@ -44,6 +44,11 @@ InstrumentComponentsWidget::InstrumentComponentsWidget(QWidget* parent)
 
 void InstrumentComponentsWidget::setInstrumentItem(InstrumentItem* instrumentItem)
 {
-    m_beamEditor->setBeamItem(instrumentItem->beamItem());
-    m_detectorEditor->setItem(instrumentItem);
+    if(instrumentItem) {
+        m_beamEditor->setBeamItem(instrumentItem->beamItem());
+        m_detectorEditor->setItem(instrumentItem);
+    } else {
+        m_beamEditor->setBeamItem(nullptr);
+        m_detectorEditor->setItem(nullptr);
+    }
 }

GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp

@@ -71,8 +71,7 @@ void InstrumentEditorWidget::setInstrumentItem(SessionItem* instrument)
     updateWidgets();
 
     InstrumentItem* instrumentItem = dynamic_cast<InstrumentItem*>(instrument);
-    if (instrumentItem)
-        m_instrumentComponents->setInstrumentItem(instrumentItem);
+    m_instrumentComponents->setInstrumentItem(instrumentItem);
 }
 
 void InstrumentEditorWidget::onChangedEditor(const QString&)
@@ -109,9 +108,9 @@ void InstrumentEditorWidget::updateWidgets()
     m_block_signals = true;
 
     if (m_currentItem) {
-        m_nameLineEdit->setText(m_currentItem->itemName());
         m_nameLineEdit->setEnabled(true);
         m_typeComboBox->setEnabled(true);
+        m_nameLineEdit->setText(m_currentItem->itemName());
     } else {
         m_nameLineEdit->setText(QString());
         m_nameLineEdit->setEnabled(false);

GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp

@@ -45,6 +45,7 @@ InstrumentSelectorWidget::InstrumentSelectorWidget(InstrumentModel *model, QWidg
     ""));
 
     setModel(model);
+    layout()->setMargin(10);
 }
 
 QSize InstrumentSelectorWidget::sizeHint() const