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

fix
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
Nishi 2026-09-15 12:01:53 +09:00
commit 3922213beb
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/basic/periodic.c
View file

@ -269,7 +269,7 @@ int main() {
wclock = child(f); wclock = child(f);
f = frame("3D Bar Chart", -PaddingContent, -PaddingContent, MwChartClass, f = frame("3D Bar Chart", -PaddingContent, -PaddingContent, MwChartClass,
MwNtype, MwCHART_3D_BAR, MwNtype, MwCHART_BAR_3D,
NULL); NULL);
w = child(f); w = child(f);
MwChartAdd(w, -1, "A", -800, NULL); MwChartAdd(w, -1, "A", -800, NULL);
@ -282,7 +282,7 @@ int main() {
MwChartAdd(w, -1, "H", 800, NULL); MwChartAdd(w, -1, "H", 800, NULL);
f = frame("3D Pie Chart", -PaddingContent, -PaddingContent, MwChartClass, f = frame("3D Pie Chart", -PaddingContent, -PaddingContent, MwChartClass,
MwNtype, MwCHART_3D_PIE, MwNtype, MwCHART_PIE_3D,
NULL); NULL);
w = child(f); w = child(f);
MwChartAdd(w, -1, "A", 10, NULL); MwChartAdd(w, -1, "A", 10, NULL);

4
include/Mw/Constants.h
View file

@ -115,9 +115,9 @@ enum MwCLIPBOARD {
enum MwCHART { enum MwCHART {
MwCHART_BAR = 0, MwCHART_BAR = 0,
MwCHART_3D_BAR, MwCHART_BAR_3D,
MwCHART_PIE, MwCHART_PIE,
MwCHART_3D_PIE, MwCHART_PIE_3D,
MwCHART_LINE MwCHART_LINE
}; };

4
milsko.xml
View file

@ -239,9 +239,9 @@
</enumeration> </enumeration>
<enumeration name="MwCHART"> <enumeration name="MwCHART">
<integer name="MwCHART_BAR">0</integer> <integer name="MwCHART_BAR">0</integer>
<integer name="MwCHART_3D_BAR" /> <integer name="MwCHART_BAR_3D" />
<integer name="MwCHART_PIE" /> <integer name="MwCHART_PIE" />
<integer name="MwCHART_3D_PIE" /> <integer name="MwCHART_PIE_3D" />
</enumeration> </enumeration>
<enumeration name="MwMOUSE"> <enumeration name="MwMOUSE">
<integer name="MwMOUSE_LEFT">1</integer> <integer name="MwMOUSE_LEFT">1</integer>

20
src/widget/chart.c
View file

@ -44,7 +44,7 @@ static void draw_line(MwWidget handle, const char* text, double x, double y, dou
p[1].y = p[0].y; p[1].y = p[0].y;
MwDrawText(handle, NULL, p, text, MwALIGNMENT_END, color); MwDrawText(handle, NULL, p, text, MwALIGNMENT_END, color);
if(type == MwCHART_3D_BAR) { if(type == MwCHART_BAR_3D) {
MwPoint p2[2]; MwPoint p2[2];
p2[0] = p[0]; p2[0] = p[0];
@ -150,7 +150,7 @@ static void bar_chart(MwWidget handle, MwRect* _r, double vmin, double vmax, int
MwDrawRect(handle, &node, color); MwDrawRect(handle, &node, color);
if(type == MwCHART_3D_BAR) { if(type == MwCHART_BAR_3D) {
MwRect node2 = node; MwRect node2 = node;
MwFixRect(&node2); MwFixRect(&node2);
@ -195,7 +195,7 @@ static void bar_chart(MwWidget handle, MwRect* _r, double vmin, double vmax, int
if(!modern) { if(!modern) {
MwDrawRectLine(handle, &node, border); MwDrawRectLine(handle, &node, border);
if(type == MwCHART_3D_BAR) { if(type == MwCHART_BAR_3D) {
MwLLLine(handle->lowlevel, &persp_top[0], border); MwLLLine(handle->lowlevel, &persp_top[0], border);
MwLLLine(handle->lowlevel, &persp_top[1], border); MwLLLine(handle->lowlevel, &persp_top[1], border);
MwLLLine(handle->lowlevel, &persp_top[2], border); MwLLLine(handle->lowlevel, &persp_top[2], border);
@ -231,7 +231,7 @@ static void pie_chart(MwWidget handle, MwRect* _r, const char** colors, int n, M
int k; int k;
int type = MwGetInteger(handle, MwNtype); int type = MwGetInteger(handle, MwNtype);
int modern = MwGetInteger(handle, MwNmodernLook); int modern = MwGetInteger(handle, MwNmodernLook);
double vsquish = type == MwCHART_3D_PIE ? 2 : 1; double vsquish = type == MwCHART_PIE_3D ? 2 : 1;
int i; int i;
MwPoint p[2]; MwPoint p[2];
MwPoint p2[360 + 1 + 1]; MwPoint p2[360 + 1 + 1];
@ -266,7 +266,7 @@ static void pie_chart(MwWidget handle, MwRect* _r, const char** colors, int n, M
count = j + 1; count = j + 1;
if((k == 0 || k == 1) && type == MwCHART_3D_PIE) { if((k == 0 || k == 1) && type == MwCHART_PIE_3D) {
int j; int j;
MwPoint p3[360 + 1 + 1]; MwPoint p3[360 + 1 + 1];
int d = 0; int d = 0;
@ -296,7 +296,7 @@ static void pie_chart(MwWidget handle, MwRect* _r, const char** colors, int n, M
} }
if(k == 2) { if(k == 2) {
MwLLPolygon(handle->lowlevel, p2, count, type == MwCHART_3D_PIE ? colorl : color); MwLLPolygon(handle->lowlevel, p2, count, type == MwCHART_PIE_3D ? colorl : color);
} else if(k == 3) { } else if(k == 3) {
int j; int j;
@ -308,7 +308,7 @@ static void pie_chart(MwWidget handle, MwRect* _r, const char** colors, int n, M
p2[0].x += cos((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4; p2[0].x += cos((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4;
p2[0].y += sin((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4 / vsquish; p2[0].y += sin((cangle + angle / 2 - 90) / 180 * M_PI) * radius / 4 / vsquish;
handle->bgcolor = type == MwCHART_3D_PIE ? colorl : color; handle->bgcolor = type == MwCHART_PIE_3D ? colorl : color;
MwDrawText(handle, NULL, p2, c->entries[i].name, MwALIGNMENT_CENTER, border); MwDrawText(handle, NULL, p2, c->entries[i].name, MwALIGNMENT_CENTER, border);
} }
@ -320,7 +320,7 @@ static void pie_chart(MwWidget handle, MwRect* _r, const char** colors, int n, M
} }
} }
if(!modern && type == MwCHART_3D_PIE) { if(!modern && type == MwCHART_PIE_3D) {
p[0].x = r.width / 2 - radius / 2; p[0].x = r.width / 2 - radius / 2;
p[0].y = r.height / 2; p[0].y = r.height / 2;
p[1] = p[0]; p[1] = p[0];
@ -425,11 +425,11 @@ static void draw(MwWidget handle) {
switch(type) { switch(type) {
case MwCHART_BAR: case MwCHART_BAR:
case MwCHART_3D_BAR: case MwCHART_BAR_3D:
bar_chart(handle, &r, vmin, vmax, space, colors, n, border); bar_chart(handle, &r, vmin, vmax, space, colors, n, border);
break; break;
case MwCHART_PIE: case MwCHART_PIE:
case MwCHART_3D_PIE: case MwCHART_PIE_3D:
pie_chart(handle, &r, colors, n, border); pie_chart(handle, &r, colors, n, border);
break; break;
case MwCHART_LINE: case MwCHART_LINE:

2
src/widget/combobox.c
View file

@ -19,8 +19,6 @@ static int wcreate(MwWidget handle) {
} }
static void destroy(MwWidget handle) { static void destroy(MwWidget handle) {
MwComboBox cb = handle->internal;
MwComboBoxReset(handle); MwComboBoxReset(handle);
free(handle->internal); free(handle->internal);
} }