|
|
|
@ -189,7 +189,7 @@ void DrawZone::setZoom(double z)
|
|
|
|
|
p.flush();
|
|
|
|
|
resizeContents(visibleWidth()>imageRect.width() ? visibleWidth() : imageRect.width(),
|
|
|
|
|
visibleHeight()>imageRect.height() ? visibleHeight() : imageRect.height());
|
|
|
|
|
tqrepaintContents(0,0,contentsWidth(),contentsHeight(),true);
|
|
|
|
|
repaintContents(0,0,contentsWidth(),contentsHeight(),true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TQPoint DrawZone::translateFromZoom(const TQPoint & p) const {
|
|
|
|
@ -379,7 +379,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e)
|
|
|
|
|
r=oldArea->selectionRect();
|
|
|
|
|
if (currentArea) {
|
|
|
|
|
r= r | currentArea->selectionRect();
|
|
|
|
|
tqrepaintContents(translateToZoom(r),false);
|
|
|
|
|
repaintContents(translateToZoom(r),false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -501,7 +501,7 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) {
|
|
|
|
|
|
|
|
|
|
imageMapEditor->updateActionAccess();
|
|
|
|
|
imageMapEditor->updateSelection();
|
|
|
|
|
tqrepaintContents(imageRect,false);
|
|
|
|
|
repaintContents(imageRect,false);
|
|
|
|
|
} else {
|
|
|
|
|
currentAction=None;
|
|
|
|
|
}
|
|
|
|
@ -509,11 +509,11 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) {
|
|
|
|
|
if (currentArea)
|
|
|
|
|
{
|
|
|
|
|
currentArea->setMoving(false);
|
|
|
|
|
tqrepaintArea(*currentArea);
|
|
|
|
|
repaintArea(*currentArea);
|
|
|
|
|
}
|
|
|
|
|
delete oldArea;
|
|
|
|
|
oldArea=0L;
|
|
|
|
|
// tqrepaintContents(0,0,contentsWidth(),contentsHeight(),false);
|
|
|
|
|
// repaintContents(0,0,contentsWidth(),contentsHeight(),false);
|
|
|
|
|
imageMapEditor->slotUpdateSelectionCoords();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -550,7 +550,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
|
|
|
|
|
currentArea->setRect(TQRect(drawStart,drawCurrent).normalize());
|
|
|
|
|
TQRect newRect=translateToZoom(currentArea->selectionRect());
|
|
|
|
|
TQRect r=oldRect | newRect;
|
|
|
|
|
tqrepaintContents(r,false);
|
|
|
|
|
repaintContents(r,false);
|
|
|
|
|
imageMapEditor->slotUpdateSelectionCoords( currentArea->rect() );
|
|
|
|
|
} else
|
|
|
|
|
if (currentAction==DrawCircle) {
|
|
|
|
@ -576,7 +576,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
|
|
|
|
|
currentArea->setRect(TQRect(drawStart,endPoint).normalize());
|
|
|
|
|
TQRect newRect=translateToZoom(currentArea->rect());
|
|
|
|
|
TQRect r=oldRect | newRect;
|
|
|
|
|
tqrepaintContents(r,false);
|
|
|
|
|
repaintContents(r,false);
|
|
|
|
|
imageMapEditor->slotUpdateSelectionCoords( currentArea->rect() );
|
|
|
|
|
} else
|
|
|
|
|
if ( currentAction==DrawPolygon ) {
|
|
|
|
@ -584,14 +584,14 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
|
|
|
|
|
currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent);
|
|
|
|
|
TQRect newRect=translateToZoom(currentArea->rect());
|
|
|
|
|
TQRect r=oldRect | newRect;
|
|
|
|
|
tqrepaintContents(r,false);
|
|
|
|
|
repaintContents(r,false);
|
|
|
|
|
} else
|
|
|
|
|
if ( currentAction==DrawFreehand) {
|
|
|
|
|
TQRect oldRect=translateToZoom(currentArea->rect());
|
|
|
|
|
currentArea->insertCoord(currentArea->countSelectionPoints(), drawCurrent);
|
|
|
|
|
TQRect newRect=translateToZoom(currentArea->rect());
|
|
|
|
|
TQRect r=oldRect | newRect;
|
|
|
|
|
tqrepaintContents(r,false);
|
|
|
|
|
repaintContents(r,false);
|
|
|
|
|
} else
|
|
|
|
|
if ( currentAction==MoveArea ) {
|
|
|
|
|
TQRect oldRect=translateToZoom(currentArea->selectionRect());
|
|
|
|
@ -599,7 +599,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
|
|
|
|
|
TQRect newRect=translateToZoom(currentArea->selectionRect());
|
|
|
|
|
TQRect r=oldRect | newRect;
|
|
|
|
|
currentArea->setMoving(true);
|
|
|
|
|
tqrepaintContents(r,false);
|
|
|
|
|
repaintContents(r,false);
|
|
|
|
|
drawStart=drawCurrent;
|
|
|
|
|
imageMapEditor->slotUpdateSelectionCoords();
|
|
|
|
|
} else
|
|
|
|
@ -608,7 +608,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
|
|
|
|
|
currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent);
|
|
|
|
|
TQRect newRect=translateToZoom(currentArea->selectionRect());
|
|
|
|
|
TQRect r=oldRect | newRect;
|
|
|
|
|
tqrepaintContents(r,false);
|
|
|
|
|
repaintContents(r,false);
|
|
|
|
|
imageMapEditor->slotUpdateSelectionCoords();
|
|
|
|
|
} else
|
|
|
|
|
if (currentAction==DoSelect) {
|
|
|
|
@ -630,26 +630,26 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
// We don't have to tqrepaint the hole selection rectangle
|
|
|
|
|
// only the borders have to be tqrepainted.
|
|
|
|
|
// only the borders have to be repainted.
|
|
|
|
|
// So we have to create 4 rectangles for every rectangle
|
|
|
|
|
// which represent the borders and then tqrepaint them.
|
|
|
|
|
|
|
|
|
|
TQRect lb,rb,tb,bb;
|
|
|
|
|
createBorderRectangles(translateToZoom(r),lb,rb,tb,bb);
|
|
|
|
|
tqrepaintContents(lb,false);
|
|
|
|
|
tqrepaintContents(rb,false);
|
|
|
|
|
tqrepaintContents(tb,false);
|
|
|
|
|
tqrepaintContents(bb,false);
|
|
|
|
|
repaintContents(lb,false);
|
|
|
|
|
repaintContents(rb,false);
|
|
|
|
|
repaintContents(tb,false);
|
|
|
|
|
repaintContents(bb,false);
|
|
|
|
|
|
|
|
|
|
createBorderRectangles(translateToZoom(oldSelectionRect),lb,rb,tb,bb);
|
|
|
|
|
tqrepaintContents(lb,false);
|
|
|
|
|
tqrepaintContents(rb,false);
|
|
|
|
|
tqrepaintContents(tb,false);
|
|
|
|
|
tqrepaintContents(bb,false);
|
|
|
|
|
repaintContents(lb,false);
|
|
|
|
|
repaintContents(rb,false);
|
|
|
|
|
repaintContents(tb,false);
|
|
|
|
|
repaintContents(bb,false);
|
|
|
|
|
|
|
|
|
|
// tqrepaintContents(oldSelectionRect | r,false);
|
|
|
|
|
// repaintContents(oldSelectionRect | r,false);
|
|
|
|
|
oldSelectionRect = r;
|
|
|
|
|
// tqrepaintContents(translateToZoom(r),false);
|
|
|
|
|
// repaintContents(translateToZoom(r),false);
|
|
|
|
|
//+ imageMapEditor->updateSelection();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -658,7 +658,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
|
|
|
|
|
// TQRect r2(drawStart.x(),drawStart.y(),drawOld.x()-drawStart.x(),drawOld.y()-drawStart.y());
|
|
|
|
|
// r2 = r2.normalize();
|
|
|
|
|
// r = translateToZoom(r | r2);
|
|
|
|
|
// tqrepaintContents(r,false);
|
|
|
|
|
// repaintContents(r,false);
|
|
|
|
|
} else
|
|
|
|
|
if ( currentAction==None )
|
|
|
|
|
{
|
|
|
|
@ -782,17 +782,17 @@ void DrawZone::cancelDrawing()
|
|
|
|
|
TQRect r = translateToZoom(currentArea->selectionRect());
|
|
|
|
|
delete currentArea;
|
|
|
|
|
currentArea = 0L;
|
|
|
|
|
tqrepaintContents(r,false);
|
|
|
|
|
repaintContents(r,false);
|
|
|
|
|
imageMapEditor->slotUpdateSelectionCoords();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DrawZone::tqrepaintArea(const Area & a) {
|
|
|
|
|
tqrepaintContents(translateToZoom(a.selectionRect()),false);
|
|
|
|
|
void DrawZone::repaintArea(const Area & a) {
|
|
|
|
|
repaintContents(translateToZoom(a.selectionRect()),false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DrawZone::tqrepaintRect(const TQRect & r) {
|
|
|
|
|
tqrepaintContents(translateToZoom(r),false);
|
|
|
|
|
void DrawZone::repaintRect(const TQRect & r) {
|
|
|
|
|
repaintContents(translateToZoom(r),false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DrawZone::drawContents(TQPainter* p,int clipx,int clipy,int clipw,int cliph)
|
|
|
|
|