Merge branch 'stop_motion_improvements' by turtletooth

Author: manongjohn

toonz/sources/CMakeLists.txt

@@ -253,7 +253,6 @@ find_package(Qt5 REQUIRED
     LinguistTools
     Multimedia
     MultimediaWidgets
-    SerialPort
 )
 
 set(QT_MINIMUM_VERSION 5.5.0)

toonz/sources/stopmotion/canon.cpp

@@ -1328,10 +1328,10 @@ EdsError Canon::handlePropertyEvent(EdsPropertyEvent event,
 EdsError Canon::handleStateEvent(EdsStateEvent event, EdsUInt32 parameter,
                                  EdsVoid* context) {
   if (event == kEdsStateEvent_Shutdown) {
-      instance()->m_sessionOpen = false;
-      instance()->releaseCamera();
+    instance()->m_sessionOpen = false;
+    instance()->releaseCamera();
     if (instance()->m_sessionOpen && instance()->getCameraCount() > 0) {
-      //instance()->closeCameraSession();
+      // instance()->closeCameraSession();
     }
     StopMotion::instance()->m_liveViewStatus = 0;
     emit(instance()->canonCameraChanged(QString("")));

toonz/sources/stopmotion/stopmotion.cpp

@@ -207,7 +207,6 @@ StopMotion::StopMotion() {
 
   m_webcam = new Webcam();
   m_canon  = Canon::instance();
-  m_serial = new StopMotionSerial();
   m_light  = new StopMotionLight();
 
   m_alwaysLiveView = StopMotionAlwaysLiveView;
@@ -309,7 +308,7 @@ void StopMotion::onSceneSwitched() {
         setXSheetFrameNumber(xsh->getFrameCount() + 1);
         loadXmlFile();
         buildLiveViewMap(sl);
-        m_sl = sl;
+        m_sl  = sl;
         found = true;
         break;
       }
@@ -1001,7 +1000,6 @@ void StopMotion::setXSheetFrameNumber(int frameNumber) {
   TApp::instance()->getCurrentFrame()->setFrame(frameNumber - 1);
   loadLineUpImage();
   emit(xSheetFrameNumberChanged(m_xSheetFrameNumber));
-  m_serial->sendSerialData();
   TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
 }
 

toonz/sources/stopmotion/stopmotion.h

@@ -20,7 +20,6 @@
 #include "webcam.h"
 #include "jpgconverter.h"
 #include "canon.h"
-#include "stopmotionserial.h"
 #include "stopmotionlight.h"
 
 #include "toonz/txshsimplelevel.h"
@@ -78,7 +77,6 @@ class StopMotion : public QObject {  // Singleton
 
   Webcam* m_webcam;
   Canon* m_canon;
-  StopMotionSerial* m_serial;
   StopMotionLight* m_light;
 
   bool m_usingWebcam       = false;

toonz/sources/stopmotion/stopmotioncontroller.cpp

@@ -53,7 +53,6 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QToolTip>
-#include <QSerialPort>
 
 #ifdef _WIN32
 #include <dshow.h>
@@ -184,12 +183,10 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
   m_tabBar->addSimpleTab(tr("Settings"));
   m_tabBar->addSimpleTab(tr("Options"));
   m_tabBar->addSimpleTab(tr("Light"));
-  m_tabBar->addSimpleTab(tr("Motion"));
   m_tabBarContainer    = new TabBarContainter(this);
   m_mainControlsPage   = new QFrame(this);
   m_cameraSettingsPage = new QFrame(this);
   m_optionsPage        = new QFrame(this);
-  m_motionPage         = new QFrame(this);
   m_lightPage          = new QFrame(this);
 
   // **********************
@@ -853,44 +850,22 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
     if (m_stopMotion->m_light->m_screenCount < 3) m_screen3Box->hide();
     if (m_stopMotion->m_light->m_screenCount < 2) m_screen2Box->hide();
 
-    QVBoxLayout *motionOutsideLayout = new QVBoxLayout;
-    // QGridLayout* motionInsideLayout = new QGridLayout;
-    m_controlDeviceCombo = new QComboBox(this);
-    m_controlDeviceCombo->addItems(
-        m_stopMotion->m_serial->getAvailableSerialPorts());
-
-    QGroupBox *motionBox      = new QGroupBox(tr("Motion Control"), this);
-    QGridLayout *motionLayout = new QGridLayout;
-    motionLayout->addWidget(new QLabel(tr("Port: ")), 0, 0, Qt::AlignRight);
-    motionLayout->addWidget(m_controlDeviceCombo, 0, 1, Qt::AlignLeft);
-    motionLayout->setColumnStretch(1, 30);
-    motionBox->setLayout(motionLayout);
-    motionBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
-    motionOutsideLayout->addWidget(motionBox, Qt::AlignCenter);
-    motionOutsideLayout->addStretch();
-
-    // motionOutsideLayout->addLayout(motionInsideLayout);
-    m_motionPage->setLayout(motionOutsideLayout);
-
     QScrollArea *mainArea = makeChooserPageWithoutScrollBar(m_mainControlsPage);
     QScrollArea *settingsArea =
         makeChooserPageWithoutScrollBar(m_cameraSettingsPage);
     QScrollArea *optionsArea = makeChooserPageWithoutScrollBar(m_optionsPage);
     QScrollArea *lightArea   = makeChooserPageWithoutScrollBar(m_lightPage);
-    QScrollArea *motionArea  = makeChooserPageWithoutScrollBar(m_motionPage);
 
     mainArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     settingsArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     optionsArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     lightArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-    motionArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
     m_stackedChooser = new QStackedWidget(this);
     m_stackedChooser->addWidget(mainArea);
     m_stackedChooser->addWidget(settingsArea);
     m_stackedChooser->addWidget(optionsArea);
     m_stackedChooser->addWidget(lightArea);
-    m_stackedChooser->addWidget(motionArea);
     m_stackedChooser->setFocusPolicy(Qt::NoFocus);
 
     QFrame *opacityFrame    = new QFrame();
@@ -1218,10 +1193,6 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
   ret = ret && connect(m_stopMotion->m_light, SIGNAL(blackCaptureSignal(bool)),
                        this, SLOT(onBlackCaptureSignal(bool)));
 
-  // Serial Port Connections
-  ret = ret && connect(m_controlDeviceCombo, SIGNAL(currentIndexChanged(int)),
-                       this, SLOT(serialPortChanged(int)));
-
   // Time Lapse
   ret = ret && connect(m_timerCB, SIGNAL(toggled(bool)), this,
                        SLOT(onIntervalTimerCBToggled(bool)));
@@ -1265,6 +1236,7 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
   onSceneSwitched();
   m_stopMotion->setToNextNewLevel();
   m_saveInFileFld->setPath(m_stopMotion->getFilePath());
+  updateLightsEnabled();
 
 #ifndef _WIN32
   m_directShowCB->hide();
@@ -1322,9 +1294,7 @@ void StopMotionController::onBlackScreenForCaptureChanged(int checked) {
 void StopMotionController::onBlackCaptureSignal(bool on) {
   m_blackScreenForCapture->blockSignals(true);
   m_blackScreenForCapture->setChecked(on);
-  m_screen1Box->setDisabled(on);
-  m_screen2Box->setDisabled(on);
-  m_screen3Box->setDisabled(on);
+  updateLightsEnabled();
   m_blackScreenForCapture->blockSignals(false);
 }
 
@@ -1396,6 +1366,7 @@ void StopMotionController::onScreen3ColorChanged(TPixel32 color) {
 void StopMotionController::onScreen1OverlayChanged(bool on) {
   m_screen1Box->blockSignals(true);
   m_screen1Box->setChecked(on);
+  updateLightsEnabled();
   m_screen1Box->blockSignals(false);
 }
 
@@ -1404,6 +1375,7 @@ void StopMotionController::onScreen1OverlayChanged(bool on) {
 void StopMotionController::onScreen2OverlayChanged(bool on) {
   m_screen2Box->blockSignals(true);
   m_screen2Box->setChecked(on);
+  updateLightsEnabled();
   m_screen2Box->blockSignals(false);
 }
 
@@ -1412,6 +1384,7 @@ void StopMotionController::onScreen2OverlayChanged(bool on) {
 void StopMotionController::onScreen3OverlayChanged(bool on) {
   m_screen3Box->blockSignals(true);
   m_screen3Box->setChecked(on);
+  updateLightsEnabled();
   m_screen3Box->blockSignals(false);
 }
 
@@ -1430,6 +1403,24 @@ void StopMotionController::onTestLightsTimeout() {
 
 //-----------------------------------------------------------------------------
 
+void StopMotionController::updateLightsEnabled() {
+  bool enabled = true;
+  if (m_blackScreenForCapture->isChecked()) {
+    enabled = false;
+  }
+  m_screen1Box->setEnabled(enabled);
+  m_screen2Box->setEnabled(enabled);
+  m_screen3Box->setEnabled(enabled);
+  if (m_blackScreenForCapture->isChecked() || m_screen1Box->isChecked() ||
+      m_screen2Box->isChecked() || m_screen3Box->isChecked()) {
+    m_testLightsButton->setEnabled(true);
+  } else {
+    m_testLightsButton->setEnabled(false);
+  }
+}
+
+//-----------------------------------------------------------------------------
+
 void StopMotionController::onPlaceOnXSheetChanged(int checked) {
   m_stopMotion->setPlaceOnXSheet(checked);
 }
@@ -2760,10 +2751,4 @@ void StopMotionController::onSceneSwitched() {
 
 //-----------------------------------------------------------------------------
 
-void StopMotionController::serialPortChanged(int index) {
-  m_stopMotion->m_serial->setSerialPort(m_controlDeviceCombo->currentText());
-}
-
-//-----------------------------------------------------------------------------
-
 void StopMotionController::updateStopMotion() {}

toonz/sources/stopmotion/stopmotioncontroller.h

@@ -67,7 +67,6 @@ class StopMotionController final : public QWidget {
   QFrame *m_mainControlsPage;
   QFrame *m_cameraSettingsPage;
   QFrame *m_optionsPage;
-  QFrame *m_motionPage;
   QFrame *m_lightPage;
   QFrame *m_dslrFrame;
   QFrame *m_webcamFrame;
@@ -123,6 +122,7 @@ class StopMotionController final : public QWidget {
   // void mousePressEvent(QMouseEvent *event) override;
   // void keyPressEvent(QKeyEvent *event);
   void keyPressEvent(QKeyEvent *event) override;
+  void updateLightsEnabled();
 
 protected slots:
   void refreshCameraList(QString activeCamera = "");
@@ -164,9 +164,6 @@ protected slots:
   void onNextXSheetFrame();
   void setToCurrentXSheetFrame();
 
-  // motion control
-  void serialPortChanged(int);
-
   // time lapse
   void onIntervalTimerCBToggled(bool);
   void onIntervalSliderValueChanged(bool);