Merge pull request #4963 from shun-iwasawa/fix_assistant_tool_slowness

Fix Assistant Tool Slowness
opentoonz · Jun 20, 2023 · 2a1fb4d · 2a1fb4d
2 parents e6492d0 + ec85add
commit 2a1fb4d
Show file tree

Hide file tree

Showing 7 changed files with 279 additions and 205 deletions.
diff --git a/toonz/sources/include/tools/modifiers/modifiertest.h b/toonz/sources/include/tools/modifiers/modifiertest.h
@@ -1,3 +1,5 @@
+
+#ifndef NDEBUG
 #pragma once
 
 #ifndef MODIFIERTEST_INCLUDED
@@ -6,7 +8,6 @@
 // TnzTools includes
 #include <tools/inputmanager.h>
 
-
 #undef DVAPI
 #undef DVVAR
 #ifdef TNZTOOLS_EXPORTS
@@ -17,28 +18,28 @@
 #define DVVAR DV_IMPORT_VAR
 #endif
 
-
 //===================================================================
 
 //*****************************************************************************************
 //    TModifierTest definition
 //*****************************************************************************************
 
-class DVAPI TModifierTest: public TInputModifier {
+class DVAPI TModifierTest : public TInputModifier {
 public:
-  class DVAPI Handler: public TTrackHandler {
+  class DVAPI Handler : public TTrackHandler {
   public:
     std::vector<double> angles;
-    Handler(const TTrack &original): TTrackHandler(original) { }
+    Handler(const TTrack &original) : TTrackHandler(original) {}
   };
 
-  class DVAPI Modifier: public TTrackModifier {
+  class DVAPI Modifier : public TTrackModifier {
   public:
     double angle;
     double radius;
     double speed;
 
-    Modifier(TTrackHandler &handler, double angle, double radius, double speed = 0.25);
+    Modifier(TTrackHandler &handler, double angle, double radius,
+             double speed = 0.25);
     TTrackPoint calcPoint(double originalIndex) override;
   };
 
@@ -48,11 +49,10 @@ class DVAPI TModifierTest: public TInputModifier {
 
   TModifierTest(int count, double radius);
 
-  void modifyTrack(
-    const TTrack &track,
-    const TInputSavePoint::Holder &savePoint,
-    TTrackList &outTracks ) override;
+  void modifyTrack(const TTrack &track,
+                   const TInputSavePoint::Holder &savePoint,
+                   TTrackList &outTracks) override;
 };
 
-
+#endif
 #endif
diff --git a/toonz/sources/include/tools/tooloptions.h b/toonz/sources/include/tools/tooloptions.h
@@ -557,6 +557,7 @@ class BrushToolOptionsBox final : public ToolOptionsBox {
 private:
   class PresetNamePopup;
   PresetNamePopup *m_presetNamePopup;
+  void filterControls();
 
 public:
   BrushToolOptionsBox(QWidget *parent, TTool *tool, TPaletteHandle *pltHandle,