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

pencil test popup

Browse source
This commit is contained in:
shun_iwasawa 2016-06-29 16:36:05 +09:00
parent 47895a0d7b
commit 21a6b6ba06
23 changed files with 1392 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci-scripts/linux/travis-install.sh
View file

@ -1,6 +1,6 @@
sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty
sudo apt-get update
sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libsdl2-dev libglew-dev freeglut3-dev qt55script libsuperlu3-dev libpng-dev qt55svg qt55tools wget libusb-1.0-0-dev libboost-all-dev liblzma-dev
sudo apt-get install -y liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libsdl2-dev libglew-dev freeglut3-dev qt55script libsuperlu3-dev libpng-dev qt55svg qt55tools qt55multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev
# someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc
wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb
wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-dev_0.0~r131-2ubuntu2_amd64.deb -O liblz4-dev.deb

BIN
stuff/config/loc/日本語/toonz.qm
View file

Binary file not shown.

4
stuff/config/qss/gray_048/gray_048.less
View file

@ -1343,4 +1343,8 @@ QDialog #dialogButtonFrame {
{
.baseBG(light, 30%);
}
}
#LargeSizedText {
font-size: 17px;
}

3
stuff/config/qss/gray_048/gray_048.qss
View file

@ -1345,5 +1345,8 @@ QDialog #dialogButtonFrame {
#MatchLineButton::pressed {
background-color: #7d7d7d;
}
#LargeSizedText {
font-size: 17px;
}
//# sourceMappingURL=gray_048.qss.map

3
stuff/config/qss/gray_048/gray_048_mac.qss
View file

@ -1345,5 +1345,8 @@ QDialog #dialogButtonFrame {
#MatchLineButton::pressed {
background-color: #7d7d7d;
}
#LargeSizedText {
font-size: 17px;
}
//# sourceMappingURL=gray_048_mac.qss.map

4
stuff/config/qss/gray_072/gray_072.less
View file

@ -1343,4 +1343,8 @@ QDialog #dialogButtonFrame {
{
.baseBG(light, 30%);
}
}
#LargeSizedText {
font-size: 17px;
}

3
stuff/config/qss/gray_072/gray_072.qss
View file

@ -1345,5 +1345,8 @@ QDialog #dialogButtonFrame {
#MatchLineButton::pressed {
background-color: #949494;
}
#LargeSizedText {
font-size: 17px;
}
//# sourceMappingURL=gray_072.qss.map

3
stuff/config/qss/gray_072/gray_072_mac.qss
View file

@ -1345,5 +1345,8 @@ QDialog #dialogButtonFrame {
#MatchLineButton::pressed {
background-color: #949494;
}
#LargeSizedText {
font-size: 17px;
}
//# sourceMappingURL=gray_072_mac.qss.map

17
stuff/config/qss/gray_128/gray_128.less
View file

@ -195,6 +195,19 @@ QCheckBox {
}
}
QGroupBox {
border: 1px solid;
.set_margin( 5px, 5px );
.set_padding( 3px, 5px );
&::title {
subcontrol-origin: margin;
padding: 0px;
margin-top: -4px;
/*bottom: 3px;*/
left: 15px;
}
}
/* ------ Toonz Classes Difinitions ------ */
/* ------ Palette ------ */
@ -1157,4 +1170,8 @@ QDialog #dialogButtonFrame {
&:hover {
background-color: rgb(220,220,220);
}
}
#LargeSizedText {
font-size: 17px;
}

21
stuff/config/qss/gray_128/gray_128.qss
View file

@ -123,6 +123,24 @@ QCheckBox:hover {
QCheckBox:disabled {
color: #404040;
}
QGroupBox {
border: 1px solid;
margin-left: 5px;
margin-right: 5px;
margin-top: 5px;
margin-bottom: 5px;
padding-left: 3px;
padding-right: 3px;
padding-top: 5px;
padding-bottom: 5px;
}
QGroupBox::title {
subcontrol-origin: margin;
padding: 0px;
margin-top: -4px;
/*bottom: 3px;*/
left: 15px;
}
/* ------ Toonz Classes Difinitions ------ */
/* ------ Palette ------ */
PaletteViewer #ToolBarContainer {
@ -1073,5 +1091,8 @@ QDialog #dialogButtonFrame {
#FxSettingsHelpButton:hover {
background-color: #dcdcdc;
}
#LargeSizedText {
font-size: 17px;
}
//# sourceMappingURL=gray_128.qss.map

21
stuff/config/qss/gray_128/gray_128_mac.qss
View file

@ -123,6 +123,24 @@ QCheckBox:hover {
QCheckBox:disabled {
color: #404040;
}
QGroupBox {
border: 1px solid;
margin-left: 5px;
margin-right: 5px;
margin-top: 5px;
margin-bottom: 5px;
padding-left: 3px;
padding-right: 3px;
padding-top: 5px;
padding-bottom: 5px;
}
QGroupBox::title {
subcontrol-origin: margin;
padding: 0px;
margin-top: -4px;
/*bottom: 3px;*/
left: 15px;
}
/* ------ Toonz Classes Difinitions ------ */
/* ------ Palette ------ */
PaletteViewer #ToolBarContainer {
@ -1073,5 +1091,8 @@ QDialog #dialogButtonFrame {
#FxSettingsHelpButton:hover {
background-color: #dcdcdc;
}
#LargeSizedText {
font-size: 17px;
}
//# sourceMappingURL=gray_128_mac.qss.map

2
stuff/profiles/layouts/rooms/StudioGhibli/menubar_template.xml
View file

@ -84,6 +84,8 @@
<command>MI_CleanupPreview</command>
<command>MI_CameraTest</command>
<command>MI_Cleanup</command>
<separator/>
<command>MI_PencilTest</command>
</menu>
<menu title="Level">
<command>MI_AddFrames</command>

2
stuff/profiles/layouts/rooms/StudioGhibli/room1_menubar.xml
View file

@ -25,6 +25,8 @@
<command>MI_Scan</command>
<command>MI_SetScanCropbox</command>
<command>MI_ResetScanCropbox</command>
<separator/>
<command>MI_PencilTest</command>
</menu>
<menu title="Settings">
<command>MI_CleanupSettings</command>

3
toonz/sources/CMakeLists.txt
View file

@ -136,7 +136,8 @@ find_package(Qt5 REQUIRED
Script
Widgets
PrintSupport
LinguistTools)
LinguistTools
Multimedia)
if(WIN32)
include_directories(

15
toonz/sources/common/trop/quickput.cpp
View file

@ -4276,18 +4276,21 @@ void quickPut(const TRasterP &dn, const TRasterP &up, const TAffine &aff,
else
doQuickPutNoFilter(dn32, up8, aff, colorScale);
} else if (dn32 && up32) {
if (areAlmostEqual(aff.a12, 0) && areAlmostEqual(aff.a21, 0))
if (areAlmostEqual(aff.a12, 0) && areAlmostEqual(aff.a21, 0)){
if (bilinear)
doQuickPutFilter(dn32, up32, aff.a11, aff.a22, aff.a13, aff.a23);
else
else {
doQuickPutNoFilter(dn32, up32, aff.a11, aff.a22, aff.a13, aff.a23,
colorScale, doPremultiply, whiteTransp, firstColumn,
doRasterDarkenBlendedView);
colorScale, doPremultiply, whiteTransp, firstColumn,
doRasterDarkenBlendedView);
}
}
else if (bilinear)
doQuickPutFilter(dn32, up32, aff);
else
else {
doQuickPutNoFilter(dn32, up32, aff, colorScale, doPremultiply,
whiteTransp, firstColumn, doRasterDarkenBlendedView);
whiteTransp, firstColumn, doRasterDarkenBlendedView);
}
} else if (dn32 && up64)
doQuickPutNoFilter(dn32, up64, aff, doPremultiply, firstColumn);
else

5
toonz/sources/include/tpixelutils.h
View file

@ -125,10 +125,11 @@ DVAPI inline T quickOverPixPremultT(const T &bot, const T &top) {
(bot.m == max) ? max : max - (max - bot.m) * (max - top.m) / max);
}
//------------------------------------------------------------------------------------
/*-- Viewer上でラスタ素材を「比較暗」合成表示する --*/
/*-- Show raster images darken-blended on the viewer --*/
template <class T, class Q>
DVAPI inline T quickOverPixDarkenBlendedT(const T &bot, const T &top) {
UINT max = T::maxChannelValue;
UINT max = T::maxChannelValue;
if (bot.m == 0) return top;
TUINT32 r = (top.r < bot.r) ? top.r : bot.r;
TUINT32 g = (top.g < bot.g) ? top.g : bot.g;
TUINT32 b = (top.b < bot.b) ? top.b : bot.b;

8
toonz/sources/toonz/CMakeLists.txt
View file

@ -138,6 +138,7 @@ set(MOC_HEADERS
comboviewerpane.h
historypane.h
cleanupsettingspane.h
penciltestpopup.h
# Tracker file
dummyprocessor.h
metnum.h
@ -294,6 +295,7 @@ set(SOURCES
comboviewerpane.cpp
historypane.cpp
cleanupsettingspane.cpp
penciltestpopup.cpp
# Tracker file
dummyprocessor.cpp
metnum.cpp
@ -359,7 +361,7 @@ endif()
if(WIN32)
target_link_libraries(OpenToonz_${VERSION}
Qt5::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport
Qt5::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia
${GL_LIB} ${GLUT_LIB}
tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm)
elseif(APPLE)
@ -370,7 +372,7 @@ elseif(APPLE)
# 変なところにライブラリ生成するカスども
set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
target_link_libraries(OpenToonz_${VERSION} Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport ${GL_LIB} ${GLUT_LIB} ${COCOA_LIB} ${EXTRA_LIBS})
target_link_libraries(OpenToonz_${VERSION} Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia ${GL_LIB} ${GLUT_LIB} ${COCOA_LIB} ${EXTRA_LIBS})
elseif(UNIX)
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib;colorfx;tnzext;image;sound;toonzqt;tnztools")
@ -379,7 +381,7 @@ elseif(UNIX)
set(EXTRA_LIBS ${EXTRA_LIBS} ${Boost_LIBRARIES} ${OPENBLAS_LIB})
target_link_libraries(OpenToonz_${VERSION} Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport ${GL_LIB} ${GLUT_LIB} ${GLU_LIB} ${EXTRA_LIBS})
target_link_libraries(OpenToonz_${VERSION} Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia ${GL_LIB} ${GLUT_LIB} ${GLU_LIB} ${EXTRA_LIBS})
endif()
if(APPLE)

3
toonz/sources/toonz/mainwindow.cpp
View file

@ -1650,6 +1650,9 @@ void MainWindow::defineActions() {
MenuScanCleanupCommandType);
createMenuScanCleanupAction(MI_Cleanup, tr("&Cleanup"), "");
createMenuScanCleanupAction(MI_PencilTest, tr("&Pencil Test..."), "");
createMenuLevelAction(MI_AddFrames, tr("&Add Frames..."), "");
createMenuLevelAction(MI_Renumber, tr("&Renumber..."), "");
createMenuLevelAction(MI_ReplaceLevel, tr("&Replace Level..."), "");

1
toonz/sources/toonz/menubarcommandids.h
View file

@ -308,4 +308,5 @@
#define MI_PreviewFx "MI_PreviewFx"
#define MI_About "MI_About"
#define MI_PencilTest "MI_PencilTest"
#endif

993
toonz/sources/toonz/penciltestpopup.cpp Normal file
View file

@ -0,0 +1,993 @@
#include "penciltestpopup.h"
// Tnz6 includes
#include "tapp.h"
#include "menubarcommandids.h"
#include "formatsettingspopups.h"
#include "filebrowsermodel.h"
// TnzQt includes
#include "toonzqt/menubarcommand.h"
#include "toonzqt/filefield.h"
#include "toonzqt/intfield.h"
#include "toonzqt/gutil.h"
// Tnzlib includes
#include "toonz/tproject.h"
#include "toonz/tscenehandle.h"
#include "toonz/toonzscene.h"
#include "toutputproperties.h"
#include "toonz/sceneproperties.h"
#include "toonz/namebuilder.h"
#include "toonz/levelset.h"
#include "toonz/txshleveltypes.h"
#include "toonz/toonzfolders.h"
#include "toonz/tframehandle.h"
#include "toonz/tcolumnhandle.h"
#include "toonz/txsheethandle.h"
#include "toonz/txshsimplelevel.h"
#include "toonz/levelproperties.h"
#include "toonz/tcamera.h"
// TnzCore includes
#include "tsystem.h"
#include "tpixelutils.h"
#include <algorithm>
// Qt includes
#include <QMainWindow>
#include <QCameraInfo>
#include <QCamera>
#include <QCameraImageCapture>
#include <QCameraViewfinderSettings>
#include <QComboBox>
#include <QPushButton>
#include <QLineEdit>
#include <QGroupBox>
#include <QRadioButton>
#include <QSlider>
#include <QCheckBox>
#include <QLabel>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QGridLayout>
#include <QToolButton>
#include <QGroupBox>
#include <QDateTime>
#include <QMultimedia>
#include <QPainter>
using namespace DVGui;
namespace {
void convertImageToRaster(TRaster32P dstRas, const QImage& srcImg) {
dstRas->lock();
int lx = dstRas->getLx();
int ly = dstRas->getLy();
assert(lx == srcImg.width() && ly == srcImg.height());
for (int j = 0; j < ly; j++) {
TPixel32* dstPix = dstRas->pixels(j);
for (int i = 0; i < lx; i++, dstPix++) {
QRgb srcPix = srcImg.pixel(lx - 1 - i, j);
dstPix->r = qRed(srcPix);
dstPix->g = qGreen(srcPix);
dstPix->b = qBlue(srcPix);
dstPix->m = TPixel32::maxChannelValue;
}
}
dstRas->unlock();
}
void bgReduction(QImage& srcImg, QImage& bgImg, int reduction) {
float reductionRatio = (float)reduction / 100.0f;
// first, make the reduction table
std::vector<int> reductionAmount(256);
for (int i = 0; i < reductionAmount.size(); i++) {
reductionAmount[i] = (int)(std::floor((float)(255 - i) * reductionRatio));
}
// then, compute for all pixels
int lx = srcImg.width();
int ly = srcImg.height();
for (int j = 0; j < ly; j++) {
// TPixel32 * pix = ras->pixels(j);
QRgb* pix = (QRgb*)srcImg.scanLine(j);
QRgb* bgPix = (QRgb*)bgImg.scanLine(j);
for (int i = 0; i < lx; i++, pix++, bgPix++) {
*pix = qRgb(std::min(255, qRed(*pix) + reductionAmount[qRed(*bgPix)]),
std::min(255, qGreen(*pix) + reductionAmount[qGreen(*bgPix)]),
std::min(255, qBlue(*pix) + reductionAmount[qBlue(*bgPix)]));
}
}
}
// referenced from brightnessandcontrastpopup.cpp
void my_compute_lut(double contrast, double brightness, std::vector<int>& lut) {
const int maxChannelValue = lut.size() - 1;
const double half_maxChannelValueD = 0.5 * maxChannelValue;
const double maxChannelValueD = maxChannelValue;
int i;
double value, nvalue, power;
int lutSize = lut.size();
for (i = 0; i < lutSize; i++) {
value = i / maxChannelValueD;
// brightness
if (brightness < 0.0)
value = value * (1.0 + brightness);
else
value = value + ((1.0 - value) * brightness);
// contrast
if (contrast < 0.0) {
if (value > 0.5)
nvalue = 1.0 - value;
else
nvalue = value;
if (nvalue < 0.0) nvalue = 0.0;
nvalue = 0.5 * pow(nvalue * 2.0, (double)(1.0 + contrast));
if (value > 0.5)
value = 1.0 - nvalue;
else
value = nvalue;
} else {
if (value > 0.5)
nvalue = 1.0 - value;
else
nvalue = value;
if (nvalue < 0.0) nvalue = 0.0;
power =
(contrast == 1.0) ? half_maxChannelValueD : 1.0 / (1.0 - contrast);
nvalue = 0.5 * pow(2.0 * nvalue, power);
if (value > 0.5)
value = 1.0 - nvalue;
else
value = nvalue;
}
lut[i] = value * maxChannelValueD;
}
}
//-----------------------------------------------------------------------------
inline void doPixGray(QRgb* pix, const std::vector<int>& lut) {
int gray = qGray(qRgb(lut[qRed(*pix)], lut[qGreen(*pix)], lut[qBlue(*pix)]));
*pix = qRgb(gray, gray, gray);
}
//-----------------------------------------------------------------------------
inline void doPixBinary(QRgb* pix, const std::vector<int>& lut,
unsigned char threshold) {
int gray = qGray(qRgb(lut[qRed(*pix)], lut[qGreen(*pix)], lut[qBlue(*pix)]));
if ((unsigned char)gray >= threshold)
gray = 255;
else
gray = 0;
*pix = qRgb(gray, gray, gray);
}
//-----------------------------------------------------------------------------
inline void doPix(QRgb* pix, const std::vector<int>& lut) {
// The captured image MUST be full opaque!
*pix = qRgb(lut[qRed(*pix)], lut[qGreen(*pix)], lut[qBlue(*pix)]);
}
//-----------------------------------------------------------------------------
void onChange(QImage& img, int contrast, int brightness, bool doGray,
unsigned char threshold = 0) {
double b = brightness / 127.0;
double c = contrast / 127.0;
if (c > 1) c = 1;
if (c < -1) c = -1;
std::vector<int> lut(TPixel32::maxChannelValue + 1);
my_compute_lut(c, b, lut);
int lx = img.width(), y, ly = img.height();
if (doGray) {
if (threshold == 0) { // Grayscale
for (y = 0; y < ly; ++y) {
QRgb *pix = (QRgb *)img.scanLine(y), *endPix = (QRgb *)(pix + lx);
while (pix < endPix) {
doPixGray(pix, lut);
++pix;
}
}
} else { // Binary
for (y = 0; y < ly; ++y) {
QRgb *pix = (QRgb *)img.scanLine(y), *endPix = (QRgb *)(pix + lx);
while (pix < endPix) {
doPixBinary(pix, lut, threshold);
++pix;
}
}
}
} else { // color
for (y = 0; y < ly; ++y) {
QRgb *pix = (QRgb *)img.scanLine(y), *endPix = (QRgb *)(pix + lx);
while (pix < endPix) {
doPix(pix, lut);
++pix;
}
}
}
}
//-----------------------------------------------------------------------------
TPointD getCurrentCameraDpi() {
TCamera* camera =
TApp::instance()->getCurrentScene()->getScene()->getCurrentCamera();
TDimensionD size = camera->getSize();
TDimension res = camera->getRes();
return TPointD(res.lx / size.lx, res.ly / size.ly);
}
} // namespace
//=============================================================================
MyViewFinder::MyViewFinder(QWidget* parent)
: QFrame(parent)
, m_image(QImage())
, m_camera(0)
, m_showOnionSkin(false)
, m_onionOpacity(128)
, m_upsideDown(false) {}
void MyViewFinder::paintEvent(QPaintEvent* event) {
QPainter p(this);
p.fillRect(rect(), Qt::black);
if (m_image.isNull()) {
p.setPen(Qt::white);
QFont font = p.font();
font.setPixelSize(30);
p.setFont(font);
p.drawText(rect(), Qt::AlignCenter, tr("Camera is not available"));
return;
}
if (m_upsideDown) {
p.translate(m_imageRect.center());
p.rotate(180);
p.translate(-m_imageRect.center());
}
p.drawImage(m_imageRect, m_image);
if (m_showOnionSkin && m_onionOpacity > 0.0f && !m_previousImage.isNull() &&
m_previousImage.size() == m_image.size()) {
p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
p.setPen(Qt::NoPen);
p.setBrush(QBrush(QColor(255, 255, 255, 255 - m_onionOpacity)));
p.drawRect(m_imageRect);
p.setCompositionMode(QPainter::CompositionMode_DestinationOver);
p.drawImage(m_imageRect, m_previousImage);
}
}
void MyViewFinder::resizeEvent(QResizeEvent* event) {
if (!m_camera) return;
QSize cameraReso = m_camera->viewfinderSettings().resolution();
double cameraAR = (double)cameraReso.width() / (double)cameraReso.height();
// in case the camera aspect is wider than this widget
if (cameraAR >= (double)width() / (double)height()) {
m_imageRect.setWidth(width());
m_imageRect.setHeight((int)((double)width() / cameraAR));
m_imageRect.moveTo(0, (height() - m_imageRect.height()) / 2);
}
// in case the camera aspect is thinner than this widget
else {
m_imageRect.setHeight(height());
m_imageRect.setWidth((int)((double)height() * cameraAR));
m_imageRect.moveTo((width() - m_imageRect.width()) / 2, 0);
}
}
//=============================================================================
PencilTestPopup::PencilTestPopup()
: Dialog(TApp::instance()->getMainWindow(), false, false, "PencilTest")
, m_currentCamera(0)
, m_cameraImageCapture(0)
, m_captureWhiteBGCue(false)
, m_captureCue(false) {
setWindowTitle(tr("Pencil Test"));
layout()->setSizeConstraint(QLayout::SetNoConstraint);
std::wstring dateTime =
QDateTime::currentDateTime().toString("yyMMddhhmmss").toStdWString();
TFilePath cacheImageFp = ToonzFolder::getCacheRootFolder() +
TFilePath(L"penciltest" + dateTime + L".jpg");
m_cacheImagePath = cacheImageFp.getQString();
m_cameraViewfinder = new MyViewFinder(this);
// CameraViewfinderContainer* cvfContainer = new
// CameraViewfinderContainer(m_cameraViewfinder, this);
m_cameraListCombo = new QComboBox(this);
QPushButton* refreshCamListButton = new QPushButton(tr("Refresh"), this);
m_resolutionCombo = new QComboBox(this);
QGroupBox* fileFrame = new QGroupBox(tr("File"), this);
m_levelNameEdit = new QLineEdit(this);
m_frameNumberEdit = new IntLineEdit(this, 1, 1, INT_MAX, 4);
m_fileTypeCombo = new QComboBox(this);
m_fileFormatOptionButton = new QPushButton(tr("Options"), this);
m_saveInFileFld = new FileField(
0, QString("+%1").arg(QString::fromStdString(TProject::Extras)));
QToolButton* nextLevelButton = new QToolButton(this);
QGroupBox* imageFrame = new QGroupBox(tr("Image adjust"), this);
m_colorTypeCombo = new QComboBox(this);
m_thresholdFld = new IntField(this);
m_contrastFld = new IntField(this);
m_brightnessFld = new IntField(this);
m_upsideDownCB = new QCheckBox(tr("Upside down"), this);
m_bgReductionFld = new IntField(this);
m_captureWhiteBGButton = new QPushButton(tr("Capture white BG"), this);
QGroupBox* displayFrame = new QGroupBox(tr("Display"), this);
m_onionSkinCB = new QCheckBox(tr("Show onion skin"), this);
m_onionOpacityFld = new IntField(this);
QPushButton* captureButton = new QPushButton(tr("Capture"), this);
QPushButton* closeButton = new QPushButton(tr("Close"), this);
//----
m_resolutionCombo->setMaximumWidth(fontMetrics().width("0000 x 0000") + 25);
m_fileTypeCombo->addItems({"jpg", "png", "tga", "tif"});
m_fileTypeCombo->setCurrentIndex(1);
fileFrame->setObjectName("CleanupSettingsFrame");
// Exclude all character which cannot fit in a filepath (Win).
// Dots are also prohibited since they are internally managed by Toonz.
QRegExp rx("[^\\\\/:?*.\"<>|]+");
m_levelNameEdit->setValidator(new QRegExpValidator(rx, this));
m_levelNameEdit->setObjectName("LargeSizedText");
m_frameNumberEdit->setObjectName("LargeSizedText");
nextLevelButton->setFixedSize(24, 24);
nextLevelButton->setArrowType(Qt::RightArrow);
nextLevelButton->setToolTip(tr("Next Level"));
imageFrame->setObjectName("CleanupSettingsFrame");
m_colorTypeCombo->addItems({"Color", "Grayscale", "Black & White"});
m_colorTypeCombo->setCurrentIndex(0);
m_thresholdFld->setRange(1, 255);
m_thresholdFld->setValue(128);
m_thresholdFld->setDisabled(true);
m_contrastFld->setRange(-127, 127);
m_contrastFld->setValue(0);
m_brightnessFld->setRange(-127, 127);
m_brightnessFld->setValue(0);
m_upsideDownCB->setChecked(false);
m_bgReductionFld->setRange(0, 100);
m_bgReductionFld->setValue(0);
m_bgReductionFld->setDisabled(true);
displayFrame->setObjectName("CleanupSettingsFrame");
m_onionSkinCB->setChecked(false);
m_onionOpacityFld->setRange(1, 100);
m_onionOpacityFld->setValue(50);
m_onionOpacityFld->setDisabled(true);
captureButton->setObjectName("LargeSizedText");
captureButton->setFixedHeight(80);
//---- layout ----
QHBoxLayout* mainLay = new QHBoxLayout();
mainLay->setMargin(0);
mainLay->setSpacing(10);
{
QVBoxLayout* leftLay = new QVBoxLayout();
leftLay->setMargin(5);
leftLay->setSpacing(10);
{
QHBoxLayout* camLay = new QHBoxLayout();
camLay->setMargin(0);
camLay->setSpacing(3);
{
camLay->addWidget(new QLabel(tr("Camera:"), this), 0);
camLay->addWidget(m_cameraListCombo, 1);
camLay->addWidget(refreshCamListButton, 0);
camLay->addSpacing(10);
camLay->addWidget(new QLabel(tr("Resolution:"), this), 0);
camLay->addWidget(m_resolutionCombo, 1);
camLay->addStretch(0);
}
leftLay->addLayout(camLay, 0);
leftLay->addWidget(m_cameraViewfinder, 1);
}
mainLay->addLayout(leftLay, 1);
QVBoxLayout* rightLay = new QVBoxLayout();
rightLay->setMargin(0);
rightLay->setSpacing(5);
{
QVBoxLayout* fileLay = new QVBoxLayout();
fileLay->setMargin(10);
fileLay->setSpacing(10);
{
QGridLayout* levelLay = new QGridLayout();
levelLay->setMargin(0);
levelLay->setHorizontalSpacing(3);
levelLay->setVerticalSpacing(10);
{
levelLay->addWidget(new QLabel(tr("Name:"), this), 0, 0,
Qt::AlignRight);
levelLay->addWidget(m_levelNameEdit, 0, 1);
levelLay->addWidget(nextLevelButton, 0, 2);
levelLay->addWidget(new QLabel(tr("Frame:"), this), 1, 0,
Qt::AlignRight);
levelLay->addWidget(m_frameNumberEdit, 1, 1);
}
levelLay->setColumnStretch(0, 0);
levelLay->setColumnStretch(1, 1);
levelLay->setColumnStretch(2, 0);
fileLay->addLayout(levelLay, 0);
QHBoxLayout* fileTypeLay = new QHBoxLayout();
fileTypeLay->setMargin(0);
fileTypeLay->setSpacing(3);
{
fileTypeLay->addWidget(new QLabel(tr("File Type:"), this), 0);
fileTypeLay->addWidget(m_fileTypeCombo, 1);
fileTypeLay->addSpacing(10);
fileTypeLay->addWidget(m_fileFormatOptionButton);
}
fileLay->addLayout(fileTypeLay, 0);
QHBoxLayout* saveInLay = new QHBoxLayout();
saveInLay->setMargin(0);
saveInLay->setSpacing(3);
{
saveInLay->addWidget(new QLabel(tr("Save In:"), this), 0);
saveInLay->addWidget(m_saveInFileFld, 1);
}
fileLay->addLayout(saveInLay, 0);
}
fileFrame->setLayout(fileLay);
rightLay->addWidget(fileFrame, 0);
QGridLayout* imageLay = new QGridLayout();
imageLay->setMargin(10);
imageLay->setHorizontalSpacing(3);
imageLay->setVerticalSpacing(10);
{
imageLay->addWidget(new QLabel(tr("Color type:"), this), 0, 0,
Qt::AlignRight);
imageLay->addWidget(m_colorTypeCombo, 0, 1);
imageLay->addWidget(new QLabel(tr("Threshold:"), this), 1, 0,
Qt::AlignRight);
imageLay->addWidget(m_thresholdFld, 1, 1, 1, 2);
imageLay->addWidget(new QLabel(tr("Contrast:"), this), 2, 0,
Qt::AlignRight);
imageLay->addWidget(m_contrastFld, 2, 1, 1, 2);
imageLay->addWidget(new QLabel(tr("Brightness:"), this), 3, 0,
Qt::AlignRight);
imageLay->addWidget(m_brightnessFld, 3, 1, 1, 2);
imageLay->addWidget(m_upsideDownCB, 4, 0, 1, 3, Qt::AlignLeft);
imageLay->addWidget(new QLabel(tr("BG reduction:"), this), 5, 0,
Qt::AlignRight);
imageLay->addWidget(m_bgReductionFld, 5, 1, 1, 2);
imageLay->addWidget(m_captureWhiteBGButton, 6, 0, 1, 3);
}
imageLay->setColumnStretch(0, 0);
imageLay->setColumnStretch(1, 0);
imageLay->setColumnStretch(2, 1);
imageFrame->setLayout(imageLay);
rightLay->addWidget(imageFrame, 0);
QGridLayout* displayLay = new QGridLayout();
displayLay->setMargin(10);
displayLay->setHorizontalSpacing(3);
displayLay->setVerticalSpacing(10);
{
displayLay->addWidget(m_onionSkinCB, 0, 0, 1, 3);
displayLay->addWidget(new QLabel(tr("Opacity(%):"), this), 1, 0,
Qt::AlignRight);
displayLay->addWidget(m_onionOpacityFld, 1, 1, 1, 2);
}
displayLay->setColumnStretch(0, 0);
displayLay->setColumnStretch(1, 0);
displayLay->setColumnStretch(2, 1);
displayFrame->setLayout(displayLay);
rightLay->addWidget(displayFrame);
rightLay->addStretch(1);
rightLay->addWidget(captureButton, 0);
rightLay->addSpacing(20);
rightLay->addWidget(closeButton, 0);
}
mainLay->addLayout(rightLay, 0);
}
m_topLayout->addLayout(mainLay);
//---- signal-slot connections ----
bool ret = true;
ret = ret && connect(refreshCamListButton, SIGNAL(pressed()), this,
SLOT(refreshCameraList()));
ret = ret && connect(m_cameraListCombo, SIGNAL(activated(int)), this,
SLOT(onCameraListComboActivated(int)));
ret = ret && connect(m_resolutionCombo, SIGNAL(activated(const QString&)),
this, SLOT(onResolutionComboActivated(const QString&)));
ret = ret && connect(m_fileFormatOptionButton, SIGNAL(pressed()), this,
SLOT(onFileFormatOptionButtonPressed()));
ret = ret &&
connect(nextLevelButton, SIGNAL(pressed()), this, SLOT(onNextName()));
ret = ret && connect(m_colorTypeCombo, SIGNAL(currentIndexChanged(int)), this,
SLOT(onColorTypeComboChanged(int)));
ret = ret && connect(m_captureWhiteBGButton, SIGNAL(pressed()), this,
SLOT(onCaptureWhiteBGButtonPressed()));
ret = ret && connect(m_onionSkinCB, SIGNAL(toggled(bool)), this,
SLOT(onOnionCBToggled(bool)));
ret = ret && connect(m_onionOpacityFld, SIGNAL(valueEditedByHand()), this,
SLOT(onOnionOpacityFldEdited()));
ret = ret && connect(m_upsideDownCB, SIGNAL(toggled(bool)),
m_cameraViewfinder, SLOT(onUpsideDownChecked(bool)));
ret = ret && connect(closeButton, SIGNAL(clicked()), this, SLOT(reject()));
ret =
ret && connect(captureButton, SIGNAL(clicked()), this, SLOT(onCapture()));
assert(ret);
refreshCameraList();
onNextName();
}
//-----------------------------------------------------------------------------
PencilTestPopup::~PencilTestPopup() {
if (m_currentCamera && m_currentCamera->state() == QCamera::ActiveState)
m_currentCamera->stop();
// remove the cache image, if it exists
TFilePath fp(m_cacheImagePath);
if (TFileStatus(fp).doesExist()) TSystem::deleteFile(fp);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::refreshCameraList() {
m_cameraListCombo->clear();
QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
if (cameras.empty()) {
m_cameraListCombo->addItem(tr("No camera found"));
m_cameraListCombo->setMaximumWidth(250);
m_cameraListCombo->setDisabled(true);
}
int maxTextLength = 0;
int defaultIndex;
for (int c = 0; c < cameras.size(); c++) {
QString camDesc = cameras.at(c).description();
m_cameraListCombo->addItem(camDesc);
maxTextLength = std::max(maxTextLength, fontMetrics().width(camDesc));
if (cameras.at(c).deviceName() == QCameraInfo::defaultCamera().deviceName())
defaultIndex = c;
}
m_cameraListCombo->setMaximumWidth(maxTextLength + 25);
m_cameraListCombo->setEnabled(true);
m_cameraListCombo->setCurrentIndex(defaultIndex);
onCameraListComboActivated(defaultIndex);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onCameraListComboActivated(int index) {
QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
if (cameras.size() != m_cameraListCombo->count()) return;
// in case the camera is not changed (just click the combobox)
if (cameras.at(index).deviceName() == m_deviceName) return;
QCamera* oldCamera = m_currentCamera;
m_currentCamera = new QCamera(cameras.at(index), this);
m_deviceName = cameras.at(index).deviceName();
if (m_cameraImageCapture) {
disconnect(m_cameraImageCapture, SIGNAL(imageCaptured(int, const QImage&)),
this, SLOT(onImageCaptured(int, const QImage&)));
delete m_cameraImageCapture;
}
m_cameraImageCapture = new QCameraImageCapture(m_currentCamera, this);
/* Capturing to buffer currently seems not to be supported on Windows */
// if
// (!m_cameraImageCapture->isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer))
// std::cout << "it does not support CaptureToBuffer" << std::endl;
m_cameraImageCapture->setCaptureDestination(
QCameraImageCapture::CaptureToBuffer);
connect(m_cameraImageCapture, SIGNAL(imageCaptured(int, const QImage&)), this,
SLOT(onImageCaptured(int, const QImage&)));
// loading new camera
m_currentCamera->load();
// refresh resolution
m_resolutionCombo->clear();
QList<QSize> sizes = m_currentCamera->supportedViewfinderResolutions();
for (int s = 0; s < sizes.size(); s++) {
m_resolutionCombo->addItem(
QString("%1 x %2").arg(sizes.at(s).width()).arg(sizes.at(s).height()));
}
if (!sizes.isEmpty()) {
m_resolutionCombo->setCurrentIndex(0);
QCameraViewfinderSettings settings = m_currentCamera->viewfinderSettings();
settings.setResolution(sizes[0]);
m_currentCamera->setViewfinderSettings(settings);
QImageEncoderSettings imageEncoderSettings;
imageEncoderSettings.setCodec("PNG");
imageEncoderSettings.setResolution(sizes[0]);
m_cameraImageCapture->setEncodingSettings(imageEncoderSettings);
}
m_cameraViewfinder->setCamera(m_currentCamera);
// deleting old camera
if (oldCamera) {
if (oldCamera->state() == QCamera::ActiveState) oldCamera->stop();
delete oldCamera;
}
// start new camera
m_currentCamera->start();
m_cameraViewfinder->setImage(QImage());
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onResolutionComboActivated(const QString& itemText) {
// resolution is written in the itemText with the format "<width> x <height>"
// (e.g. "800 x 600")
QStringList texts = itemText.split(' ');
// the splited text must be "<width>" "x" and "<height>"
if (texts.size() != 3) return;
m_currentCamera->stop();
m_currentCamera->unload();
QCameraViewfinderSettings settings = m_currentCamera->viewfinderSettings();
QSize newResolution(texts[0].toInt(), texts[2].toInt());
settings.setResolution(newResolution);
m_currentCamera->setViewfinderSettings(settings);
QImageEncoderSettings imageEncoderSettings;
imageEncoderSettings.setCodec("image/jpeg");
imageEncoderSettings.setQuality(QMultimedia::NormalQuality);
imageEncoderSettings.setResolution(newResolution);
m_cameraImageCapture->setEncodingSettings(imageEncoderSettings);
// reset white bg
m_whiteBGImg = QImage();
m_bgReductionFld->setDisabled(true);
m_currentCamera->start();
m_cameraViewfinder->setImage(QImage());
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onFileFormatOptionButtonPressed() {
if (m_fileTypeCombo->currentIndex() == 0) return;
// Tentatively use the preview output settings
ToonzScene* scene = TApp::instance()->getCurrentScene()->getScene();
if (!scene) return;
TOutputProperties* prop = scene->getProperties()->getPreviewProperties();
std::string ext = m_fileTypeCombo->currentText().toStdString();
openFormatSettingsPopup(this, ext, prop->getFileFormatProperties(ext));
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onNextName() {
const std::auto_ptr<NameBuilder> nameBuilder(NameBuilder::getBuilder(L""));
TLevelSet* levelSet =
TApp::instance()->getCurrentScene()->getScene()->getLevelSet();
ToonzScene* scene = TApp::instance()->getCurrentScene()->getScene();
std::wstring levelName = L"";
// Select a different unique level name in case it already exists (either in
// scene or on disk)
TFilePath fp;
TFilePath actualFp;
for (;;) {
levelName = nameBuilder->getNext();
if (levelSet->getLevel(levelName) != 0) continue;
fp = TFilePath(m_saveInFileFld->getPath()) +
TFilePath(levelName + L".." +
m_fileTypeCombo->currentText().toStdWString());
actualFp = scene->decodeFilePath(fp);
if (TSystem::doesExistFileOrLevel(actualFp)) {
continue;
}
break;
}
m_levelNameEdit->setText(QString::fromStdWString(levelName));
m_frameNumberEdit->setValue(1);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onColorTypeComboChanged(int index) {
m_thresholdFld->setEnabled(index == 2);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onImageCaptured(int id, const QImage& image) {
// capture the white BG
if (m_captureWhiteBGCue) {
m_whiteBGImg = image.copy();
m_captureWhiteBGCue = false;
m_bgReductionFld->setEnabled(true);
}
QImage procImg = image.copy();
processImage(procImg);
m_cameraViewfinder->setImage(procImg);
if (m_captureCue) {
m_captureCue = false;
if (importImage(procImg)) {
m_cameraViewfinder->setPreviousImage(procImg);
m_frameNumberEdit->setValue(m_frameNumberEdit->getValue() + 1);
}
}
}
//-----------------------------------------------------------------------------
void PencilTestPopup::timerEvent(QTimerEvent* event) {
if (!m_currentCamera || !m_cameraImageCapture ||
!m_cameraImageCapture->isAvailable() ||
!m_cameraImageCapture->isReadyForCapture())
return;
m_currentCamera->setCaptureMode(QCamera::CaptureStillImage);
m_currentCamera->start();
m_currentCamera->searchAndLock();
m_cameraImageCapture->capture(m_cacheImagePath);
m_currentCamera->unlock();
}
//-----------------------------------------------------------------------------
void PencilTestPopup::showEvent(QShowEvent* event) {
m_timerId = startTimer(10);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::hideEvent(QHideEvent* event) { killTimer(m_timerId); }
//-----------------------------------------------------------------------------
void PencilTestPopup::processImage(QImage& image) {
/* "upside down" is not executed here. It will be done when capturing the
* image */
// white bg reduction
if (!m_whiteBGImg.isNull() && m_bgReductionFld->getValue() != 0) {
bgReduction(image, m_whiteBGImg, m_bgReductionFld->getValue());
}
int threshold =
(m_colorTypeCombo->currentIndex() != 2) ? 0 : m_thresholdFld->getValue();
onChange(image, m_contrastFld->getValue(), m_brightnessFld->getValue(),
m_colorTypeCombo->currentIndex() != 0, threshold);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onCaptureWhiteBGButtonPressed() {
m_captureWhiteBGCue = true;
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onOnionCBToggled(bool on) {
m_cameraViewfinder->setShowOnionSkin(on);
m_onionOpacityFld->setEnabled(on);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onOnionOpacityFldEdited() {
int value = (int)(255.0f * (float)m_onionOpacityFld->getValue() / 100.0f);
m_cameraViewfinder->setOnionOpacity(value);
}
//-----------------------------------------------------------------------------
void PencilTestPopup::onCapture() { m_captureCue = true; }
//-----------------------------------------------------------------------------
/*! referenced from LevelCreatePopup::apply()
*/
bool PencilTestPopup::importImage(QImage& image) {
TApp* app = TApp::instance();
ToonzScene* scene = app->getCurrentScene()->getScene();
TXsheet* xsh = scene->getXsheet();
std::wstring levelName = m_levelNameEdit->text().toStdWString();
if (levelName.empty()) {
error(tr("No level name specified: please choose a valid level name"));
return false;
}
int frameNumber = m_frameNumberEdit->getValue();
/* create parent directory if it does not exist */
TFilePath parentDir =
scene->decodeFilePath(TFilePath(m_saveInFileFld->getPath()));
if (!TFileStatus(parentDir).doesExist()) {
QString question;
question = tr("Folder %1 doesn't exist.\nDo you want to create it?")
.arg(toQString(parentDir));
int ret = DVGui::MsgBox(question, QObject::tr("Yes"), QObject::tr("No"));
if (ret == 0 || ret == 2) return false;
try {
TSystem::mkDir(parentDir);
DvDirModel::instance()->refreshFolder(parentDir.getParentDir());
} catch (...) {
error(tr("Unable to create") + toQString(parentDir));
return false;
}
}
TFilePath levelFp = TFilePath(m_saveInFileFld->getPath()) +
TFilePath(levelName + L".." +
m_fileTypeCombo->currentText().toStdWString());
TFilePath actualLevelFp = scene->decodeFilePath(levelFp);
TXshSimpleLevel* sl = 0;
TXshLevel* level = scene->getLevelSet()->getLevel(levelName);
/* if the level already exists in the scene cast */
if (level) {
/* if the existing level is not a raster level, then return */
if (level->getType() != OVL_XSHLEVEL) {
error(
tr("The level name specified is already used: please choose a "
"different level name."));
return false;
}
/* if the existing level does not match file path and pixel size, then
* return */
sl = level->getSimpleLevel();
if (scene->decodeFilePath(sl->getPath()) != actualLevelFp) {
error(
tr("The save in path specified does not match with the existing "
"level."));
return false;
}
if (sl->getProperties()->getImageRes() !=
TDimension(image.width(), image.height())) {
error(tr(
"The captured image size does not match with the existing level."));
return false;
}
/* if the level already have the same frame, then ask if overwrite it */
TFilePath frameFp(actualLevelFp.withFrame(frameNumber));
if (TFileStatus(frameFp).doesExist()) {
QString question = tr("File %1 does exist.\nDo you want to overwrite it?")
.arg(toQString(frameFp));
int ret = DVGui::MsgBox(question, QObject::tr("Overwrite"),
QObject::tr("Cancel"));
if (ret == 0 || ret == 2) return false;
}
}
/* if the level does not exist in the scene cast */
else {
/* if the file does exist, load it first */
if (TFileStatus(actualLevelFp).doesExist()) {
level = scene->loadLevel(actualLevelFp);
if (!level) {
error(tr("Failed to load %1.").arg(toQString(actualLevelFp)));
return false;
}
/* if the loaded level does not match in pixel size, then return */
sl = level->getSimpleLevel();
if (!sl ||
sl->getProperties()->getImageRes() !=
TDimension(image.width(), image.height())) {
error(tr(
"The captured image size does not match with the existing level."));
return false;
}
}
/* if the file does not exist, then create a new level */
else {
TXshLevel* level = scene->createNewLevel(OVL_XSHLEVEL, levelName,
TDimension(), 0, levelFp);
sl = level->getSimpleLevel();
sl->setPath(levelFp, true);
sl->getProperties()->setDpiPolicy(LevelProperties::DP_CustomDpi);
TPointD currentCamDpi = getCurrentCameraDpi();
sl->getProperties()->setDpi(currentCamDpi.x);
sl->getProperties()->setImageDpi(currentCamDpi);
sl->getProperties()->setImageRes(
TDimension(image.width(), image.height()));
}
}
TFrameId fid(frameNumber);
TPointD levelDpi = sl->getDpi();
/* create the raster */
TRaster32P raster(image.width(), image.height());
convertImageToRaster(raster, (m_upsideDownCB->isChecked())
? image
: image.mirrored(true, true));
TRasterImageP ri(raster);
ri->setDpi(levelDpi.x, levelDpi.y);
/* setting the frame */
sl->setFrame(fid, ri);
/* set dirty flag */
sl->getProperties()->setDirtyFlag(true);
/* placement in xsheet */
int row = app->getCurrentFrame()->getFrame();
int col = app->getCurrentColumn()->getColumnIndex();
/* try to find the vacant cell */
int tmpRow = row;
bool isFoundEmptyCell = false;
while (1) {
if (xsh->getCell(tmpRow, col).isEmpty()) {
isFoundEmptyCell = true;
break;
}
if (xsh->getCell(tmpRow, col).m_level->getSimpleLevel() != sl) break;
tmpRow++;
}
/* in case setting the same level as the the current column */
if (isFoundEmptyCell) {
xsh->setCell(tmpRow, col, TXshCell(sl, fid));
}
/* in case the level is different from the current column, then insert a new
column */
else {
col += 1;
xsh->insertColumn(col);
xsh->setCell(row, col, TXshCell(sl, fid));
app->getCurrentColumn()->setColumnIndex(col);
}
/* notify */
app->getCurrentScene()->notifySceneChanged();
app->getCurrentScene()->notifyCastChange();
app->getCurrentXsheet()->notifyXsheetChanged();
return true;
}
//-----------------------------------------------------------------------------
OpenPopupCommandHandler<PencilTestPopup> openPencilTestPopup(MI_PencilTest);

117
toonz/sources/toonz/penciltestpopup.h Normal file
View file

@ -0,0 +1,117 @@
#pragma once
#ifndef PENCILTESTPOPUP_H
#define PENCILTESTPOPUP_H
#include "toonzqt/dvdialog.h"
#include <QFrame>
// forward decl.
class QCamera;
class QCameraImageCapture;
class QComboBox;
class QLineEdit;
class QSlider;
class QCheckBox;
class QPushButton;
class QVideoFrame;
namespace DVGui {
class FileField;
class IntLineEdit;
class IntField;
}
//=============================================================================
// MyViewFinder
//-----------------------------------------------------------------------------
class MyViewFinder : public QFrame {
Q_OBJECT
QImage m_image;
QImage m_previousImage;
QCamera* m_camera;
QRect m_imageRect;
bool m_showOnionSkin;
int m_onionOpacity;
bool m_upsideDown;
public:
MyViewFinder(QWidget* parent = 0);
void setImage(const QImage& image) {
m_image = image;
update();
}
void setCamera(QCamera* camera) { m_camera = camera; }
void setShowOnionSkin(bool on) { m_showOnionSkin = on; }
void setOnionOpacity(int value) { m_onionOpacity = value; }
void setPreviousImage(QImage& prevImage) { m_previousImage = prevImage; }
protected:
void paintEvent(QPaintEvent* event);
void resizeEvent(QResizeEvent* event);
protected slots:
void onUpsideDownChecked(bool on) { m_upsideDown = on; }
};
//=============================================================================
// PencilTestPopup
//-----------------------------------------------------------------------------
class PencilTestPopup : public DVGui::Dialog {
Q_OBJECT
QCamera* m_currentCamera;
QString m_deviceName;
MyViewFinder* m_cameraViewfinder;
QCameraImageCapture* m_cameraImageCapture;
QComboBox *m_cameraListCombo, *m_resolutionCombo, *m_fileTypeCombo,
*m_colorTypeCombo;
QLineEdit* m_levelNameEdit;
QCheckBox *m_upsideDownCB, *m_onionSkinCB;
QPushButton *m_fileFormatOptionButton, *m_captureWhiteBGButton;
DVGui::FileField* m_saveInFileFld;
DVGui::IntLineEdit* m_frameNumberEdit;
DVGui::IntField *m_thresholdFld, *m_contrastFld, *m_brightnessFld,
*m_bgReductionFld, *m_onionOpacityFld;
QImage m_whiteBGImg;
int m_timerId;
QString m_cacheImagePath;
bool m_captureWhiteBGCue;
bool m_captureCue;
void processImage(QImage& procImage);
bool importImage(QImage& image);
public:
PencilTestPopup();
~PencilTestPopup();
protected:
void timerEvent(QTimerEvent* event);
void showEvent(QShowEvent* event);
void hideEvent(QHideEvent* event);
protected slots:
void refreshCameraList();
void onCameraListComboActivated(int index);
void onResolutionComboActivated(const QString&);
void onFileFormatOptionButtonPressed();
void onNextName();
void onColorTypeComboChanged(int index);
void onImageCaptured(int, const QImage&);
void onCaptureWhiteBGButtonPressed();
void onOnionCBToggled(bool);
void onOnionOpacityFldEdited();
void onCapture();
};
#endif

2
toonz/sources/toonzqt/stylenameeditor.cpp
View file

@ -27,7 +27,7 @@ StyleNameEditor::StyleNameEditor(QWidget *parent)
m_applyButton->setEnabled(false);
m_cancelButton->setFocusPolicy(Qt::NoFocus);
m_styleName->setObjectName("RenameColorTextField");
m_styleName->setObjectName("LargeSizedText");
QVBoxLayout *mainLayout = new QVBoxLayout();
mainLayout->setMargin(10);

174
toonz/sources/translations/japanese/toonz.ts
View file

@ -4253,6 +4253,26 @@ Do you want to create it?</source>
<source>Refresh Folder Tree</source>
<translation>フォルダ構成の再読み込み</translation>
</message>
<message>
<source>&amp;Pencil Test...</source>
<translation>ラインテスト (&amp;P)...</translation>
</message>
<message>
<source>Drawing Substitution Forward</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Drawing Substitution Backward</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Similar Drawing Substitution Forward</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Similar Drawing Substitution Backward</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MatchlinesDialog</name>
@ -4503,6 +4523,13 @@ What do you want to do?</source>
<translation>ピクセル形式が対応されていません。</translation>
</message>
</context>
<context>
<name>MyViewFinder</name>
<message>
<source>Camera is not available</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OutputSettingsPopup</name>
<message>
@ -4880,6 +4907,145 @@ Do you want to overwrite it?</source>
上書きしますか？ </translation>
</message>
</context>
<context>
<name>PencilTestPopup</name>
<message>
<source>Pencil Test</source>
<translation>ラインテスト</translation>
</message>
<message>
<source>Refresh</source>
<translation>リスト更新</translation>
</message>
<message>
<source>File</source>
<translation>ファイル</translation>
</message>
<message>
<source>Options</source>
<translation>ファイル設定</translation>
</message>
<message>
<source>Image adjust</source>
<translation>画像調整</translation>
</message>
<message>
<source>Upside down</source>
<translation>180度回転</translation>
</message>
<message>
<source>Capture white BG</source>
<translation>基準背景取り込み</translation>
</message>
<message>
<source>Display</source>
<translation>表示</translation>
</message>
<message>
<source>Show onion skin</source>
<translation>前の画像と比べる</translation>
</message>
<message>
<source>Capture</source>
<translation>取り込み</translation>
</message>
<message>
<source>Close</source>
<translation>閉じる</translation>
</message>
<message>
<source>Next Level</source>
<translation>次のレベル</translation>
</message>
<message>
<source>Camera:</source>
<translation>カメラ：</translation>
</message>
<message>
<source>Resolution:</source>
<translation>サイズ：</translation>
</message>
<message>
<source>Name:</source>
<translation>レベル名：</translation>
</message>
<message>
<source>Frame:</source>
<translation>フレーム：</translation>
</message>
<message>
<source>File Type:</source>
<translation>ファイルタイプ：</translation>
</message>
<message>
<source>Save In:</source>
<translation>保存先：</translation>
</message>
<message>
<source>Color type:</source>
<translation>タイプ：</translation>
</message>
<message>
<source>Threshold:</source>
<translation>しきい値：</translation>
</message>
<message>
<source>Contrast:</source>
<translation>コントラスト：</translation>
</message>
<message>
<source>Brightness:</source>
<translation>明るさ：</translation>
</message>
<message>
<source>BG reduction:</source>
<translation>背景の除去：</translation>
</message>
<message>
<source>Opacity(%):</source>
<translation>不透明度（％）：</translation>
</message>
<message>
<source>No camera found</source>
<translation>カメラが見つかりません</translation>
</message>
<message>
<source>No level name specified: please choose a valid level name</source>
<translation>レベル名は指定されていません。有効なレベル名を指定して下さい。</translation>
</message>
<message>
<source>Folder %1 doesn&apos;t exist.
Do you want to create it?</source>
<translation>フォルダー %1 は存在しません。
作成しますか？</translation>
</message>
<message>
<source>Unable to create</source>
<translation>作成できません。</translation>
</message>
<message>
<source>The level name specified is already used: please choose a different level name.</source>
<translation>指定されたレベル名はすでに使用中です：別の名前を指定してください</translation>
</message>
<message>
<source>The save in path specified does not match with the existing level.</source>
<translation>指定された保存先パスが既存のレベルと異なります。</translation>
</message>
<message>
<source>The captured image size does not match with the existing level.</source>
<translation>取り込まれた画像サイズが既存のレベルと異なります。</translation>
</message>
<message>
<source>File %1 does exist.
Do you want to overwrite it?</source>
<translation>ファイル %1 は、既に存在します。
上書きしてもよろしいですか？</translation>
</message>
<message>
<source>Failed to load %1.</source>
<translation>ファイル %1 の読み込みに失敗しました</translation>
</message>
</context>
<context>
<name>PltGizmoPopup</name>
<message>
@ -7070,6 +7236,10 @@ Are you sure to </source>
<source>Add color model&apos;s palette to the destination palette.</source>
<translation>カラーモデルのパレットを、対象のパレットに追加する。</translation>
</message>
<message>
<source>Change current drawing %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RenameAsToonzPopup</name>
@ -9408,6 +9578,10 @@ Please refer to the user guide for details.</source>
<source>Double Click to Toggle Onion Skin</source>
<translation>[ダブルクリック] オニオンスキン表示/非表示</translation>
</message>
<message>
<source>Pinned Center : Col%1%2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>XsheetViewer</name>