Merge branch 'master' into SE-2709

labforge · Feb 16, 2024 · 3c50458 · 3c50458
2 parents 6208509 + 9d30ab9
commit 3c50458
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/stereo_viewer/src/gev/pipeline.cc b/stereo_viewer/src/gev/pipeline.cc
@@ -126,7 +126,11 @@ bool Pipeline::Start(bool calibrate) {
  m_stream->QueueBuffer( *lIt );
  lIt++;
  }
-
+
+ if(m_rectify) m_rectify->GetValue(m_rectify_init); 
+ m_undistort->GetValue(m_undistort_init);
+ m_pixformat->GetValue( m_pixfmt_init ); 
+
  bool rct_value = calibrate?!calibrate:m_rectify_init;
  bool und_value = calibrate?!calibrate:m_undistort_init;
  PvString pixformat = calibrate?"YUV422_8":m_pixfmt_init.GetAscii();

diff --git a/stereo_viewer/src/viewer.cc b/stereo_viewer/src/viewer.cc
@@ -186,7 +186,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
  cfg.cbxColormap->setVisible(false);
  cfg.chkColormap->setChecked(true); 
  cfg.chkCalibrate->setVisible(true);
- cfg.chkCalibrate->setChecked(true);
+ cfg.chkCalibrate->setChecked(false);
  cfg.chkCalibrate->setEnabled(true);
  s_load_colormap(cfg.cbxColormap, COLORMAP_JET);
  s_load_format(cfg.cbxFormat, false);