Changeset View
Changeset View
Standalone View
Standalone View
dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Line(s) | |||||
72 | { | 72 | { | ||
73 | // Too confusing - disable for now | 73 | // Too confusing - disable for now | ||
74 | s_lastHorizontalAngle = s_lastVerticalAngle = 0; | 74 | s_lastHorizontalAngle = s_lastVerticalAngle = 0; | ||
75 | 75 | | |||
76 | 76 | | |||
77 | createAngleGroupBox (); | 77 | createAngleGroupBox (); | ||
78 | 78 | | |||
79 | 79 | | |||
80 | if (s_lastWidth > 0 && s_lastHeight > 0) | 80 | if (s_lastWidth > 0 && s_lastHeight > 0) { | ||
81 | resize (s_lastWidth, s_lastHeight); | 81 | resize (s_lastWidth, s_lastHeight); | ||
82 | } | ||||
82 | 83 | | |||
83 | 84 | | |||
84 | slotUpdate (); | 85 | slotUpdate (); | ||
85 | 86 | | |||
86 | 87 | | |||
87 | m_horizontalSkewInput->setFocus (); | 88 | m_horizontalSkewInput->setFocus (); | ||
88 | } | 89 | } | ||
89 | 90 | | |||
90 | kpTransformSkewDialog::~kpTransformSkewDialog () | 91 | kpTransformSkewDialog::~kpTransformSkewDialog () | ||
91 | { | 92 | { | ||
92 | s_lastWidth = width (); | 93 | s_lastWidth = width (); | ||
93 | s_lastHeight = height (); | 94 | s_lastHeight = height (); | ||
94 | } | 95 | } | ||
95 | 96 | | |||
96 | 97 | | |||
97 | // private | 98 | // private | ||
98 | void kpTransformSkewDialog::createAngleGroupBox () | 99 | void kpTransformSkewDialog::createAngleGroupBox () | ||
99 | { | 100 | { | ||
100 | QGroupBox *angleGroupBox = new QGroupBox (i18n ("Angle"), mainWidget ()); | 101 | auto *angleGroupBox = new QGroupBox (i18n ("Angle"), mainWidget ()); | ||
101 | addCustomWidget (angleGroupBox); | 102 | addCustomWidget (angleGroupBox); | ||
102 | 103 | | |||
103 | 104 | | |||
104 | QLabel *horizontalSkewPixmapLabel = new QLabel (angleGroupBox); | 105 | auto *horizontalSkewPixmapLabel = new QLabel (angleGroupBox); | ||
105 | horizontalSkewPixmapLabel->setPixmap (UserIcon ("image_skew_horizontal")); | 106 | horizontalSkewPixmapLabel->setPixmap (UserIcon ("image_skew_horizontal")); | ||
106 | 107 | | |||
107 | QLabel *horizontalSkewLabel = new QLabel (i18n ("&Horizontal:"), angleGroupBox); | 108 | auto *horizontalSkewLabel = new QLabel (i18n ("&Horizontal:"), angleGroupBox); | ||
108 | m_horizontalSkewInput = new QSpinBox; | 109 | m_horizontalSkewInput = new QSpinBox; | ||
109 | m_horizontalSkewInput->setValue(s_lastHorizontalAngle); | 110 | m_horizontalSkewInput->setValue(s_lastHorizontalAngle); | ||
110 | m_horizontalSkewInput->setMinimum(-89); | 111 | m_horizontalSkewInput->setMinimum(-89); | ||
111 | m_horizontalSkewInput->setMaximum(+89); | 112 | m_horizontalSkewInput->setMaximum(+89); | ||
112 | 113 | | |||
113 | QLabel *horizontalSkewDegreesLabel = new QLabel (i18n ("degrees"), angleGroupBox); | 114 | auto *horizontalSkewDegreesLabel = new QLabel (i18n ("degrees"), angleGroupBox); | ||
114 | 115 | | |||
115 | 116 | | |||
116 | QLabel *verticalSkewPixmapLabel = new QLabel (angleGroupBox); | 117 | auto *verticalSkewPixmapLabel = new QLabel (angleGroupBox); | ||
117 | verticalSkewPixmapLabel->setPixmap (UserIcon ("image_skew_vertical")); | 118 | verticalSkewPixmapLabel->setPixmap (UserIcon ("image_skew_vertical")); | ||
118 | 119 | | |||
119 | QLabel *verticalSkewLabel = new QLabel (i18n ("&Vertical:"), angleGroupBox); | 120 | auto *verticalSkewLabel = new QLabel (i18n ("&Vertical:"), angleGroupBox); | ||
120 | m_verticalSkewInput = new QSpinBox; | 121 | m_verticalSkewInput = new QSpinBox; | ||
121 | m_verticalSkewInput->setValue(s_lastVerticalAngle); | 122 | m_verticalSkewInput->setValue(s_lastVerticalAngle); | ||
122 | m_verticalSkewInput->setMinimum(-89); | 123 | m_verticalSkewInput->setMinimum(-89); | ||
123 | m_verticalSkewInput->setMaximum(+89); | 124 | m_verticalSkewInput->setMaximum(+89); | ||
124 | 125 | | |||
125 | QLabel *verticalSkewDegreesLabel = new QLabel (i18n ("degrees"), angleGroupBox); | 126 | auto *verticalSkewDegreesLabel = new QLabel (i18n ("degrees"), angleGroupBox); | ||
126 | 127 | | |||
127 | 128 | | |||
128 | horizontalSkewLabel->setBuddy (m_horizontalSkewInput); | 129 | horizontalSkewLabel->setBuddy (m_horizontalSkewInput); | ||
129 | verticalSkewLabel->setBuddy (m_verticalSkewInput); | 130 | verticalSkewLabel->setBuddy (m_verticalSkewInput); | ||
130 | 131 | | |||
131 | 132 | | |||
132 | QGridLayout *angleLayout = new QGridLayout (angleGroupBox); | 133 | auto *angleLayout = new QGridLayout (angleGroupBox); | ||
133 | 134 | | |||
134 | angleLayout->addWidget (horizontalSkewPixmapLabel, 0, 0); | 135 | angleLayout->addWidget (horizontalSkewPixmapLabel, 0, 0); | ||
135 | angleLayout->addWidget (horizontalSkewLabel, 0, 1); | 136 | angleLayout->addWidget (horizontalSkewLabel, 0, 1); | ||
136 | angleLayout->addWidget (m_horizontalSkewInput, 0, 2, Qt::AlignVCenter); | 137 | angleLayout->addWidget (m_horizontalSkewInput, 0, 2, Qt::AlignVCenter); | ||
137 | angleLayout->addWidget (horizontalSkewDegreesLabel, 0, 3); | 138 | angleLayout->addWidget (horizontalSkewDegreesLabel, 0, 3); | ||
138 | 139 | | |||
139 | angleLayout->addWidget (verticalSkewPixmapLabel, 1, 0); | 140 | angleLayout->addWidget (verticalSkewPixmapLabel, 1, 0); | ||
140 | angleLayout->addWidget (verticalSkewLabel, 1, 1); | 141 | angleLayout->addWidget (verticalSkewLabel, 1, 1); | ||
Show All 12 Lines | |||||
153 | 154 | | |||
154 | 155 | | |||
155 | // private virtual [base kpTransformPreviewDialog] | 156 | // private virtual [base kpTransformPreviewDialog] | ||
156 | QSize kpTransformSkewDialog::newDimensions () const | 157 | QSize kpTransformSkewDialog::newDimensions () const | ||
157 | { | 158 | { | ||
158 | kpDocument *doc = document (); | 159 | kpDocument *doc = document (); | ||
159 | Q_ASSERT (doc); | 160 | Q_ASSERT (doc); | ||
160 | 161 | | |||
161 | QTransform skewMatrix = kpPixmapFX::skewMatrix (doc->image (), | 162 | auto skewMatrix = kpPixmapFX::skewMatrix (doc->image (), | ||
162 | horizontalAngleForPixmapFX (), | 163 | horizontalAngleForPixmapFX (), | ||
163 | verticalAngleForPixmapFX ()); | 164 | verticalAngleForPixmapFX ()); | ||
164 | QRect skewRect = skewMatrix.mapRect (doc->rect (m_actOnSelection)); | 165 | auto skewRect = skewMatrix.mapRect (doc->rect (m_actOnSelection)); | ||
165 | 166 | | |||
166 | return QSize (skewRect.width (), skewRect.height ()); | 167 | return {skewRect.width (), skewRect.height ()}; | ||
167 | } | 168 | } | ||
168 | 169 | | |||
169 | // private virtual [base kpTransformPreviewDialog] | 170 | // private virtual [base kpTransformPreviewDialog] | ||
170 | QImage kpTransformSkewDialog::transformPixmap (const QImage &image, | 171 | QImage kpTransformSkewDialog::transformPixmap (const QImage &image, | ||
171 | int targetWidth, int targetHeight) const | 172 | int targetWidth, int targetHeight) const | ||
172 | { | 173 | { | ||
173 | return kpPixmapFX::skew (image, | 174 | return kpPixmapFX::skew (image, | ||
174 | horizontalAngleForPixmapFX (), | 175 | horizontalAngleForPixmapFX (), | ||
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines |