pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 6 Pull requests 1 Projects Releases 7 Packages Wiki Activity Actions

3d pie
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Nishi 2026-09-14 06:59:15 +09:00
commit d2cbe88cb3
4 changed files with 88 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/basic/periodic.c
View file

@ -268,9 +268,8 @@ int main() {
f = frame("Clock", -PaddingContent, -PaddingContent, MwClockClass, NULL); f = frame("Clock", -PaddingContent, -PaddingContent, MwClockClass, NULL);
wclock = child(f); wclock = child(f);
f = frame("Chart", -PaddingContent, -PaddingContent, MwChartClass, f = frame("3D Bar Chart", -PaddingContent, -PaddingContent, MwChartClass,
MwNtype, MwCHART_PIE, MwNtype, MwCHART_3D_BAR,
MwNcolumnSpan, 2,
NULL); NULL);
w = child(f); w = child(f);
MwChartAdd(w, -1, "A", -800, NULL); MwChartAdd(w, -1, "A", -800, NULL);
@ -282,6 +281,19 @@ int main() {
MwChartAdd(w, -1, "G", 400, NULL); MwChartAdd(w, -1, "G", 400, NULL);
MwChartAdd(w, -1, "H", 800, NULL); MwChartAdd(w, -1, "H", 800, NULL);
f = frame("3D Pie Chart", -PaddingContent, -PaddingContent, MwChartClass,
MwNtype, MwCHART_3D_PIE,
NULL);
w = child(f);
MwChartAdd(w, -1, "A", 10, NULL);
MwChartAdd(w, -1, "B", 20, NULL);
MwChartAdd(w, -1, "C", 30, NULL);
MwChartAdd(w, -1, "D", 10, NULL);
MwChartAdd(w, -1, "E", 20, NULL);
MwChartAdd(w, -1, "F", 30, NULL);
MwChartAdd(w, -1, "G", 10, NULL);
MwChartAdd(w, -1, "H", 20, NULL);
f = frame("ComboBox", -PaddingContent, 24, MwComboBoxClass, NULL); f = frame("ComboBox", -PaddingContent, 24, MwComboBoxClass, NULL);
w = child(f); w = child(f);
MwComboBoxAdd(w, -1, "Hello!"); MwComboBoxAdd(w, -1, "Hello!");

3
include/Mw/Constants.h
View file

@ -116,7 +116,8 @@ enum MwCLIPBOARD {
enum MwCHART { enum MwCHART {
MwCHART_BAR = 0, MwCHART_BAR = 0,
MwCHART_3D_BAR, MwCHART_3D_BAR,
MwCHART_PIE MwCHART_PIE,
MwCHART_3D_PIE
}; };
enum MwMOUSE { enum MwMOUSE {

1
milsko.xml
View file

@ -234,6 +234,7 @@
<integer name="MwCHART_BAR">0</integer> <integer name="MwCHART_BAR">0</integer>
<integer name="MwCHART_3D_BAR" /> <integer name="MwCHART_3D_BAR" />
<integer name="MwCHART_PIE" /> <integer name="MwCHART_PIE" />
<integer name="MwCHART_3D_PIE" />
</enumeration> </enumeration>
<enumeration name="MwMOUSE"> <enumeration name="MwMOUSE">
<integer name="MwMOUSE_LEFT">1</integer> <integer name="MwMOUSE_LEFT">1</integer>

94
src/widget/chart.c
View file

@ -13,7 +13,7 @@ static const char* palette0[] = {
NULL}; NULL};
#define NUMFMT "%.2f" #define NUMFMT "%.2f"
#define PIE_DIV 4 #define PIE_DIV 10
static int wcreate(MwWidget handle) { static int wcreate(MwWidget handle) {
MwChart c = malloc(sizeof(*c)); MwChart c = malloc(sizeof(*c));
@ -63,8 +63,9 @@ static void draw_line(MwWidget handle, const char* text, double x, double y, dou
} }
static void draw(MwWidget handle) { static void draw(MwWidget handle) {
MwLLColor base = MwParseColor(handle, MwGetText(handle, MwNbackground)); int ColorDiff = MwGetColorDifference(handle);
MwLLColor border = MwParseColor(handle, MwGetText(handle, MwNforeground)); MwLLColor base = MwParseColor(handle, MwGetText(handle, MwNbackground));
MwLLColor border = MwParseColor(handle, MwGetText(handle, MwNforeground));
MwRect r; MwRect r;
MwChart c = handle->internal; MwChart c = handle->internal;
int i; int i;
@ -77,7 +78,8 @@ static void draw(MwWidget handle) {
double vmax = -0xffffffff; double vmax = -0xffffffff;
int space = MwTextHeight(handle, NULL, "M"); int space = MwTextHeight(handle, NULL, "M");
MwPoint p[2]; MwPoint p[2];
int type = MwGetInteger(handle, MwNtype); int type = MwGetInteger(handle, MwNtype);
int modern = MwGetInteger(handle, MwNmodernLook);
for(n = 0; colors[n] != NULL; n++); for(n = 0; colors[n] != NULL; n++);
@ -157,10 +159,9 @@ static void draw(MwWidget handle) {
node.width = width; node.width = width;
for(i = 0; i < arrlen(c->entries); i++) { for(i = 0; i < arrlen(c->entries); i++) {
int ColorDiff = MwGetColorDifference(handle); MwLLColor color = MwParseColor(handle, c->entries[i].color == NULL ? colors[i % n] : c->entries[i].color);
MwLLColor color = MwParseColor(handle, c->entries[i].color == NULL ? colors[i % n] : c->entries[i].color); MwLLColor colorl = MwLightenColor(handle, color, ColorDiff, ColorDiff, ColorDiff);
MwLLColor colorl = MwLightenColor(handle, color, ColorDiff, ColorDiff, ColorDiff); MwLLColor colord = MwLightenColor(handle, color, -ColorDiff, -ColorDiff, -ColorDiff);
MwLLColor colord = MwLightenColor(handle, color, -ColorDiff, -ColorDiff, -ColorDiff);
MwPoint persp_top[5]; MwPoint persp_top[5];
MwPoint persp_right[5]; MwPoint persp_right[5];
@ -213,7 +214,7 @@ static void draw(MwWidget handle) {
MwLLPolygon(handle->lowlevel, persp_right, 4, colord); MwLLPolygon(handle->lowlevel, persp_right, 4, colord);
} }
if(!MwGetInteger(handle, MwNmodernLook)) { if(!modern) {
MwDrawRectLine(handle, &node, border); MwDrawRectLine(handle, &node, border);
if(type == MwCHART_3D_BAR) { if(type == MwCHART_3D_BAR) {
@ -240,28 +241,32 @@ static void draw(MwWidget handle) {
MwLLFreeColor(colorl); MwLLFreeColor(colorl);
MwLLFreeColor(color); MwLLFreeColor(color);
} }
} else if(type == MwCHART_PIE) { } else if(type == MwCHART_PIE || type == MwCHART_3D_PIE) {
double sum = 0; double sum = 0;
int radius = r.width < r.height ? r.width : r.height; int radius = r.width < r.height ? r.width : r.height;
double cangle = 0; double cangle = 0;
int k; int k;
double vsquish = type == MwCHART_3D_PIE ? 2 : 1;
MwPoint p[360 + 1 + 1];
for(i = 0; i < arrlen(c->entries); i++) { for(i = 0; i < arrlen(c->entries); i++) {
if(c->entries[i].value > 0) sum += c->entries[i].value; if(c->entries[i].value > 0) sum += c->entries[i].value;
} }
for(k = 0; k < 2; k++) { for(k = 0; k < 4; k++) {
for(i = 0; i < arrlen(c->entries); i++) { for(i = 0; i < arrlen(c->entries); i++) {
MwLLColor color; MwLLColor color;
MwLLColor colorl;
double angle = c->entries[i].value / sum * 360; double angle = c->entries[i].value / sum * 360;
MwPoint p[360 + 1 + 1]; int div = angle / PIE_DIV;
int div = angle / PIE_DIV;
int j; int j;
int count; int count;
if(c->entries[i].value <= 0) continue; if(c->entries[i].value <= 0) continue;
if((k == 0 || k == 1) && type == MwCHART_PIE) continue;
color = MwParseColor(handle, c->entries[i].color == NULL ? colors[i % n] : c->entries[i].color); color = MwParseColor(handle, c->entries[i].color == NULL ? colors[i % n] : c->entries[i].color);
colorl = MwLightenColor(handle, color, ColorDiff, ColorDiff, ColorDiff);
p[0].x = r.width / 2; p[0].x = r.width / 2;
p[0].y = r.height / 2; p[0].y = r.height / 2;
@ -269,31 +274,72 @@ static void draw(MwWidget handle) {
double a = angle / div * j; double a = angle / div * j;
p[div - j + 1].x = p[0].x + cos((cangle + a - 90) / 180 * M_PI) * radius / 2; p[div - j + 1].x = p[0].x + cos((cangle + a - 90) / 180 * M_PI) * radius / 2;
p[div - j + 1].y = p[0].y + sin((cangle + a - 90) / 180 * M_PI) * radius / 2; p[div - j + 1].y = p[0].y + sin((cangle + a - 90) / 180 * M_PI) * radius / 2 / vsquish;
} }
count = j + 1; count = j + 1;
if(k == 0) { if((k == 0 || k == 1) && type == MwCHART_3D_PIE) {
MwLLPolygon(handle->lowlevel, p, count, color); int j;
} else { MwPoint p2[360 + 1 + 1];
int d = 0;
for(d = 1; d <= 2; d++) {
for(j = 0; j < count - 1; j++) {
p2[3 + j] = p[1 + j];
p2[3 + j].y += radius / 8 / d;
}
p2[0] = p[count - 1];
p2[1] = p[0];
p2[2] = p[1];
if(k == 0) {
MwLLPolygon(handle->lowlevel, p2, count + 2, color);
} else if(d == 1 && k == 1) {
for(j = 3; j < count + 1; j++) {
if(!modern) MwLLLine(handle->lowlevel, &p2[j], border);
}
p[0] = p[1];
p[0].y += radius / 8;
if(!modern) MwLLLine(handle->lowlevel, p, border);
}
}
}
if(k == 2) {
MwLLPolygon(handle->lowlevel, p, count, type == MwCHART_3D_PIE ? colorl : color);
} else if(k == 3) {
int j; int j;
p[count] = p[0]; p[count] = p[0];
for(j = 0; j < count; j++) { for(j = 0; j < count; j++) {
MwLLLine(handle->lowlevel, &p[j], border); if(!modern) MwLLLine(handle->lowlevel, &p[j], border);
} }
p[0].x += cos((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4; p[0].x += cos((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4;
p[0].y += sin((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4; p[0].y += sin((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4 / vsquish;
MwDrawText(handle, NULL, p, c->entries[i].name, MwALIGNMENT_CENTER, border); MwDrawText(handle, NULL, p, c->entries[i].name, MwALIGNMENT_CENTER, border);
} }
cangle += angle; cangle += angle;
MwLLFreeColor(colorl);
MwLLFreeColor(color); MwLLFreeColor(color);
} }
} }
if(!modern && type == MwCHART_3D_PIE) {
p[0].x = r.width / 2 - radius / 2;
p[0].y = r.height / 2;
p[1] = p[0];
p[1].y += radius / 8;
MwLLLine(handle->lowlevel, p, border);
p[0].x = p[1].x = r.width / 2 + radius / 2;
MwLLLine(handle->lowlevel, p, border);
}
} }
MwLLFreeColor(border); MwLLFreeColor(border);