martin/aqdiagram
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

add "name" field to objects.

Browse Source
This commit is contained in:
Martin Preuss
2024-05-30 23:20:08 +02:00
parent 19ff6f5cdf
commit b8af82e0ad
10 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/aqdiagram/draw/w_drawable.c
View File

@@ -41,6 +41,7 @@ AQDG_OBJECT *AQDG_DrawableWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG
AQDG_OBJECT *object;
object=AQDG_Object_new();
AQDG_Object_SetName(object, "DrawableWidget");
if (parent)
AQDG_Object_Tree2_AddChild(parent, object);
@@ -257,7 +258,6 @@ AQDG_WIDGET_DRAWABLE_DRAW_FN AQDG_DrawableWidget_SetDrawFn(AQDG_OBJECT *object,
int AQDG_DrawableWidget_Draw(AQDG_OBJECT *object)
{
DBG_ERROR(NULL, "Draw %p", object);
if (object) {
AQDG_OBJECT_DRAWABLE *xo;
@@ -278,12 +278,14 @@ int AQDG_DrawableWidget_DrawBackground(AQDG_OBJECT *object)
xo=GWEN_INHERIT_GETDATA(AQDG_OBJECT, AQDG_OBJECT_DRAWABLE, object);
if (xo) {
#if 0
DBG_ERROR(NULL, "Drawing background with pen %d to %d/%d %d/%d",
xo->backgroundPenId,
AQDG_Object_GetAbsoluteX(object),
AQDG_Object_GetAbsoluteY(object),
AQDG_Object_GetWidth(object),
AQDG_Object_GetHeight(object));
#endif
AQDG_Draw_Context_DrawFilledRect(xo->drawContext,
xo->backgroundPenId,
AQDG_Object_GetAbsoluteX(object),

1
src/lib/aqdiagram/draw/w_hlayout.c
View File

@@ -24,6 +24,7 @@ AQDG_OBJECT *AQDG_HLayoutWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_
AQDG_OBJECT *object;
object=AQDG_HLayoutObject_new(parent, options);
AQDG_Object_SetName(object, "HLayoutWidget");
AQDG_DrawableWidget_Extend(object, drawContext);
return object;

1
src/lib/aqdiagram/draw/w_label.c
View File

@@ -42,6 +42,7 @@ AQDG_OBJECT *AQDG_LabelWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_DR
AQDG_OBJECT *object;
object=AQDG_DrawableWidget_new(parent, options, drawContext);
AQDG_Object_SetName(object, "LabelWidget");
AQDG_Object_SetOptions(object, options);
AQDG_Object_SetCalcContentDimsFn(object, _calcContentDims);
AQDG_DrawableWidget_SetDrawFn(object, _draw);

2
src/lib/aqdiagram/draw/w_mlayout.c
View File

@@ -24,6 +24,7 @@ AQDG_OBJECT *AQDG_MatrixLayoutWidgetByRows_new(AQDG_OBJECT *parent, uint32_t opt
AQDG_OBJECT *object;
object=AQDG_MatrixLayoutObjectByRows_new(parent, options, columns);
AQDG_Object_SetName(object, "MLayoutWidget");
AQDG_DrawableWidget_Extend(object, drawContext);
return object;
@@ -36,6 +37,7 @@ AQDG_OBJECT *AQDG_MatrixLayoutWidgetByColumns_new(AQDG_OBJECT *parent, uint32_t
AQDG_OBJECT *object;
object=AQDG_MatrixLayoutObjectByColumns_new(parent, options, rows);
AQDG_Object_SetName(object, "MLayoutWidget");
AQDG_DrawableWidget_Extend(object, drawContext);
return object;

1
src/lib/aqdiagram/draw/w_vlayout.c
View File

@@ -24,6 +24,7 @@ AQDG_OBJECT *AQDG_VLayoutWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG_
AQDG_OBJECT *object;
object=AQDG_VLayoutObject_new(parent, options);
AQDG_Object_SetName(object, "VLayoutWidget");
AQDG_DrawableWidget_Extend(object, drawContext);
return object;

13
src/lib/aqdiagram/libtest.c
View File

@@ -42,12 +42,6 @@ int test1(int argc, char **argv)
dc=AQDG_Draw_ContextCairo_Png_new("/tmp/test.png", 640, 480);
rootObject=AQDG_HLayoutWidget_new(NULL, AQDG_OBJECT_OPTIONS_STRETCHX | AQDG_OBJECT_OPTIONS_STRETCHY, dc);
AQDG_Object_SetBorderLeft(rootObject, 5);
AQDG_Object_SetBorderRight(rootObject, 5);
AQDG_Object_SetBorderTop(rootObject, 5);
AQDG_Object_SetBorderBottom(rootObject, 5);
AQDG_Object_SetHSpacing(rootObject, 4);
AQDG_Object_SetVSpacing(rootObject, 4);
AQDG_Object_SetWidth(rootObject, 640);
AQDG_Object_SetHeight(rootObject, 480);
rv=AQDG_Draw_Context_PenCreate(dc, COLOUR2, 1, AQDG_Dash_None);
@@ -55,7 +49,6 @@ int test1(int argc, char **argv)
DBG_ERROR(NULL, "Error creating pen (%d)", rv);
return 2;
}
DBG_ERROR(NULL, "Background pen: %d", rv);
AQDG_DrawableWidget_SetBackgroundPenId(rootObject, rv);
rv=AQDG_Draw_Context_PenCreate(dc, COLOUR1, 1, AQDG_Dash_None);
@@ -63,7 +56,6 @@ int test1(int argc, char **argv)
DBG_ERROR(NULL, "Error creating pen (%d)", rv);
return 2;
}
DBG_ERROR(NULL, "Foreground pen: %d", rv);
AQDG_DrawableWidget_SetForegroundPenId(rootObject, rv);
rv=AQDG_Draw_Context_FontCreate(dc, "", 16, AQDG_Slant_None, AQDG_Weight_None);
@@ -81,7 +73,6 @@ int test1(int argc, char **argv)
DBG_ERROR(NULL, "Error creating pen (%d)", rv);
return 2;
}
DBG_ERROR(NULL, "Background pen: %d", rv);
AQDG_DrawableWidget_SetBackgroundPenId(o, rv);
o=AQDG_LabelWidget_new(rootObject, 0, dc, "Second Label");
@@ -90,7 +81,6 @@ int test1(int argc, char **argv)
DBG_ERROR(NULL, "Error creating pen (%d)", rv);
return 2;
}
DBG_ERROR(NULL, "Background pen: %d", rv);
AQDG_DrawableWidget_SetBackgroundPenId(o, rv);
rv=AQDG_Draw_Context_FontCreate(dc, "", 24, AQDG_Slant_None, AQDG_Weight_None);
if (rv<0) {
@@ -99,18 +89,15 @@ int test1(int argc, char **argv)
}
AQDG_DrawableWidget_SetFontId(o, rv);
DBG_ERROR(NULL, "Layout");
rv=AQDG_Object_Layout(rootObject);
if (rv<0) {
DBG_ERROR(NULL, "Error on layout (%d)", rv);
return 2;
}
DBG_ERROR(NULL, "CalcAbs");
AQDG_Object_Tree2_CalculateAbsPositions(rootObject);
AQDG_Object_Dump(rootObject, 2);
DBG_ERROR(NULL, "Draw");
rv=AQDG_DrawableWidget_Draw(rootObject);
if (rv<0) {
DBG_ERROR(NULL, "Error drawing (%d)", rv);

6
src/lib/aqdiagram/placement/o_hlayout.c
View File

@@ -38,6 +38,7 @@ AQDG_OBJECT *AQDG_HLayoutObject_new(AQDG_OBJECT *parent, uint32_t options)
AQDG_OBJECT *object;
object=AQDG_Object_new();
AQDG_Object_SetName(object, "HLayoutObject");
AQDG_Object_SetOptions(object, options);
AQDG_Object_SetLayoutFn(object, _layout);
@@ -54,12 +55,10 @@ int _layout(AQDG_OBJECT *object)
{
int num;
DBG_ERROR(NULL, "Layout");
num=AQDG_LayoutObject_CountDirectChildren(object);
if (num) {
AQDG_PLACEMENT_LAYOUT_ELEMENT *elements;
DBG_ERROR(NULL, "Layout1");
AQDG_LayoutObject_SetChildrenWidths(object);
elements=AQDG_LayoutObject_Children2ElementsX(object, num);
if (elements) {
@@ -72,7 +71,6 @@ int _layout(AQDG_OBJECT *object)
free(elements);
}
DBG_ERROR(NULL, "Layout2");
AQDG_LayoutObject_SetChildrenHeights(object);
elements=AQDG_LayoutObject_Children2ElementsY(object, num);
if (elements) {
@@ -83,8 +81,6 @@ int _layout(AQDG_OBJECT *object)
AQDG_LayoutObject_ChildrenFromElementsY(object, elements, num);
free(elements);
}
DBG_ERROR(NULL, "Layout3");
}
return 0;

1
src/lib/aqdiagram/placement/o_mlayout.c
View File

@@ -90,6 +90,7 @@ AQDG_OBJECT *_matrixLayoutObject_new(AQDG_OBJECT *parent, uint32_t options, int
AQDG_OBJECT_MLAYOUT *xo;
object=AQDG_Object_new();
AQDG_Object_SetName(object, "MLayoutObject");
GWEN_NEW_OBJECT(AQDG_OBJECT_MLAYOUT, xo);
GWEN_INHERIT_SETDATA(AQDG_OBJECT, AQDG_OBJECT_MLAYOUT, object, xo, _freeData);

1
src/lib/aqdiagram/placement/o_vlayout.c
View File

@@ -36,6 +36,7 @@ AQDG_OBJECT *AQDG_VLayoutObject_new(AQDG_OBJECT *parent, uint32_t options)
AQDG_OBJECT *object;
object=AQDG_Object_new();
AQDG_Object_SetName(object, "VLayoutObject");
AQDG_Object_SetOptions(object, options);
AQDG_Object_SetLayoutFn(object, _layout);

12
src/lib/aqdiagram/placement/object.xml
View File

@@ -167,7 +167,8 @@
\n
for(i=0; i&lt;indent; i++) \n
fprintf(stderr, " "); \n
fprintf(stderr, "- Object:\\n"); \n
fprintf(stderr, "- %s:\\n", \n
(object-&gt;name)?(object-&gt;name):"&lt;no name&gt;"); \n
for(i=0; i&lt;indent+2; i++) \n
fprintf(stderr, " "); \n
fprintf(stderr, "absX=%d, absY=%d, relX=%d, relY=%d\\n", \n
@@ -247,6 +248,15 @@
<access>public</access>
</member>
<member name="name" type="char_ptr" maxlen="64">
<default>0</default>
<preset>0</preset>
<access>public</access>
<flags>none</flags>
<descr>
</descr>
</member>
<member name="absoluteX" type="int" maxlen="8" >
<default>0</default>
<preset>0</preset>