提交: d8ba6da4da8301cc6fa4a45f25c14e234f3c6de6 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修订版: d8ba6da4da8301cc6fa4a45f25c14e234f3c6de6 (tree)
• 时间: 2004-04-30 17:15:38
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Grid align, and less undo

更改概述

• modified: ChangeLog
• modified: app/render_gdk.c
• modified: app/undo.c
• modified: lib/diagdkrenderer.c
• modified: lib/diagdkrenderer.h

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/undo.c: Undoing broken undo stuff for diagram properties and
+	page setup.  Shouldn't be mixed into undo at all.
+
+	* app/render_gdk.c (draw_pixel_line): Use the dash-setting
+	function to avoid in particular the grid crawling.
+
+	* lib/diagdkrenderer.[ch] (dia_gdk_renderer_set_dashes): Function
+	to allow aligning dashes, so they don't crawl.
+
 2004-04-28  Lars Clausen  <[e-mail]>
 
 	* app/Makefile.am: New files diacanvas.[ch]

--- a/app/render_gdk.c
+++ b/app/render_gdk.c
@@ -178,6 +178,8 @@ draw_pixel_line(DiaRenderer *object,
   DiaGdkRenderer *renderer = DIA_GDK_RENDERER (object);
   GdkGC *gc = renderer->gc;
   GdkColor gdkcolor;
+
+  dia_gdk_renderer_set_dashes(renderer, x1+y1);
   
   color_convert(color, &gdkcolor);
   gdk_gc_set_foreground(gc, &gdkcolor);
@@ -195,6 +197,8 @@ draw_pixel_rect(DiaRenderer *object,
   GdkGC *gc = renderer->gc;
   GdkColor gdkcolor;
     
+  dia_gdk_renderer_set_dashes(renderer, x+y);
+
   color_convert(color, &gdkcolor);
   gdk_gc_set_foreground(gc, &gdkcolor);
 

--- a/app/undo.c
+++ b/app/undo.c
@@ -1183,244 +1183,3 @@ undo_parenting(Diagram *dia, Object* parentobj, Object* childobj,
   undo_push_change(dia->undo, change);
   return change;
 }
-
-/* ******* DIAGRAM PROPERTIES ******** */
-
-typedef enum { DYNAMIC_GRID, SPACING, BG_COLOR, GRID_COLOR, PAGE_COLOR,
-	       PAPER_SIZE, PORTRAIT, MARGINS, SCALING } DiagramChangeType;
-typedef union {
-    /* Diagram properties dialog */
-    gboolean dynamic_grid;
-    struct { real space_x, space_y; int visible_x, visible_y; } spacing;
-    Color bg_color, grid_color, page_color;
-    /* Page setup dialog */
-    gchar *paper_size;
-    gboolean portrait;
-    struct { real top, bottom, left, right; } margins;
-    struct { real scale; int fit_x, fit_y; } scaling;    
-} DiagramChangeData;
-
-typedef struct {
-  Change change;
-  DiagramChangeType t;
-  DiagramChangeData change_from, change_to;
-} DiagramChange;
-
-static void
-diagram_update_properties(Diagram *dia)
-{
-  /* If diagram properties window open */
-  /*diagram_properties_retrieve(dia);*/
-  diagram_set_modified(dia, TRUE);
-  diagram_add_update_all(dia);
-  diagram_flush(dia);
-}
-
-static void
-diagram_update_pagesetup(Diagram *dia) 
-{
-  /* update diagram -- this is needed to reposition page boundaries */
-  diagram_set_modified(dia, TRUE);
-  diagram_add_update_all(dia);
-  diagram_flush(dia);
-}
-
-static void
-diagram_change_apply_or_revert(Diagram *dia, DiagramChangeType t,
-			       DiagramChangeData *to)
-{
-  switch (t) {
-  case DYNAMIC_GRID:
-    dia->data->grid.dynamic = to->dynamic_grid;
-    diagram_update_properties(dia);
-    break;
-  case SPACING:
-    dia->data->grid.width_x = to->spacing.space_x;
-    dia->data->grid.width_y = to->spacing.space_y;
-    dia->data->grid.visible_x = to->spacing.visible_x;
-    dia->data->grid.visible_y = to->spacing.visible_y;
-    diagram_update_properties(dia);
-    break;
-  case BG_COLOR:
-    dia->data->bg_color = to->bg_color;
-    diagram_update_properties(dia);
-    break;
-  case GRID_COLOR:
-    dia->data->grid.colour = to->grid_color;
-    diagram_update_properties(dia);
-    break;
-  case PAGE_COLOR:
-    dia->data->pagebreak_color = to->page_color;
-    diagram_update_properties(dia);
-    break;
-  case PAPER_SIZE:
-    g_free(dia->data->paper.name);
-    dia->data->paper.name = g_strdup(to->paper_size);
-    diagram_update_pagesetup(dia);
-    break;
-  case PORTRAIT:
-    dia->data->paper.is_portrait = to->portrait;
-    diagram_update_pagesetup(dia);
-    break;
-  case MARGINS:
-    dia->data->paper.tmargin = to->margins.top;
-    dia->data->paper.bmargin = to->margins.bottom;
-    dia->data->paper.lmargin = to->margins.left;
-    dia->data->paper.rmargin = to->margins.right;
-    diagram_update_pagesetup(dia);
-    break;
-  case SCALING:
-    if (to->scaling.scale != 0) {
-      dia->data->paper.fitto = TRUE;
-      dia->data->paper.scaling = to->scaling.scale;
-    } else {
-      dia->data->paper.fitto = FALSE;
-      dia->data->paper.fitwidth = to->scaling.fit_x;
-      dia->data->paper.fitheight = to->scaling.fit_y;
-    }
-    diagram_update_pagesetup(dia);
-    break;
-  }  
-}
-
-static void
-diagram_change_apply(Change *change, Diagram *dia) 
-{
-  DiagramChange *diachange = (DiagramChange *)change;
-  diagram_change_apply_or_revert(dia, diachange->t, &diachange->change_to);
-}
-
-static void
-diagram_change_revert(Change *change, Diagram *dia) 
-{
-  DiagramChange *diachange = (DiagramChange *)change;
-  diagram_change_apply_or_revert(dia, diachange->t, &diachange->change_from);
-}
-
-static void
-diagram_change_free(Change *change)
-{
-  DiagramChange *diachange = (DiagramChange *)change;
-  if (diachange->t == PAPER_SIZE) {
-    g_free(diachange->change_to.paper_size);
-    g_free(diachange->change_from.paper_size);
-  }
-}
-
-Change *
-undo_diagram(Diagram *dia, DiagramChangeType t,
-	     DiagramChangeData from, DiagramChangeData to)
-{
-  DiagramChange *change = g_new0(DiagramChange, 1);
-  change->t = t;
-  change->change_from = from;
-  change->change_to = to;
-
-  return (Change*)change;
-}
-
-Change *
-undo_diagram_grid(Diagram *dia, gboolean on)
-{
-  DiagramChangeData from, to;
-  from.dynamic_grid = dia->data->grid.dynamic;
-  to.dynamic_grid = on;
-  return undo_diagram(dia, DYNAMIC_GRID, from, to);
-}
-
-Change *
-undo_diagram_spacing(Diagram *dia, real space_x, real space_y, 
-		     int visible_x, int visible_y)
-{
-  DiagramChangeData from, to;
-  from.spacing.space_x = dia->data->grid.width_x;
-  to.spacing.space_x = space_x;
-  from.spacing.space_y = dia->data->grid.width_y;
-  to.spacing.space_y = space_y;
-  from.spacing.visible_x = dia->data->grid.visible_x;
-  to.spacing.visible_x = visible_x;
-  from.spacing.visible_x = dia->data->grid.visible_y;
-  to.spacing.visible_x = visible_x;
-  return undo_diagram(dia, DYNAMIC_GRID, from, to);
-}
-
-Change *
-undo_diagram_bg_color(Diagram *dia, Color *bg_color)
-{
-  DiagramChangeData from, to;
-  from.bg_color = dia->data->bg_color;
-  to.bg_color = *bg_color;
-  return undo_diagram(dia, BG_COLOR, from, to);
-}
-
-Change *
-undo_diagram_grid_color(Diagram *dia, Color *grid_color)
-{
-  DiagramChangeData from, to;
-  from.grid_color = dia->data->grid.colour;
-  to.grid_color = *grid_color;
-  return undo_diagram(dia, GRID_COLOR, from, to);
-}
-
-Change *
-undo_diagram_page_color(Diagram *dia, Color *page_color)
-{
-  DiagramChangeData from, to;
-  from.page_color = dia->data->pagebreak_color;
-  to.page_color = *page_color;
-  return undo_diagram(dia, PAGE_COLOR, from, to);
-}
-
-Change *
-undo_diagram_paper_size(Diagram *dia, gchar *size)
-{
-  DiagramChangeData from, to;
-  from.paper_size = g_strdup(dia->data->paper.name);
-  to.paper_size = g_strdup(size);
-  return undo_diagram(dia, PAPER_SIZE, from, to);
-}
-
-Change *
-undo_diagram_portrait(Diagram *dia, gboolean portrait)
-{
-  DiagramChangeData from, to;
-  from.portrait = dia->data->paper.is_portrait;
-  to.portrait = portrait;
-  return undo_diagram(dia, PORTRAIT, from, to);
-}
-
-Change *
-undo_diagram_margins(Diagram *dia, real top, real bottom, 
-		     real left, real right)
-{
-  DiagramChangeData from, to;
-  from.margins.top = dia->data->paper.tmargin;
-  to.margins.top = top ;
-  from.margins.bottom = dia->data->paper.bmargin;
-  to.margins.bottom = bottom ;
-  from.margins.left = dia->data->paper.lmargin;
-  to.margins.left = left ;
-  from.margins.right = dia->data->paper.rmargin;
-  to.margins.right = right ;
-  return undo_diagram(dia, MARGINS, from, to);
-}
-
-Change *
-undo_diagram_scaling(Diagram *dia, real scale,
-		     int fit_x, int fit_y)
-{
-  DiagramChangeData from, to;
-  if (dia->data->paper.fitto) {
-    from.scaling.scale = 0;
-    from.scaling.fit_x = dia->data->paper.fitwidth;
-    from.scaling.fit_y = dia->data->paper.fitheight;
-  } else {
-    from.scaling.scale = dia->data->paper.scaling;
-    from.scaling.fit_x = 0;
-    from.scaling.fit_y = 0;
-  }
-  to.scaling.scale = scale;
-  to.scaling.fit_x = fit_x;
-  to.scaling.fit_y = fit_y;
-  return undo_diagram(dia, SCALING, from, to);
-}

--- a/lib/diagdkrenderer.c
+++ b/lib/diagdkrenderer.c
@@ -329,27 +329,27 @@ set_linejoin (DiaRenderer *object, LineJoin mode)
 			     renderer->join_style);
 }
 
-static void 
-set_linestyle (DiaRenderer *object, LineStyle mode)
+/** Set the dashes for this renderer.
+ * offset determines where in the pattern the dashes will start.
+ * It is used by the grid in particular to make the grid dashes line up.
+ */
+void
+dia_gdk_renderer_set_dashes(DiaGdkRenderer *renderer, int offset)
 {
-  DiaGdkRenderer *renderer = DIA_GDK_RENDERER (object);
-
   char dash_list[6];
   int hole_width;
+  int pattern_length;
   
-  renderer->saved_line_style = mode;
-  switch(mode) {
+  switch(renderer->saved_line_style) {
   case LINESTYLE_SOLID:
-    renderer->line_style = GDK_LINE_SOLID;
     break;
   case LINESTYLE_DASHED:
-    renderer->line_style = GDK_LINE_ON_OFF_DASH;
     dash_list[0] = renderer->dash_length;
     dash_list[1] = renderer->dash_length;
-    gdk_gc_set_dashes(renderer->gc, 0, dash_list, 2);
+    pattern_length = renderer->dash_length*2;
+    gdk_gc_set_dashes(renderer->gc, offset, dash_list, 2);
     break;
   case LINESTYLE_DASH_DOT:
-    renderer->line_style = GDK_LINE_ON_OFF_DASH;
     hole_width = (renderer->dash_length - renderer->dot_length) / 2;
     if (hole_width==0)
       hole_width = 1;
@@ -357,10 +357,10 @@ set_linestyle (DiaRenderer *object, LineStyle mode)
     dash_list[1] = hole_width;
     dash_list[2] = renderer->dot_length;
     dash_list[3] = hole_width;
-    gdk_gc_set_dashes(renderer->gc, 0, dash_list, 4);
+    pattern_length = renderer->dash_length+renderer->dot_length+2*hole_width;
+    gdk_gc_set_dashes(renderer->gc, offset, dash_list, 2);
     break;
   case LINESTYLE_DASH_DOT_DOT:
-    renderer->line_style = GDK_LINE_ON_OFF_DASH;
     hole_width = (renderer->dash_length - 2*renderer->dot_length) / 3;
     if (hole_width==0)
       hole_width = 1;
@@ -370,13 +370,44 @@ set_linestyle (DiaRenderer *object, LineStyle mode)
     dash_list[3] = hole_width;
     dash_list[4] = renderer->dot_length;
     dash_list[5] = hole_width;
-    gdk_gc_set_dashes(renderer->gc, 0, dash_list, 6);
+    pattern_length = renderer->dash_length+2*renderer->dot_length+3*hole_width;
+    gdk_gc_set_dashes(renderer->gc, offset, dash_list, 2);
     break;
   case LINESTYLE_DOTTED:
-    renderer->line_style = GDK_LINE_ON_OFF_DASH;
     dash_list[0] = renderer->dot_length;
     dash_list[1] = renderer->dot_length;
-    gdk_gc_set_dashes(renderer->gc, 0, dash_list, 2);
+    pattern_length = renderer->dot_length;
+    gdk_gc_set_dashes(renderer->gc, offset, dash_list, 2);
+    break;
+  }
+
+}
+
+static void 
+set_linestyle (DiaRenderer *object, LineStyle mode)
+{
+  DiaGdkRenderer *renderer = DIA_GDK_RENDERER (object);
+
+  renderer->saved_line_style = mode;
+  switch(mode) {
+  case LINESTYLE_SOLID:
+    renderer->line_style = GDK_LINE_SOLID;
+    break;
+  case LINESTYLE_DASHED:
+    renderer->line_style = GDK_LINE_ON_OFF_DASH;
+    dia_gdk_renderer_set_dashes(renderer, 0);
+    break;
+  case LINESTYLE_DASH_DOT:
+    renderer->line_style = GDK_LINE_ON_OFF_DASH;
+    dia_gdk_renderer_set_dashes(renderer, 0);
+    break;
+  case LINESTYLE_DASH_DOT_DOT:
+    renderer->line_style = GDK_LINE_ON_OFF_DASH;
+    dia_gdk_renderer_set_dashes(renderer, 0);
+    break;
+  case LINESTYLE_DOTTED:
+    renderer->line_style = GDK_LINE_ON_OFF_DASH;
+    dia_gdk_renderer_set_dashes(renderer, 0);
     break;
   }
   gdk_gc_set_line_attributes(renderer->gc,

--- a/lib/diagdkrenderer.h
+++ b/lib/diagdkrenderer.h
@@ -15,6 +15,7 @@ G_BEGIN_DECLS
 #define DIA_GDK_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_GDK_RENDERER, DiaGdkRendererClass))
 
 GType dia_gdk_renderer_get_type (void) G_GNUC_CONST;
+void dia_gdk_renderer_set_dashes(DiaGdkRenderer *renderer, int offset);
 
 struct _DiaGdkRenderer
 {