Changeset 837

Timestamp:

08/23/07 22:54:09 (15 months ago)

Author:

volker

Message:

logging info clarified

Files:

• branches/volker_dev/widget.c (modified) (3 diffs)

branches/volker_dev/widget.c

@@ -181 +181 @@
     if (Class->type != type) {
   error("widget '%s': class '%s' not applicable", name, class);
+  switch (Class->type) {
+  case WIDGET_TYPE_RC:
+      error("  Widgetclass %s is placed by Row/Column", class);
+      break;
+  case WIDGET_TYPE_XY:
+      error("  Widgetclass %s is placed by X/Y", class);
+      break;
+  case WIDGET_TYPE_GPO:
+  case WIDGET_TYPE_TIMER:
+  case WIDGET_TYPE_KEYPAD:
+  default:
+      error("  Widgetclass %s has unknown type %d", class, Class->type);
+  }
   free(class);
   return -1;
@@ -201 +214 @@
     /* another sanity check */
     if (nWidgets >= MAX_WIDGETS) {
-  error("internal error: widget buffer full! Tried to allocate %d widgets (max: %s)", nWidgets, MAX_WIDGETS);
+  error("internal error: widget buffer full! Tried to allocate %d widgets (max: %d)", nWidgets, MAX_WIDGETS);
   return -1;
     }
@@ -228 +241 @@
     Widget->col = col;
 
-    info(" widget '%s': Class '%s', Parent '%s', Layer %d, Row %d, Col %d",
-         name, (NULL == Class) ? "<none>" : Class->name, (NULL == Parent) ? "<root>" : Parent->name, layer, row, col);
-    
+    info(" widget '%s': Class '%s', Parent '%s', Layer %d, %s %d, %s %d",
+   name, (NULL == Class) ? "<none>" : Class->name,
+   (NULL == Parent) ? "<root>" : Parent->name,
+   layer, (WIDGET_TYPE_XY == Class->type) ? "Y" : "Row", row, (WIDGET_TYPE_XY == Class->type) ? "X" : "Col", col);
+
     if (Class->init != NULL) {
   Class->init(Widget);