marko10_000
/
DrawOfPages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix create points and worker thread

master
Marko Semet 2018-04-24 03:32:31 +02:00
parent 9c407e304c
commit a9b3fba166
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/drawofpages/gui/drawArea.d
View File

@ -126,7 +126,7 @@ private final class Grid
private pure void calcRelZero()
{
this.relZero = Point2D([this.x, this.y]) * this.scale;
this.relZero = Point2D(this.x, this.y) * this.scale;
}
public this(float scale)
@ -134,7 +134,7 @@ private final class Grid
this.scale = 1;
this.x = -256;
this.y = -256;
this.rel = Point2D([this.x, this.y]);
this.rel = Point2D(this.x, this.y);
this.width = 0;
this.height = 0;
this.dpiScale = scale;
@ -164,7 +164,7 @@ private final class Grid
}
else
{
tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale, this.dpiScale);
tmp[x] = new DrawPart(Point2D(x, y) * (512 / this.scale) + this.rel, this.scale, this.dpiScale);
interatcion.redraw(tmp[x].box, new PardDraw(tmp[x]));
}
}
@ -176,7 +176,7 @@ private final class Grid
DrawPart[] tmp = new DrawPart[partsX];
for(ulong x = 0; x < partsX; x++)
{
tmp[x] = new DrawPart(Point2D([x, y]) * (512 / this.scale) + this.rel, this.scale, this.dpiScale);
tmp[x] = new DrawPart(Point2D(x, y) * (512 / this.scale) + this.rel, this.scale, this.dpiScale);
interatcion.redraw(tmp[x].box, new PardDraw(tmp[x]));
}
newParts[y] = tmp;
@ -325,7 +325,7 @@ public class DrawElement : DrawingArea
_pointerData tmp = _pointerData(e.getDevice());
synchronized
{
this.interatcion.down(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID);
this.interatcion.down(Point2D(geb.x, geb.y), tmp.ctype, tmp.pressure, tmp.deviceID);
}
this.hasDown = true;
return true;
@ -340,7 +340,7 @@ public class DrawElement : DrawingArea
_pointerData tmp = _pointerData(e.getDevice());
synchronized
{
this.interatcion.contin(Point2D([motion.x, motion.y]), tmp.ctype, tmp.pressure, tmp.deviceID);
this.interatcion.contin(Point2D(motion.x, motion.y), tmp.ctype, tmp.pressure, tmp.deviceID);
}
return true;
});
@ -355,7 +355,7 @@ public class DrawElement : DrawingArea
this.hasDown = false;
synchronized
{
this.interatcion.up(Point2D([geb.x, geb.y]), tmp.ctype, tmp.pressure, tmp.deviceID);
this.interatcion.up(Point2D(geb.x, geb.y), tmp.ctype, tmp.pressure, tmp.deviceID);
}
return true;
});

4
source/drawofpages/tools/interaction.d
View File

@ -61,7 +61,7 @@ public class DrawThread : Thread
}
private Queue!(Interaction, true) queue;
public bool stop;
public shared bool stop;
private void run()
{
@ -117,7 +117,6 @@ public class DrawThread : Thread
this.queue.insert(interact);
}
pragma(inline, true)
public void add(string TYPE)(Document doc, Draw draw, Tool tool, CursorInteraction ci)
{
Interaction tmp;
@ -144,7 +143,6 @@ public class DrawThread : Thread
this.add(tmp);
}
pragma(inline, true)
public void add(Document doc, Draw draw, RedrawInteraction redraw)
{
Interaction tmp;