Differential D18741 Diff 50924 tools/flow/kpToolFlowBase.cpp

Changeset View

Standalone View

View Options

tools/flow/kpToolFlowBase.cpp

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Line(s)
142{ 142​{
143 kpToolToolBar *tb = toolToolBar (); 143​ kpToolToolBar *tb = toolToolBar ();
144 Q_ASSERT (tb); 144​ Q_ASSERT (tb);
145 145​
146 // TODO: Bad smell. Mutually exclusive. Use inheritance. 146​ // TODO: Bad smell. Mutually exclusive. Use inheritance.
147 if (haveSquareBrushes ()) 147​ if (haveSquareBrushes ())
148 { 148​ {
149 d->toolWidgetEraserSize = tb->toolWidgetEraserSize (); 149​ d->toolWidgetEraserSize = tb->toolWidgetEraserSize ();
150 connect (d->toolWidgetEraserSize, SIGNAL (eraserSizeChanged(int)), 150​ connect (d->toolWidgetEraserSize, &kpToolWidgetEraserSize::eraserSizeChanged,
151 this, SLOT (updateBrushAndCursor())); 151​ this, &kpToolFlowBase::updateBrushAndCursor);
152 d->toolWidgetEraserSize->show (); 152​ d->toolWidgetEraserSize->show ();
153 153​
154 updateBrushAndCursor (); 154​ updateBrushAndCursor ();
155 155​
156 viewManager ()->setCursor (kpCursorProvider::lightCross ()); 156​ viewManager ()->setCursor (kpCursorProvider::lightCross ());
157 } 157​ }
158 else if (haveDiverseBrushes ()) 158​ else if (haveDiverseBrushes ())
159 { 159​ {
160 d->toolWidgetBrush = tb->toolWidgetBrush (); 160​ d->toolWidgetBrush = tb->toolWidgetBrush ();
161 connect (d->toolWidgetBrush, SIGNAL (brushChanged()), 161​ connect (d->toolWidgetBrush, &kpToolWidgetBrush::brushChanged,
162 this, SLOT (updateBrushAndCursor())); 162​ this, &kpToolFlowBase::updateBrushAndCursor);
163 d->toolWidgetBrush->show (); 163​ d->toolWidgetBrush->show ();
164 164​
165 updateBrushAndCursor (); 165​ updateBrushAndCursor ();
166 166​
167 viewManager ()->setCursor (kpCursorProvider::lightCross ()); 167​ viewManager ()->setCursor (kpCursorProvider::lightCross ());
168 } 168​ }
169 169​
170 setUserMessage (haventBegunDrawUserMessage ()); 170​ setUserMessage (haventBegunDrawUserMessage ());
171} 171​}
172 172​
173//--------------------------------------------------------------------- 173​//---------------------------------------------------------------------
174 174​
175// virtual 175​// virtual
176void kpToolFlowBase::end () 176​void kpToolFlowBase::end ()
177{ 177​{
178 if (d->toolWidgetEraserSize) 178​ if (d->toolWidgetEraserSize)
179 { 179​ {
180 disconnect (d->toolWidgetEraserSize, SIGNAL (eraserSizeChanged(int)), 180​ disconnect (d->toolWidgetEraserSize, &kpToolWidgetEraserSize::eraserSizeChanged,
181 this, SLOT (updateBrushAndCursor())); 181​ this, &kpToolFlowBase::updateBrushAndCursor);
182 d->toolWidgetEraserSize = nullptr; 182​ d->toolWidgetEraserSize = nullptr;
183 } 183​ }
184 else if (d->toolWidgetBrush) 184​ else if (d->toolWidgetBrush)
185 { 185​ {
186 disconnect (d->toolWidgetBrush, SIGNAL (brushChanged()), 186​ disconnect (d->toolWidgetBrush, &kpToolWidgetBrush::brushChanged,
187 this, SLOT (updateBrushAndCursor())); 187​ this, &kpToolFlowBase::updateBrushAndCursor);
188 d->toolWidgetBrush = nullptr; 188​ d->toolWidgetBrush = nullptr;
189 } 189​ }
190 190​
191 kpViewManager *vm = viewManager (); 191​ kpViewManager *vm = viewManager ();
192 Q_ASSERT (vm); 192​ Q_ASSERT (vm);
193 193​
194 if (vm->tempImage () && vm->tempImage ()->isBrush ()) 194​ if (vm->tempImage () && vm->tempImage ()->isBrush ())
195 vm->invalidateTempImage (); 195​ vm->invalidateTempImage ();
▲ Show 20 Lines • Show All 296 Lines • Show Last 20 Lines