razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix camera capture resolution osx

Browse source
This commit is contained in:
shun-iwasawa 2020-03-08 01:11:54 +09:00 committed by shun-iwasawa
parent 8e8bdecda7
commit f17f2c0065
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
toonz/sources/toonz/penciltestpopup.cpp
View file

@ -1494,10 +1494,6 @@ PencilTestPopup::PencilTestPopup()
m_subHeightFld = new IntLineEdit(this);
QWidget* subCamWidget = new QWidget(this);
#ifdef MACOSX
m_dummyViewFinder = new QCameraViewfinder(this);
m_dummyViewFinder->hide();
#endif
//----
m_resolutionCombo->setMaximumWidth(fontMetrics().width("0000 x 0000") + 25);
@ -1903,10 +1899,6 @@ void PencilTestPopup::onCameraListComboActivated(int comboIndex) {
m_currentCamera = new QCamera(cameras.at(index), this);
m_deviceName = cameras.at(index).deviceName();
#ifdef MACOSX
// this line is needed only in macosx
m_currentCamera->setViewfinder(m_dummyViewFinder);
#endif
// loading new camera
m_currentCamera->load();
@ -1952,22 +1944,22 @@ void PencilTestPopup::onResolutionComboActivated(const QString& itemText) {
// the splited text must be "<width>" "x" and "<height>"
if (texts.size() != 3) return;
#ifndef MACOSX
m_currentCamera->stop();
m_currentCamera->unload();
#endif
QCameraViewfinderSettings settings = m_currentCamera->viewfinderSettings();
QSize newResolution(texts[0].toInt(), texts[2].toInt());
settings.setResolution(newResolution);
m_currentCamera->setViewfinderSettings(settings);
#ifdef MACOSX
m_dummyViewFinder->resize(newResolution);
#endif
// reset white bg
m_whiteBGImg = QImage();
m_bgReductionFld->setDisabled(true);
#ifndef MACOSX
m_currentCamera->start();
#endif
m_videoWidget->setImage(QImage());
// update env
@ -2146,8 +2138,9 @@ void PencilTestPopup::onFrameCaptured(QImage& image) {
m_videoWidget->setImage(image.copy());
if (m_captureCue) {
#ifndef MACOSX
m_currentCamera->stop();
#endif
m_captureCue = false;
bool scanBtoT =
@ -2186,8 +2179,9 @@ void PencilTestPopup::onFrameCaptured(QImage& image) {
m_captureButton->setChecked(false);
onCaptureButtonClicked(false);
}
#ifndef MACOSX
m_currentCamera->start();
#endif
}
}

4
toonz/sources/toonz/penciltestpopup.h
View file

@ -314,10 +314,6 @@ class PencilTestPopup : public DVGui::Dialog {
DVGui::IntLineEdit *m_subWidthFld, *m_subHeightFld;
QSize m_allowedCameraSize;
#ifdef MACOSX
QCameraViewfinder* m_dummyViewFinder;
#endif
bool m_captureWhiteBGCue;
bool m_captureCue;
bool m_alwaysOverwrite = false;