github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

RichTxt: Diagram Cylinder

Browse source
This commit is contained in:
Mirek Fidler 2025-07-25 08:55:34 +02:00
parent e067db4542
commit 3c2b20fd03
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/RichText/Diagram.h
View file

@ -25,6 +25,7 @@ struct DiagramItem : Point2 {
SHAPE_DIAMOND, SHAPE_DIAMOND,
SHAPE_OVAL, SHAPE_OVAL,
SHAPE_PARALLELOGRAM, SHAPE_PARALLELOGRAM,
SHAPE_CYLINDER,
SHAPE_TRIANGLE, SHAPE_TRIANGLE,
SHAPE_ITRIANGLE, SHAPE_ITRIANGLE,
SHAPE_ARROWLEFT, SHAPE_ARROWLEFT,

34
uppsrc/RichText/DiagramShape.cpp
View file

@ -4,6 +4,7 @@ namespace Upp {
Index<String> DiagramItem::Shape = { "line", "rect", "round_rect", Index<String> DiagramItem::Shape = { "line", "rect", "round_rect",
"ellipse", "diamond", "oval", "parallelogram", "ellipse", "diamond", "oval", "parallelogram",
"cylinder",
"triangle1", "triangle2", "triangle1", "triangle2",
"arrow_left", "arrow_right", "arrow_horz", "arrow_left", "arrow_right", "arrow_horz",
"arrow_down", "arrow_up", "arrow_vert", "arrow_down", "arrow_up", "arrow_vert",
@ -12,7 +13,7 @@ Index<String> DiagramItem::Shape = { "line", "rect", "round_rect",
Vector<Pointf> DiagramItem::GetConnections() const Vector<Pointf> DiagramItem::GetConnections() const
{ {
Vector<Pointf> p; Vector<Pointf> p;
if(shape > SHAPE_PARALLELOGRAM) if(shape > SHAPE_CYLINDER)
return p; return p;
if(IsLine()) { if(IsLine()) {
p << pt[0] << pt[1]; p << pt[0] << pt[1];
@ -144,13 +145,17 @@ void DiagramItem::Paint(Painter& w, dword style, const Index<Pointf> *conn) cons
Pointf c = r.CenterPoint(); Pointf c = r.CenterPoint();
double sz = min(r.Width(), r.Height()); double sz = min(r.Width(), r.Height());
double arrow_width = min(r.Width() / 3, r.Height() / 2); double arrow_width = min(r.Width() / 3, r.Height() / 2);
double h4 = r.Height() / 4; double h = r.GetHeight();
double h4 = h / 4;
double th4 = r.top + h4; double th4 = r.top + h4;
double bh4 = r.bottom - h4; double bh4 = r.bottom - h4;
double arrow_height = min(r.Height() / 3, r.Width() / 2); double arrow_height = min(r.Height() / 3, r.Width() / 2);
double w4 = r.Width() / 4; double w1 = r.GetWidth();
double w2 = w1 / 2;
double w4 = w1 / 4;
double lw4 = r.left + w4; double lw4 = r.left + w4;
double rw4 = r.right - w4; double rw4 = r.right - w4;
double hc, thc, bhc; // cylinder
switch(shape) { switch(shape) {
case SHAPE_ROUNDRECT: case SHAPE_ROUNDRECT:
w.RoundedRectangle(r.left, r.top, r.GetWidth(), r.GetHeight(), sz > 30 ? 8 : sz > 15 ? 4 : 2); w.RoundedRectangle(r.left, r.top, r.GetWidth(), r.GetHeight(), sz > 30 ? 8 : sz > 15 ? 4 : 2);
@ -175,6 +180,17 @@ void DiagramItem::Paint(Painter& w, dword style, const Index<Pointf> *conn) cons
w.Move(r.left + r.Width() / 6, r.top).Line(r.right, r.top) w.Move(r.left + r.Width() / 6, r.top).Line(r.right, r.top)
.Line(r.right - r.Width() / 6, r.bottom).Line(r.left, r.bottom).Close(); .Line(r.right - r.Width() / 6, r.bottom).Line(r.left, r.bottom).Close();
break; break;
case SHAPE_CYLINDER:
text_rect.top += int(w1 / 4);
hc = h / 6;
thc = r.top + hc;
bhc = r.bottom - hc;
w.Move(r.left, thc)
.Arc(r.left + w2, thc, w2, hc, M_PI, M_PI)
.Line(r.right, bhc)
.Arc(r.left + w2, bhc, w2, hc, 0, M_PI)
.Line(r.left, bhc);
break;
case SHAPE_TRIANGLE: { case SHAPE_TRIANGLE: {
text_rect.left += int(r.Width() / 4); text_rect.left += int(r.Width() / 4);
text_rect.right -= int(r.Width() / 4); text_rect.right -= int(r.Width() / 4);
@ -194,7 +210,8 @@ void DiagramItem::Paint(Painter& w, dword style, const Index<Pointf> *conn) cons
.Line(r.left, r.top) .Line(r.left, r.top)
.Close(); .Close();
} }
break; case SHAPE_ARROWLEFT: { break;
case SHAPE_ARROWLEFT: {
double a = r.left + arrow_width; double a = r.left + arrow_width;
text_rect.left += int(arrow_width / 3); text_rect.left += int(arrow_width / 3);
w.Move(r.left, r.top + r.Height() / 2) w.Move(r.left, r.top + r.Height() / 2)
@ -296,6 +313,15 @@ void DiagramItem::Paint(Painter& w, dword style, const Index<Pointf> *conn) cons
w.Fill(paper); w.Fill(paper);
Stroke(); Stroke();
switch(shape) {
case SHAPE_CYLINDER:
w.Move(r.left, thc)
.Arc(r.left + w2, thc, w2, hc, M_PI, -M_PI);
DoDash();
Stroke();
break;
}
int txt_cy = txt.GetHeight(pi.zoom, text_rect.GetWidth()); int txt_cy = txt.GetHeight(pi.zoom, text_rect.GetWidth());
txt.Paint(w, text_rect.left, text_rect.top + (text_rect.GetHeight() - txt_cy) / 2, text_rect.GetWidth(), pi); txt.Paint(w, text_rect.left, text_rect.top + (text_rect.GetHeight() - txt_cy) / 2, text_rect.GetWidth(), pi);

4
upptst/Diagram/main.cpp
View file

@ -4,11 +4,11 @@ using namespace Upp;
GUI_APP_MAIN GUI_APP_MAIN
{ {
int cp; /* int cp;
Font fnt; Font fnt;
SelectUnicodeSymbol(cp, fnt); SelectUnicodeSymbol(cp, fnt);
return; return;
*/
TopWindow app; TopWindow app;
app.Sizeable().Zoomable(); app.Sizeable().Zoomable();