Guest User

Untitled

a guest
Dec 24th, 2013
100
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.98 KB | None | 0 0
  1. diff --git a/krita/ui/input/kis_input_manager.cpp b/krita/ui/input/kis_input_manager.cpp
  2. index aeba701..ffda13b 100644
  3. --- a/krita/ui/input/kis_input_manager.cpp
  4. +++ b/krita/ui/input/kis_input_manager.cpp
  5. @@ -74,7 +74,7 @@ public:
  6. , lastTouchEvent(0)
  7. , eventsReceiver(0)
  8. , moveEventCompressor(10 /* ms */, KisSignalCompressor::FIRST_ACTIVE)
  9. - , logTabletEvents(false)
  10. + , logTabletEvents(true)
  11. {
  12. }
  13.  
  14. diff --git a/krita/ui/input/wintab/kis_tablet_support_x11.cpp b/krita/ui/input/wintab/kis_tablet_support_x11.cpp
  15. index 8a6c975..7685aff 100644
  16. --- a/krita/ui/input/wintab/kis_tablet_support_x11.cpp
  17. +++ b/krita/ui/input/wintab/kis_tablet_support_x11.cpp
  18. @@ -305,6 +305,15 @@ void kis_x11_init_tablet()
  19. device_data.maxTanPressure = 0;
  20. device_data.minZ = 0;
  21. device_data.maxZ = 0;
  22. +
  23. + qDebug() << "=== Getting tablet limits ===";
  24. + qDebug() << ppVar(a[0].min_value) << ppVar(a[0].max_value);
  25. + qDebug() << ppVar(a[1].min_value) << ppVar(a[1].max_value);
  26. + qDebug() << ppVar(a[2].min_value) << ppVar(a[2].max_value) << " <-- pressure";
  27. + qDebug() << ppVar(a[3].min_value) << ppVar(a[3].max_value);
  28. + qDebug() << ppVar(a[4].min_value) << ppVar(a[4].max_value);
  29. + qDebug() << ppVar(a[5].min_value) << ppVar(a[5].max_value);
  30. + qDebug() << "=============================";
  31. #endif
  32.  
  33. // got the max pressure no need to go further...
  34. @@ -501,6 +510,16 @@ bool translateXinputEvent(const XEvent *ev, QTabletDeviceData *tablet, QWidget *
  35. hiRes = tablet->scaleCoord(motion->axis_data[0], motion->axis_data[1],
  36. screenArea.x(), screenArea.width(),
  37. screenArea.y(), screenArea.height());
  38. +
  39. + qDebug() << "*** MotionEvent ***";
  40. + qDebug() << ppVar(pressure);
  41. + qDebug() << ppVar(rotation);
  42. + qDebug() << ppVar(xTilt) << ppVar(yTilt);
  43. + qDebug() << ppVar(motion->deviceid);
  44. + qDebug() << ppVar(tablet->minPressure) << ppVar(tablet->maxPressure);
  45. + qDebug() << "*******************";
  46. +
  47. +
  48. } else if (button) {
  49. xTilt = (short) button->axis_data[3];
  50. yTilt = (short) button->axis_data[4];
  51. @@ -509,6 +528,26 @@ bool translateXinputEvent(const XEvent *ev, QTabletDeviceData *tablet, QWidget *
  52. hiRes = tablet->scaleCoord(button->axis_data[0], button->axis_data[1],
  53. screenArea.x(), screenArea.width(),
  54. screenArea.y(), screenArea.height());
  55. + qDebug() << "*** ButtonEvent ***";
  56. + qDebug() << ppVar(pressure);
  57. + qDebug() << ppVar(rotation);
  58. + qDebug() << ppVar(xTilt) << ppVar(yTilt);
  59. + qDebug() << ppVar(button->deviceid);
  60. + qDebug() << ppVar(button->axis_data[0]) << ppVar(button->axis_data[1]);
  61. + qDebug() << ppVar(tablet->minPressure) << ppVar(tablet->maxPressure);
  62. + qDebug() << ppVar(global);
  63. + qDebug() << ppVar(curr);
  64. + qDebug() << ppVar(hiRes);
  65. + qDebug() << "*******************";
  66. +
  67. + if (!button->axis_data[0] &&
  68. + !button->axis_data[1] &&
  69. + !global.isNull()) {
  70. +
  71. + qDebug() << "Workaround broken tablet driver!";
  72. + hiRes = global;
  73. + }
  74. +
  75. }
  76. if (deviceType == QTabletEvent::Airbrush) {
  77. tangentialPressure = rotation;
  78. diff --git a/krita/ui/tool/kis_tool_freehand.cc b/krita/ui/tool/kis_tool_freehand.cc
  79. index deae910..65cf4a5 100644
  80. --- a/krita/ui/tool/kis_tool_freehand.cc
  81. +++ b/krita/ui/tool/kis_tool_freehand.cc
  82. @@ -172,6 +172,9 @@ bool KisToolFreehand::primaryActionSupportsHiResEvents() const
  83.  
  84. void KisToolFreehand::beginPrimaryAction(KoPointerEvent *event)
  85. {
  86. + qDebug() << "## Begin stroke" << ppVar(event->pos()) << ppVar(event->globalPos()) << ppVar(event->point) << ppVar(event->pressure());
  87. +
  88. +
  89. // FIXME: workaround for the Duplicate Op
  90. tryPickByPaintOp(event, PickFgImage);
  91.  
  92. @@ -201,6 +204,8 @@ void KisToolFreehand::beginPrimaryAction(KoPointerEvent *event)
  93.  
  94. void KisToolFreehand::continuePrimaryAction(KoPointerEvent *event)
  95. {
  96. + qDebug() << "## Conti stroke" << ppVar(event->pos()) << ppVar(event->globalPos()) << ppVar(event->point) << ppVar(event->pressure());
  97. +
  98. KIS_ASSERT_RECOVER_RETURN(mode() == KisTool::PAINT_MODE);
  99.  
  100. requestUpdateOutline(event->point);
  101. @@ -213,6 +218,8 @@ void KisToolFreehand::continuePrimaryAction(KoPointerEvent *event)
  102.  
  103. void KisToolFreehand::endPrimaryAction(KoPointerEvent *event)
  104. {
  105. + qDebug() << "## End stroke" << ppVar(event->pos()) << ppVar(event->globalPos()) << ppVar(event->point) << ppVar(event->pressure());
  106. +
  107. Q_UNUSED(event);
  108. KIS_ASSERT_RECOVER_RETURN(mode() == KisTool::PAINT_MODE);
Advertisement
Add Comment
Please, Sign In to add comment