Commit: 0f26afb57706eb668e56241390a0925ad761a659 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: 0f26afb57706eb668e56241390a0925ad761a659 (tree)
• l'heure: 2001-06-13 06:11:42
• Auteur: Cyrille Chepelov <cyrille@src....>
• Commiter: Cyrille Chepelov

Message de Log

minor non-conformance with IEC-848 fixed (in the transition from step 100

* samples/grafcet.dia: minor non-conformance with IEC-848
fixed (in the transition from step 100 to step 101).

* lib/properties.[ch]: added a flag (PROP_FLAG_DONT_MERGE) to
disallow editing of properties if the object is part of a group.

* objects/chronogram/chronoline.c:
* objects/SADT/annotation.c:
* objects/SADT/box.c:
* objects/GRAFCET/step.c:
* objects/GRAFCET/transition.c:
* objects/GRAFCET/condition.c: took advantage of PROP_FLAG_DONT_MERGE.

Change Summary

• modified: ChangeLog
• modified: lib/properties.c
• modified: lib/properties.h
• modified: objects/GRAFCET/action.c
• modified: objects/GRAFCET/boolequation.h
• modified: objects/GRAFCET/condition.c
• modified: objects/GRAFCET/step.c
• modified: objects/GRAFCET/transition.c
• modified: objects/SADT/box.c
• modified: objects/chronogram/chronoline.c
• modified: samples/grafcet.dia

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
[phone]  Cyrille Chepelov  <[e-mail]>
+
+	* objects/boolequation.h (<save|load>_boolequation): made the 
+	prototypes for match the .c file.
+	
+	* samples/grafcet.dia: minor non-conformance with IEC-848
+	fixed (in the transition from step 100 to step 101).
+
+	* lib/properties.[ch]: added a flag (PROP_FLAG_DONT_MERGE) to
+	disallow editing of properties if the object is part of a group.
+
+	* objects/chronogram/chronoline.c: 
+	* objects/SADT/annotation.c:
+	* objects/SADT/box.c:
+	* objects/GRAFCET/step.c:
+	* objects/GRAFCET/transition.c:
+	* objects/GRAFCET/condition.c: took advantage of PROP_FLAG_DONT_MERGE.
+	
 2001-06-12  Hans Breuer  <[e-mail]>
 
 	* lib/libdia.def : removed lazyprop exports

--- a/lib/properties.c
+++ b/lib/properties.c
@@ -148,9 +148,14 @@ prop_desc_lists_intersection(GList *plists)
       for (i = arr->len - 1; i >= 0; i--) {
 	gint j;
 
-	for (j = 0; ret[j].name != NULL; j++)
-	  if (g_array_index(arr, PropDescription, i).quark == ret[j].quark)
-	    break;
+	for (j = 0; ret[j].name != NULL; j++) {
+	  if (g_array_index(arr, PropDescription, i).quark == ret[j].quark) {
+            if (!((ret[j].flags|g_array_index(arr, PropDescription, i).flags)
+                  & PROP_FLAG_DONT_MERGE))
+              break; /* otherwise, one of the props doesn't want to be merged,
+                        so we won't keep it. */                        
+          }
+        }
 	if (ret[j].name == NULL)
 	  g_array_remove_index(arr, i);
       }

--- a/lib/properties.h
+++ b/lib/properties.h
@@ -96,6 +96,7 @@ struct _PropDescription {
 
 #define PROP_FLAG_VISIBLE   0x0001
 #define PROP_FLAG_DONT_SAVE 0x0002
+#define PROP_FLAG_DONT_MERGE 0x0004 /* in case group properties are edited */
 
 #define PROP_DESC_END { NULL, 0, 0, NULL, NULL, NULL, 0 }
 

--- a/objects/GRAFCET/action.c
+++ b/objects/GRAFCET/action.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 Alexander Larsson
  *
  * GRAFCET chart support 
- * Copyright(C) 2000 Cyrille Chepelov
+ * Copyright(C) 2000,2001 Cyrille Chepelov
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

--- a/objects/GRAFCET/boolequation.h
+++ b/objects/GRAFCET/boolequation.h
@@ -56,10 +56,10 @@ extern Boolequation *boolequation_create(const utfchar *value, Font *font,
 extern void boolequation_destroy(Boolequation *rcep);
 extern void boolequation_set_value(Boolequation *rcep, const utfchar *value);
 
-extern void save_boolequation(ObjectNode *obj_node, const gchar *attrname,
+extern void save_boolequation(ObjectNode obj_node, const gchar *attrname,
 			     Boolequation *rcep);
 
-extern Boolequation *load_boolequation(ObjectNode *obj_node,
+extern Boolequation *load_boolequation(ObjectNode obj_node,
 				     const gchar *attrname,
 				     const utfchar *defaultvalue,
 				     Font *font,

--- a/objects/GRAFCET/condition.c
+++ b/objects/GRAFCET/condition.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 Alexander Larsson
  *
  * GRAFCET chart support 
- * Copyright (C) 2000 Cyrille Chepelov
+ * Copyright (C) 2000,2001 Cyrille Chepelov
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ static ObjectOps condition_ops = {
 
 static PropDescription condition_props[] = {
   CONNECTION_COMMON_PROPERTIES,
-  { "condition",PROP_TYPE_STRING, PROP_FLAG_VISIBLE,
+  { "condition",PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_DONT_MERGE,
     N_("Condition"),N_("The boolean equation of the condition")},
   { "cond_font",PROP_TYPE_FONT, PROP_FLAG_VISIBLE,
     N_("Font"),N_("The condition's font") },

--- a/objects/GRAFCET/step.c
+++ b/objects/GRAFCET/step.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 Alexander Larsson
  *
  * GRAFCET charts support for Dia 
- * Copyright (C) 2000 Cyrille Chepelov
+ * Copyright (C) 2000, 2001 Cyrille Chepelov
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -153,7 +153,7 @@ PropEnumData step_style[] = {
 
 static PropDescription step_props[] = {
   ELEMENT_COMMON_PROPERTIES,
-  { "id", PROP_TYPE_STRING, PROP_FLAG_VISIBLE,
+  { "id", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_DONT_MERGE,
     N_("Step name"),N_("The name of the step")},
   { "type", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE,
     N_("Step type"),N_("The kind of step"),step_style},

--- a/objects/GRAFCET/transition.c
+++ b/objects/GRAFCET/transition.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 Alexander Larsson
  *
  * GRAFCET chart support 
- * Copyright(C) 2000 Cyrille Chepelov
+ * Copyright(C) 2000,2001 Cyrille Chepelov
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@ static ObjectOps transition_ops = {
 
 static PropDescription transition_props[] = {
   ELEMENT_COMMON_PROPERTIES,
-  { "receptivity",PROP_TYPE_STRING, PROP_FLAG_VISIBLE,
+  { "receptivity",PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_DONT_MERGE,
     N_("Receptivity"),N_("The boolean equation of the receptivity")},
   { "rcep_font",PROP_TYPE_FONT, PROP_FLAG_VISIBLE,
     N_("Font"),N_("The receptivity's font") },

--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998 Alexander Larsson
  *
  * SADT Activity/Data box -- objects for drawing SADT diagrams.
- * Copyright (C) 2000 Cyrille Chepelov
+ * Copyright (C) 2000, 2001 Cyrille Chepelov
  * 
  * Forked from Flowchart toolbox -- objects for drawing flowcharts.
  * Copyright (C) 1999 James Henstridge.
@@ -142,7 +142,7 @@ static PropDescription box_props[] = {
   PROP_STD_TEXT_FONT,
   PROP_STD_TEXT_HEIGHT,
   PROP_STD_TEXT_COLOUR,
-  { "id", PROP_TYPE_STRING, PROP_FLAG_VISIBLE,
+  { "id", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_DONT_MERGE,
     N_("Activity/Data identifier"),
     N_("The identifier which appears in the lower right corner of the Box")},
   { "cpl_north",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},

--- a/objects/chronogram/chronoline.c
+++ b/objects/chronogram/chronoline.c
@@ -147,18 +147,20 @@ static PropDescription chronoline_props[] = {
   { "nbook", PROP_TYPE_NOTEBOOK_BEGIN, 
               PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, NULL, NULL},
   { "data", PROP_TYPE_NOTEBOOK_PAGE,
-    PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, 
+    PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE|PROP_FLAG_DONT_MERGE, 
     N_("Data"), NULL},
-  { "name", PROP_TYPE_STRING,PROP_FLAG_VISIBLE,N_("Data name"),NULL },
-  { "events", PROP_TYPE_MULTISTRING,PROP_FLAG_VISIBLE,N_("Events"),
-    NULL,GINT_TO_POINTER(5) },
-  { "help", PROP_TYPE_STATIC,PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE,
+  { "name", PROP_TYPE_STRING,PROP_FLAG_VISIBLE|PROP_FLAG_DONT_MERGE,
+    N_("Data name"),NULL },
+  { "events", PROP_TYPE_MULTISTRING,PROP_FLAG_VISIBLE|PROP_FLAG_DONT_MERGE,
+    N_("Events"), NULL,GINT_TO_POINTER(5) },
+  { "help", PROP_TYPE_STATIC,
+    PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE|PROP_FLAG_DONT_MERGE,
     N_("Event specification"),N_(
-			    "@ time    set the pointer at an absolute time.\n"
-			    "( duration  sets the signal up, then wait 'duration'.\n"
-			    ") duration  sets the signal down, then wait 'duration'.\n" 
-			    "u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-			    "example : @ 1.0 (2.0)1.0(2.0)\n" )},
+   "@ time    set the pointer at an absolute time.\n"
+   "( duration  sets the signal up, then wait 'duration'.\n"
+   ") duration  sets the signal down, then wait 'duration'.\n" 
+   "u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
+   "example : @ 1.0 (2.0)1.0(2.0)\n" )},
 
   { "parameters",PROP_TYPE_NOTEBOOK_PAGE,
     PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE, 

Binary files a/samples/grafcet.dia and b/samples/grafcet.dia differ