diff --git a/toonz/sources/include/ext/ContextStatus.h b/toonz/sources/include/ext/ContextStatus.h index a263c23..07da0b4 100644 --- a/toonz/sources/include/ext/ContextStatus.h +++ b/toonz/sources/include/ext/ContextStatus.h @@ -45,7 +45,7 @@ struct DVAPI ContextStatus { double lengthOfAction_; // how much curve to move - double deformerSensibility_; + double deformerSensitivity_; // pixel size double pixelSize_; diff --git a/toonz/sources/include/ext/StrokeParametricDeformer.h b/toonz/sources/include/ext/StrokeParametricDeformer.h index e2a253b..d2a0d70 100644 --- a/toonz/sources/include/ext/StrokeParametricDeformer.h +++ b/toonz/sources/include/ext/StrokeParametricDeformer.h @@ -93,7 +93,7 @@ public: const Potential *getPotential() const { return pot_; } /** -*@brief Change sensibility of deformer (just for debug). +*@brief Change sensitivity of deformer (just for debug). */ void setDiff(double diff) { diff_ = diff; } @@ -121,7 +121,7 @@ private: // deformation shape Potential *pot_; - // sensibility of deformer + // sensitivity of deformer // Indica il valore minimo a partire dal quale // l'inseritore comincia a mettere punti di controllo double diff_; diff --git a/toonz/sources/include/toonz/vectorizerparameters.h b/toonz/sources/include/toonz/vectorizerparameters.h index eae3a3a..54aa533 100644 --- a/toonz/sources/include/toonz/vectorizerparameters.h +++ b/toonz/sources/include/toonz/vectorizerparameters.h @@ -37,7 +37,7 @@ class TOStream; (like \p VectorizerPopup) to lower layers (\p VectorizerCore) of the vectorization process inside a \p VectorizerConfiguration variable. - This typically includes vectorization modes, various sensibility and + This typically includes vectorization modes, various sensitivity and accuracy parameters, and post-processing informations. This class merely acts as a base parameters container (although no pure virtual method is present) - meaning that every vectorization method diff --git a/toonz/sources/tnzext/ContextStatus.cpp b/toonz/sources/tnzext/ContextStatus.cpp index 2aee592..0179f69 100644 --- a/toonz/sources/tnzext/ContextStatus.cpp +++ b/toonz/sources/tnzext/ContextStatus.cpp @@ -16,7 +16,7 @@ ToonzExt::ContextStatus::~ContextStatus() {} void ToonzExt::ContextStatus::init() { key_event_ = NONE; w_ = -1; - deformerSensibility_ = -1; + deformerSensitivity_ = -1; stroke2change_ = 0; lengthOfAction_ = 50; deformer_ = 0; @@ -43,7 +43,7 @@ ToonzExt::ContextStatus &ToonzExt::ContextStatus::operator=( cornerSize_ = ob.cornerSize_; stroke2change_ = ob.stroke2change_; lengthOfAction_ = ob.lengthOfAction_; - deformerSensibility_ = ob.deformerSensibility_; + deformerSensitivity_ = ob.deformerSensitivity_; // spireCorners_ = ob.spireCorners_; // straightCorners_ =ob.straightCorners_; return *this; diff --git a/toonz/sources/tnzext/StrokeDeformationImpl.cpp b/toonz/sources/tnzext/StrokeDeformationImpl.cpp index 62b58c4..969c1ba 100644 --- a/toonz/sources/tnzext/StrokeDeformationImpl.cpp +++ b/toonz/sources/tnzext/StrokeDeformationImpl.cpp @@ -413,7 +413,7 @@ bool StrokeDeformationImpl::activate_impl(const ContextStatus *status) { } // change the threshold value of increser, // if value is greater than diff add control points - deformer_->setDiff(getImplStatus()->deformerSensibility_); + deformer_->setDiff(getImplStatus()->deformerSensitivity_); // just to be sure to have a control point where // stroke is selected diff --git a/toonz/sources/tnztools/brushtool.cpp b/toonz/sources/tnztools/brushtool.cpp index f793231..6cf93b9 100644 --- a/toonz/sources/tnztools/brushtool.cpp +++ b/toonz/sources/tnztools/brushtool.cpp @@ -55,7 +55,7 @@ TEnv::DoubleVar BrushSmooth("InknpaintBrushSmooth", 0); TEnv::IntVar BrushSelective("InknpaintBrushSelective", 0); TEnv::IntVar BrushBreakSharpAngles("InknpaintBrushBreakSharpAngles", 0); TEnv::IntVar RasterBrushPencilMode("InknpaintRasterBrushPencilMode", 0); -TEnv::IntVar BrushPressureSensibility("InknpaintBrushPressureSensibility", 1); +TEnv::IntVar BrushPressureSensitivity("InknpaintBrushPressureSensitivity", 1); TEnv::DoubleVar RasterBrushHardness("RasterBrushHardness", 100); //------------------------------------------------------------------- @@ -772,7 +772,7 @@ BrushTool::BrushTool(std::string name, int targetType) m_prop[0].bind(m_preset); m_preset.setId("BrushPreset"); m_preset.addValue(CUSTOM_WSTR); - m_pressure.setId("PressureSensibility"); + m_pressure.setId("PressureSensitivity"); m_capStyle.addValue(BUTT_WSTR); m_capStyle.addValue(ROUNDC_WSTR); @@ -1004,7 +1004,7 @@ void BrushTool::onActivate() { m_selective.setValue(BrushSelective ? 1 : 0); m_breakAngles.setValue(BrushBreakSharpAngles ? 1 : 0); m_pencil.setValue(RasterBrushPencilMode ? 1 : 0); - m_pressure.setValue(BrushPressureSensibility ? 1 : 0); + m_pressure.setValue(BrushPressureSensitivity ? 1 : 0); m_firstTime = false; m_accuracy.setValue(BrushAccuracy); m_smooth.setValue(BrushSmooth); @@ -1811,7 +1811,7 @@ bool BrushTool::onPropertyChanged(std::string propertyName) { } else if (propertyName == m_pencil.getName()) { RasterBrushPencilMode = m_pencil.getValue(); } else if (propertyName == m_pressure.getName()) { - BrushPressureSensibility = m_pressure.getValue(); + BrushPressureSensitivity = m_pressure.getValue(); } else if (propertyName == m_capStyle.getName()) { VectorCapStyle = m_capStyle.getIndex(); } else if (propertyName == m_joinStyle.getName()) { diff --git a/toonz/sources/tnztools/fullcolorbrushtool.cpp b/toonz/sources/tnztools/fullcolorbrushtool.cpp index dfd740b..808efaa 100644 --- a/toonz/sources/tnztools/fullcolorbrushtool.cpp +++ b/toonz/sources/tnztools/fullcolorbrushtool.cpp @@ -43,7 +43,7 @@ TEnv::IntVar FullcolorBrushMinSize("FullcolorBrushMinSize", 1); TEnv::IntVar FullcolorBrushMaxSize("FullcolorBrushMaxSize", 5); -TEnv::IntVar FullcolorPressureSensibility("FullcolorPressureSensibility", 1); +TEnv::IntVar FullcolorPressureSensitivity("FullcolorPressureSensitivity", 1); TEnv::DoubleVar FullcolorBrushHardness("FullcolorBrushHardness", 100); TEnv::DoubleVar FullcolorMinOpacity("FullcolorMinOpacity", 100); TEnv::DoubleVar FullcolorMaxOpacity("FullcolorMaxOpacity", 100); @@ -203,7 +203,7 @@ void FullColorBrushTool::onActivate() { m_firstTime = false; m_thickness.setValue( TIntPairProperty::Value(FullcolorBrushMinSize, FullcolorBrushMaxSize)); - m_pressure.setValue(FullcolorPressureSensibility ? 1 : 0); + m_pressure.setValue(FullcolorPressureSensitivity ? 1 : 0); m_opacity.setValue( TDoublePairProperty::Value(FullcolorMinOpacity, FullcolorMaxOpacity)); m_hardness.setValue(FullcolorBrushHardness); @@ -582,7 +582,7 @@ bool FullColorBrushTool::onPropertyChanged(std::string propertyName) { setWorkAndBackupImages();*/ FullcolorBrushMinSize = m_minThick; FullcolorBrushMaxSize = m_maxThick; - FullcolorPressureSensibility = m_pressure.getValue(); + FullcolorPressureSensitivity = m_pressure.getValue(); FullcolorBrushHardness = m_hardness.getValue(); FullcolorMinOpacity = m_opacity.getValue().first; FullcolorMaxOpacity = m_opacity.getValue().second; diff --git a/toonz/sources/tnztools/pinchtool.cpp b/toonz/sources/tnztools/pinchtool.cpp index 3f563a2..9413659 100644 --- a/toonz/sources/tnztools/pinchtool.cpp +++ b/toonz/sources/tnztools/pinchtool.cpp @@ -134,7 +134,7 @@ void PinchTool::updateInterfaceStatus(const TMouseEvent &event) { m_status.pixelSize_ = getPixelSize(); m_status.cornerSize_ = (int)m_toolCornerSize.getValue(); m_status.lengthOfAction_ = m_toolRange.getValue(); - m_status.deformerSensibility_ = 0.01 * getPixelSize(); + m_status.deformerSensitivity_ = 0.01 * getPixelSize(); m_status.key_event_ = ContextStatus::NONE; diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index d94290f..67e1716 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -2031,8 +2031,8 @@ void MainWindow::defineActions() { createToolOptionsAction("A_ToolOption_PencilMode", tr("Pencil Mode"), ""); createToolOptionsAction("A_ToolOption_PreserveThickness", tr("Preserve Thickness"), ""); - createToolOptionsAction("A_ToolOption_PressureSensibility", - tr("Pressure sensibility"), ""); + createToolOptionsAction("A_ToolOption_PressureSensitivity", + tr("Pressure sensitivity"), ""); createToolOptionsAction("A_ToolOption_SegmentInk", tr("Segment Ink"), "F8"); createToolOptionsAction("A_ToolOption_Selective", tr("Selective"), "F7"); createToolOptionsAction("A_ToolOption_Smooth", tr("Smooth"), ""); diff --git a/toonz/sources/toonz/trackerpopup.cpp b/toonz/sources/toonz/trackerpopup.cpp index 8a2b660..6173491 100644 --- a/toonz/sources/toonz/trackerpopup.cpp +++ b/toonz/sources/toonz/trackerpopup.cpp @@ -166,11 +166,11 @@ TrackerPopup::TrackerPopup(QWidget *parent, Qt::WFlags flags) m_threshold->setValue(0.2); addWidget(tr("Threshold:"), m_threshold); - m_sensibility = new DoubleField(); // W_Accuracy - m_sensibility->setFixedHeight(WidgetHeight); - m_sensibility->setRange(0, 1000); - m_sensibility->setValue(10); - addWidget(tr("Sensitivity:"), m_sensibility); + m_sensitivity = new DoubleField(); // W_Accuracy + m_sensitivity->setFixedHeight(WidgetHeight); + m_sensitivity->setRange(0, 1000); + m_sensitivity->setValue(10); + addWidget(tr("Sensitivity:"), m_sensitivity); m_variationWindow = new CheckBox(tr("Variable Region Size")); m_variationWindow->setFixedHeight(WidgetHeight); @@ -193,7 +193,7 @@ TrackerPopup::TrackerPopup(QWidget *parent, Qt::WFlags flags) bool TrackerPopup::apply() { float threshold = m_threshold->getValue(); - float sensibility = m_sensibility->getValue() / 1000; + float sensitivity = m_sensitivity->getValue() / 1000; int activeBackground = m_activeBackground->isChecked(); int manageOcclusion = 0; int variationWindow = m_variationWindow->isChecked(); @@ -225,7 +225,7 @@ bool TrackerPopup::apply() { if (framesNumber <= 0) return false; m_tracker = - new Tracker(threshold, sensibility, activeBackground, manageOcclusion, + new Tracker(threshold, sensitivity, activeBackground, manageOcclusion, variationWindow, frameStart, framesNumber); if (m_tracker->getLastError() != 0) { DVGui::warning(m_tracker->getLastError()); @@ -282,12 +282,12 @@ void TrackerPopup::onTrack() { apply(); } // TrackerPopup //----------------------------------------------------------------------------- -Tracker::Tracker(double threshold, double sensibility, int activeBackground, +Tracker::Tracker(double threshold, double sensitivity, int activeBackground, int manageOcclusion, int variationWindow, int frameStart, int framesNumber) : m_affine() { m_threshold = threshold; - m_sensibility = sensibility; + m_sensitivity = sensitivity; m_activeBackground = activeBackground; m_manageOcclusion = manageOcclusion; m_variationWindow = variationWindow; @@ -569,7 +569,7 @@ bool Tracker::setup() { } float threshold_distB = 0.6 * threshold_dist; - if ((m_sensibility < 0) || (m_sensibility > 1)) { + if ((m_sensitivity < 0) || (m_sensitivity > 1)) { m_lastErrorCode = 10; return false; } @@ -662,7 +662,7 @@ bool Tracker::trackCurrentFrame() { m_pObjectTracker[i]->ObjeckTrackerHandlerByUser(&m_raster); float dist_temp; dist_temp = m_pObjectTracker[i]->Matching(&m_raster, &m_raster_template[i]); - if ((dist_temp < m_sensibility) && (m_pObjectTracker[i]->track)) { + if ((dist_temp < m_sensitivity) && (m_pObjectTracker[i]->track)) { m_raster_template[i] = m_raster; m_pObjectTracker[i]->updateTemp(); } diff --git a/toonz/sources/toonz/trackerpopup.h b/toonz/sources/toonz/trackerpopup.h index 900b88d..5e16be5 100644 --- a/toonz/sources/toonz/trackerpopup.h +++ b/toonz/sources/toonz/trackerpopup.h @@ -46,7 +46,7 @@ class TrackerPopup final : public DVGui::Dialog { Q_OBJECT DVGui::DoubleField *m_threshold; - DVGui::DoubleField *m_sensibility; + DVGui::DoubleField *m_sensitivity; DVGui::CheckBox *m_activeBackground; DVGui::CheckBox *m_variationWindow; /*DVGui::LineEdit* m_frameStart; @@ -85,7 +85,7 @@ public slots: class Tracker { float m_threshold; - float m_sensibility; + float m_sensitivity; int m_activeBackground; int m_manageOcclusion; int m_variationWindow; @@ -114,7 +114,7 @@ class Tracker { TAffine m_affine; public: - Tracker(double threshold, double sensibility, int activeBackground, + Tracker(double threshold, double sensitivity, int activeBackground, int manageOcclusion, int variationWindow, int frameStart, int framesNumber); ~Tracker(); diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp index 632b0ec..186392b 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp @@ -142,7 +142,7 @@ void CYOMBInputParam::makeColorIndexList(const char *s, COLOR_INDEX_LIST &cil, // 10,11,12,13,14 isColor2, color2 (RGBM) // 15,16,17,18,19 isColor1, color1 (RGBM) // 20,21,22,23,24 isColor0, color0 (RGBM) -// 25. sensibility of selection (dAB) +// 25. sensitivity of selection (dAB) // 26. nbSamples (Quality). The number of sampling pixels. // 27. dSamples (Amount). The distance of sampling. // 28. isStopAtContour (Y/N) Stops the sampling at contour line. @@ -174,10 +174,10 @@ CYOMBInputParam::CYOMBInputParam(const int argc, const char *argv[], if ((int)(m_dSample * m_dSample * 2.5) < m_nbSample) m_nbSample = (int)(m_dSample * m_dSample * 2.5); - // Sensibility - dist A + // Sensitivity - dist A m_dA = 3.0 * atof(argv[25]) / 50.0; m_dA = m_dA <= 0.001 ? 0.001 : m_dA; - // Sensibility - dist AB + // Sensitivity - dist AB m_dAB = atof(argv[25]) / 50.0; m_dAB = m_dAB <= 0.001 ? 0.001 : m_dAB; diff --git a/toonz/sources/toonzqt/schematicnode.cpp b/toonz/sources/toonzqt/schematicnode.cpp index dad73d0..620f83f 100644 --- a/toonz/sources/toonzqt/schematicnode.cpp +++ b/toonz/sources/toonzqt/schematicnode.cpp @@ -497,13 +497,13 @@ void SchematicLink::mousePressEvent(QGraphicsSceneMouseEvent *me) { QPointF p0((endPos.x() - startPos.x()) * 0.5, 0); QPointF p1(p0.x(), endPos.y() - startPos.y()); QPointF p2(endPos - startPos); - double sensibility = 5 / scaleFactor; - QPointF h(0, sensibility); + double sensitivity = 5 / scaleFactor; + QPointF h(0, sensitivity); QPointF p = h; if (p2.y() > 0) - p.setX(p2.x() > 0 ? -sensibility : sensibility); + p.setX(p2.x() > 0 ? -sensitivity : sensitivity); else - p.setX(p2.x() > 0 ? sensibility : -sensibility); + p.setX(p2.x() > 0 ? sensitivity : -sensitivity); QPainterPath path(QPointF(0, 0)); path.lineTo(h); path.cubicTo(p0 + p, p1 + p, p2 + h);