Fixed issue that after showing label outline with Ctrl+L, the 2D view lost focus

Author: rpwang17

freeview/MainWindow.cpp

@@ -197,6 +197,7 @@ MainWindow::MainWindow( QWidget *parent, MyCmdLineParser* cmdParser ) :
   addAction(ui->actionDeleteLayer);
 
   addAction(ui->actionNextLabelPoint);
+  addAction(ui->actionShowLabelOutline);
 
 #ifdef DISABLE_LINEPROF
   ui->actionLineProfile->setVisible(false);
@@ -808,7 +809,7 @@ void MainWindow::closeEvent( QCloseEvent * event )
     msg += "\nDo you still want to quit?";
     QMessageBox msgbox(this);
     msgbox.setIcon(QMessageBox::Question);
-    QAbstractButton* yesBtn = msgbox.addButton("Quit", QMessageBox::YesRole);
+    QAbstractButton* yesBtn = msgbox.addButton("Quit without Saving", QMessageBox::YesRole);
     msgbox.addButton("Cancel", QMessageBox::NoRole);
     msgbox.setText(msg);
     msgbox.setWindowTitle("Warning");
@@ -5739,9 +5740,12 @@ bool MainWindow::OnCloseVolume(const QList<Layer*>& layers_in)
   {
     if ( qobject_cast<LayerMRI*>(layer)->IsModified() )
     {
-      if ( QMessageBox::question( this, "Volume Not Saved",
-                                  "Volume has been modifed and not been saved. Do you still want to continue?",
-                                  QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+      QMessageBox box(QMessageBox::Question, tr("Close Volume"),
+                      "Volume has been modifed and not been saved. Do you still want to continue?",
+                      QMessageBox::Yes | QMessageBox::Cancel);
+      box.setButtonText(QMessageBox::Yes, tr("Continue Without Saving"));
+      box.setDefaultButton(QMessageBox::Cancel);
+      if (box.exec() != QMessageBox::Yes)
       {
         return false;
       }
@@ -6169,9 +6173,12 @@ void MainWindow::OnCloseROI(const QList<Layer*>& layers_in)
   {
     if ( qobject_cast<LayerROI*>(layer)->IsModified() )
     {
-      if ( QMessageBox::question( this, "ROI Not Saved",
-                                  "ROI has been modifed and not been saved. Do you still want to continue?",
-                                  QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+      QMessageBox box(QMessageBox::Question, tr("Close ROI"),
+                      "ROI has been modifed and not been saved. Do you still want to continue?",
+                      QMessageBox::Yes | QMessageBox::Cancel);
+      box.setButtonText(QMessageBox::Yes, tr("Continue Without Saving"));
+      box.setDefaultButton(QMessageBox::Cancel);
+      if (box.exec() != QMessageBox::Yes)
       {
         return;
       }
@@ -6388,9 +6395,12 @@ void MainWindow::OnClosePointSet(const QList<Layer*>& layers_in)
   {
     if ( qobject_cast<LayerPointSet*>(layer)->IsModified() )
     {
-      if ( QMessageBox::question( this, "Point Set Not Saved",
-                                  "Point set has been modifed and not been saved. Do you still want to continue?",
-                                  QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+      QMessageBox box(QMessageBox::Question, tr("Close Point Set"),
+                      "Point Set has been modifed and not been saved. Do you still want to continue?",
+                      QMessageBox::Yes | QMessageBox::Cancel);
+      box.setButtonText(QMessageBox::Yes, tr("Continue Without Saving"));
+      box.setDefaultButton(QMessageBox::Cancel);
+      if (box.exec() != QMessageBox::Yes)
       {
         return;
       }
@@ -9868,3 +9878,12 @@ void MainWindow::SetNeurologicalView(bool b)
     ((RenderView2D*)m_views[i])->SetNeurologicalView(b);
   }
 }
+
+void MainWindow::OnShowLabelOutline(bool bShow)
+{
+  LayerMRI* mri = (LayerMRI*)GetLayerCollection( "MRI" )->GetActiveLayer();
+  if ( mri )
+  {
+    mri->GetProperty()->SetShowLabelOutline(bShow);
+  }
+}

freeview/MainWindow.h

@@ -632,6 +632,8 @@ protected slots:
 
   void OnDeleteLayer();
 
+  void OnShowLabelOutline(bool bShow);
+
 private:
   bool DoParseCommand(MyCmdLineParser* parser, bool bAutoQuit);
   void SaveSettings();

freeview/MainWindow.ui

@@ -1862,6 +1862,17 @@
     <string>Alt+O</string>
    </property>
   </action>
+  <action name="actionShowLabelOutline">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Label Outline</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+L</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -3861,6 +3872,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionShowLabelOutline</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>MainWindow</receiver>
+   <slot>OnShowLabelOutline(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>606</x>
+     <y>435</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <signal>CycleOverlayRequested()</signal>
@@ -3978,5 +4005,6 @@
   <slot>OnCopyView()</slot>
   <slot>OnDeleteLayer()</slot>
   <slot>SetNeurologicalView(bool)</slot>
+  <slot>OnShowLabelOutline(bool)</slot>
  </slots>
 </ui>

freeview/PanelVolume.cpp

@@ -354,6 +354,7 @@ void PanelVolume::DoIdle()
   bool bDataAvail = (!strgs.isEmpty() && strgs[0] == FS_VOLUME_SETTING_ID);
   ui->actionPasteSetting->setEnabled(layer && bDataAvail);
   ui->actionPasteSettingToAll->setEnabled(layer && bDataAvail);
+  ui->checkBoxShowOutline->setChecked(layer && layer->GetProperty()->GetShowLabelOutline());
   BlockAllSignals( false );
 }
 

freeview/PanelVolume.ui

@@ -1290,9 +1290,6 @@ of each frame</string>
       <property name="text">
        <string>Show label outline only (Ctrl+L)</string>
       </property>
-      <property name="shortcut">
-       <string>Ctrl+L</string>
-      </property>
      </widget>
     </item>
     <item>