From 8d814a670513c223cc5ecad2cd4084424fe57284 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Thu, 1 Dec 2016 08:50:23 +0100
Subject: [PATCH] Switch EXT properly when entering / exiting transparent mode

---
 software/drsosc/DOFrame.cpp       |  2 ++
 software/drsosc/TriggerDialog.cpp | 59 +++++++++++++------------------
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/software/drsosc/DOFrame.cpp b/software/drsosc/DOFrame.cpp
index 62c9ab0..d0e3841 100644
--- a/software/drsosc/DOFrame.cpp
+++ b/software/drsosc/DOFrame.cpp
@@ -1738,6 +1738,8 @@ void DOFrame::OnSetTriggerConfig(int id, bool flag)
          if (m_multiBoard) {
             for (int i=0 ; i<m_osci->GetNumberOfBoards() ; i++) {
                m_trgConfig[i] &= ~(1<<15);
+               if (i > 0)
+                  m_trgConfig[i] = (1 << 4); // switch back to EXT trigger
             }
          } else
             m_trgConfig[m_board] &= ~(1<<15);
diff --git a/software/drsosc/TriggerDialog.cpp b/software/drsosc/TriggerDialog.cpp
index 114cab3..49bbebd 100644
--- a/software/drsosc/TriggerDialog.cpp
+++ b/software/drsosc/TriggerDialog.cpp
@@ -56,32 +56,32 @@ void TriggerDialog::UpdateControls()
       m_tbLevel2->Enable();
       m_tbLevel3->Enable();
       m_tbLevel4->Enable();
-
-      int tc = m_frame->GetTriggerConfig();
-      m_cbOR1->SetValue((tc & (1<<0))>0);
-      m_cbOR2->SetValue((tc & (1<<1))>0);
-      m_cbOR3->SetValue((tc & (1<<2))>0);
-      m_cbOR4->SetValue((tc & (1<<3))>0);
-      m_cbOREXT->SetValue((tc & (1<<4))>0);
-      
-      m_cbAND1->SetValue((tc & (1<<8))>0);
-      m_cbAND2->SetValue((tc & (1<<9))>0);
-      m_cbAND3->SetValue((tc & (1<<10))>0);
-      m_cbAND4->SetValue((tc & (1<<11))>0);
-      m_cbANDEXT->SetValue((tc & (1<<12))>0);
-      
-      m_cbTrans->SetValue((tc & (1<<15))>0);
-      
-      wxString s;
-      s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(0));
-      m_tbLevel1->SetValue(s);
-      s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(1));
-      m_tbLevel2->SetValue(s);
-      s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(2));
-      m_tbLevel3->SetValue(s);
-      s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(3));
-      m_tbLevel4->SetValue(s);
    }
+
+   int tc = m_frame->GetTriggerConfig();
+   m_cbOR1->SetValue((tc & (1<<0))>0);
+   m_cbOR2->SetValue((tc & (1<<1))>0);
+   m_cbOR3->SetValue((tc & (1<<2))>0);
+   m_cbOR4->SetValue((tc & (1<<3))>0);
+   m_cbOREXT->SetValue((tc & (1<<4))>0);
+   
+   m_cbAND1->SetValue((tc & (1<<8))>0);
+   m_cbAND2->SetValue((tc & (1<<9))>0);
+   m_cbAND3->SetValue((tc & (1<<10))>0);
+   m_cbAND4->SetValue((tc & (1<<11))>0);
+   m_cbANDEXT->SetValue((tc & (1<<12))>0);
+   
+   m_cbTrans->SetValue((tc & (1<<15))>0);
+   
+   wxString s;
+   s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(0));
+   m_tbLevel1->SetValue(s);
+   s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(1));
+   m_tbLevel2->SetValue(s);
+   s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(2));
+   m_tbLevel3->SetValue(s);
+   s.Printf(wxT("%1.3lf"), m_frame->GetTrgLevel(3));
+   m_tbLevel4->SetValue(s);
 }
 
 void TriggerDialog::OnClose( wxCommandEvent& event )
@@ -99,15 +99,6 @@ void TriggerDialog::OnButton( wxCommandEvent& event )
          m_cbTrans->SetValue(false);
          return;
       }
-      if (event.IsChecked()) {
-         m_cbOREXT->SetValue(false);
-         m_cbOREXT->Disable();
-         m_cbANDEXT->SetValue(false);
-         m_cbANDEXT->Disable();
-      } else {
-         m_cbOREXT->Enable();
-         m_cbANDEXT->Enable();
-      }
    }
    m_frame->OnSetTriggerConfig(event.GetId(), event.IsChecked());
 }