Adaption to longer object name

src/exe/rt_trend/src/rt_trend.c

 /* 
- * Proview   $Id: rt_trend.c,v 1.7 2005-09-01 14:57:48 claes Exp $
+ * Proview   $Id: rt_trend.c,v 1.8 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -237,7 +237,7 @@ InitTrendList (
   pwr_tTypeId	    Type;
   int		    Tix;
   pwr_sAttrRef	    Aref;
-  char		    Name[81];
+  pwr_tAName   	    Name;
   pwr_sClass_DsTrend  *Trend;
 
   sts = gdh_GetClassListAttrRef(pwr_cClass_DsTrend, &Aref);

src/exp/inc/src/pwr.h

 /* 
- * Proview   $Id: pwr.h,v 1.19 2005-10-18 05:07:40 claes Exp $
+ * Proview   $Id: pwr.h,v 1.20 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -96,9 +96,9 @@
 #define pwr_cSizXRef		31
 #define pwr_cSizAttrName	31
 #define pwr_cSizPathName	63
-#define pwr_cSizFullName	119
-#define pwr_cSizOName		119
-#define pwr_cSizAName		239
+#define pwr_cSizFullName	199
+#define pwr_cSizOName		199
+#define pwr_cSizAName		399
 #define pwr_cSizFileName       	255
 #define pwr_cSizCmd       	255
 

src/lib/co/src/co_cdh.c

 /** 
- * Proview   $Id: co_cdh.c,v 1.15 2005-10-07 05:57:28 claes Exp $
+ * Proview   $Id: co_cdh.c,v 1.16 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -2504,6 +2504,46 @@ cdh_NoCaseStrncmp (
     (isalpha(*t) ? ((*t) & ~(1<<5)) : *t);
 }
 
+//! Copy string, and cut of if the string is to long with ending '...'
+/*!
+  For example the string '0123456789' will return the string '0123...' when
+  the size of the returned string is 8.
+
+  If the string is cut off, the return value is 1, else 0.
+
+  \param t	Out string.
+  \param s	In string.
+  \param n	Size of out string.
+  \param cutleft The first characters of the string is cut.
+  \return 	1 if the string is cut off, else 0.
+*/
+int cdh_StrncpyCutOff( char *t, const char *s, size_t n, int cutleft)
+{
+  if ( strlen(s) < n) {
+    strcpy( t, s);
+    return 0;
+  }  
+  
+  if ( cutleft) {
+    strcpy( t, s + strlen(s) - n - 1);
+    if ( n > 5) {
+      t[0] = '.';
+      t[1] = '.';
+      t[2] = '.';
+    }
+  }
+  else {
+    strncpy( t, s, n);
+    t[n-1] = 0;
+    if ( n > 5) {
+      t[n-2] = '.';
+      t[n-3] = '.';
+      t[n-4] = '.';
+    }
+  }
+  return 1;
+}
+
 //! Convert operating system to string
 /*!
   For example pwr_mOpSys_X86_LINUX will be converted to "x86_linux".

src/lib/co/src/co_cdh.h

 /** 
- * Proview   $Id: co_cdh.h,v 1.21 2005-10-07 05:57:28 claes Exp $
+ * Proview   $Id: co_cdh.h,v 1.22 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -978,6 +978,14 @@ cdh_NoCaseStrncmp (
   size_t 		n
 );
 
+int 
+cdh_StrncpyCutOff(
+  char			*s,
+  const char	       	*t,
+  size_t		n,
+  int			cutleft
+);
+
 char *cdh_OpSysToStr( pwr_mOpSys opsys);
 
 pwr_sAttrRef cdh_ArefToCastAref( pwr_sAttrRef *arp);

src/lib/co/src/co_dcli.c

 /** 
- * Proview   $Id: co_dcli.c,v 1.3 2005-09-01 14:57:52 claes Exp $
+ * Proview   $Id: co_dcli.c,v 1.4 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -70,7 +70,7 @@ typedef	struct	{
 #define	DCLI_SYMBOLTABLE_SIZE 500
 #define CMD_BUFF_SIZE (DCLI_SYMBOLTABLE_SIZE * 160)
 
-static char		dcli_qual_str[10][2][80];
+static char		dcli_qual_str[10][2][400];
 static dcli_t_symboltable dcli_symboltable[DCLI_SYMBOLTABLE_SIZE];
 static int		dcli_symboltable_count;
 
@@ -248,11 +248,11 @@ int	dcli_cli( 	dcli_tCmdTable	*command_table,
 			void		*userdata1,
 			void		*userdata2)
 {
-	char	out_str[20][160];
-	char	value_str[10][160];
+	char	out_str[20][DCLI_QUAL_SIZE];
+	char	value_str[10][DCLI_QUAL_SIZE];
 	int	nr, i, j, valuenr;
 	int	hitnr, sts;
-	char	command[160];
+	char	command[DCLI_CMD_SIZE];
 	int	(*func) ();
 	dcli_tCmdTable	*comtbl_ptr;
 	dcli_tCmdTable	*current_comtbl;
@@ -442,7 +442,8 @@ int	dcli_cli( 	dcli_tCmdTable	*command_table,
 **************************************************************************/
 
 int	dcli_get_qualifier( 	char	*qualifier,
-				char	*value)
+				char	*value,
+				size_t	size)
 {
 	int	i, found;
 
@@ -453,8 +454,11 @@ int	dcli_get_qualifier( 	char	*qualifier,
 	  if ( strcmp( qualifier, (char *) dcli_qual_str[i]) == 0)
 	  {
 	    /* Hit */
-            if ( value)
-	      strcpy( value, (char *) &dcli_qual_str[i][1]);
+            if ( value) {
+	      if ( strlen( dcli_qual_str[i][1]) > size - 1)
+		return DCLI__TOOLONG;
+	      strcpy( value, dcli_qual_str[i][1]);
+	    }
 	    found = 1;
 	  }
 	  i++;
@@ -583,7 +587,7 @@ int	dcli_replace_symbol( char *command, char *newcommand, int newsize)
 	char	symbol[80];
 	char	upper_symbol[80];
 	int	sts;
-	char	new[400];
+	char	new[1000];
 	int	ignore_symbolmode;
 
 	symbolmode = 0;

src/lib/co/src/co_dcli.h

 /** 
- * Proview   $Id: co_dcli.h,v 1.7 2005-09-22 08:38:31 claes Exp $
+ * Proview   $Id: co_dcli.h,v 1.8 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -31,6 +31,10 @@ extern "C" {
 /* co_dcli.c
    Command line interpreter. */
 
+
+#define DCLI_CMD_SIZE 400
+#define DCLI_QUAL_SIZE 400
+
 typedef	struct	{
 	char	command[20];
 	int	(*func) ( void *, void *);
@@ -50,7 +54,8 @@ int	dcli_cli( 	dcli_tCmdTable	*command_table,
 			void		*userdata1,
 			void		*userdata2);
 int	dcli_get_qualifier( 	char	*qualifier,
-				char	*value);
+				char	*value,
+				size_t  size);
 int	dcli_store_symbols( char	*filename);
 int	dcli_replace_symbol( char *command, char *newcommand, int newsize);
 int	dcli_get_symbol( char *key, char *value);

src/lib/co/src/co_nav_crr.cpp

 /** 
- * Proview   $Id: co_nav_crr.cpp,v 1.2 2005-09-01 14:57:52 claes Exp $
+ * Proview   $Id: co_nav_crr.cpp,v 1.3 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -183,15 +183,15 @@ int	NavCrr::crr_signal(
 			char	*filename,
 			char	*signalname)
 {
-	char	default_filename[80];
+	pwr_tFileName default_filename;
 	FILE	*file;
-	char	line[200];
+	char	line[1000];
 	int	hierarchy_spaces;
-	char	hierarchy[160];
+	pwr_tAName hierarchy;
 	int	object_spaces;
-	char	object[160];
-	char	objname[80];
-	char	show_objname[80];
+	pwr_tAName object;
+	pwr_tAName objname;
+	pwr_tAName show_objname;
 	int	spaces;
 	int	first;
 	int	sts;	
@@ -199,11 +199,11 @@ int	NavCrr::crr_signal(
 	int	wildcard;
 	int	signalcount = 0;
 	int	crossref_count = 0;
-	char	filestr[80];
+	pwr_tFileName	filestr;
 	int	lines;
 	pwr_tVolumeId	volid;
 	pwr_tObjid	objid;
-	char	line_part[8][80];
+	pwr_tAName	line_part[8];
 	int	nr;
 	int	write;
 
@@ -373,27 +373,27 @@ int	NavCrr::crr_object(
 			char	*filename,
 			char	*objectname)
 {
-	char	default_filename[80];
+	pwr_tFileName default_filename;
 	FILE	*file;
-	char	line[200];
+	char	line[1000];
 	int	hierarchy_spaces;
-	char	hierarchy[160];
+	pwr_tAName hierarchy;
 	int	object_spaces;
-	char	object[160];
-	char	objname[80];
-	char	show_objname[80];
+	pwr_tAName object;
+	pwr_tAName objname;
+	pwr_tAName show_objname;
 	int	spaces;
 	int	first;
 	int	sts;	
 	char	*s;
 	int	wildcard;
 	int	signalcount = 0;
-	char	filestr[80];
+	pwr_tFileName filestr;
 	int	lines;
 	pwr_tVolumeId	volid;
 	pwr_tObjid	objid;
 	int	crossref_count = 0;
-	char	line_part[8][80];
+	pwr_tAName line_part[8];
 	int	nr;
 	int	write;
 
@@ -561,21 +561,21 @@ int	NavCrr::crr_code(
 			int	func,
 			int	case_sensitive)
 {
-	char	default_filename[80];
+	pwr_tFileName default_filename;
 	FILE	*file;
-	char	line[200];
-	char	tst_line[200];
+	char	line[1000];
+	char	tst_line[1000];
 	int	hierarchy_spaces;
-	char	hierarchy[160];
+	pwr_tAName hierarchy;
 	int	object_spaces;
-	char	object[160];
-	char	objname[80];
+	pwr_tAName object;
+	pwr_tAName objname;
 	int	spaces;
 	int	first;
 	int	sts;	
 	char	*s;
 	int	signalcount = 0;
-	char	filestr[80];
+	pwr_tFileName filestr;
 	int	lines;
 	char	title[80];
 	pwr_tVolumeId	volid;
@@ -635,20 +635,21 @@ int	NavCrr::crr_code(
 	first = 1;
 	while ( 1)
 	{
-	  while ( strncmp( line, "_Obj_ ", 6) != 0)
+
+	  while ( strncmp( line, " _Obj_ ", 7) != 0)
 	  {
 	    sts = nav_get_signal_line( file, line, sizeof( line),
 				&spaces, object, &lines);
 	    if ( EVEN(sts)) goto finish;
 	  }
-	  strcpy( objname, &line[6]);
+	  strcpy( objname, &line[7]);
 	  for ( s = objname; !(*s == 32 || *s == 9 || *s == 0); s++);
 	  *s = 0;
 
 	  sts = nav_get_signal_line( file, line, sizeof( line),
 				&spaces, object, &lines);
 	  objname_written = 0;
-	  while ( strncmp( line, "_Obj_ ", 6) != 0)
+	  while ( strncmp( line, " _Obj_ ", 7) != 0)
 	  {
 	    if ( !case_sensitive)
 	      cdh_ToUpper( tst_line, line);
@@ -715,7 +716,7 @@ int	NavCrr::crr_code(
 
 	      if ( brief)
 	      {
-	        while ( strncmp( line, "_Obj_ ", 6) != 0)
+	        while ( strncmp( line, " _Obj_ ", 7) != 0)
 	        {	      
 	          sts = nav_get_signal_line( file, line, sizeof( line),
 				&spaces, object, &lines);

src/lib/rt/src/rt_bck_load.c

 /* 
- * Proview   $Id: rt_bck_load.c,v 1.3 2005-09-01 14:57:55 claes Exp $
+ * Proview   $Id: rt_bck_load.c,v 1.4 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -155,10 +155,12 @@ bck_LoadBackup ()
 		&objid, dh.attrref.Objid, 0, pwr_cNObjid);
 
               if (strp != NULL) *strp = '.';
-	    } /* Dynamic object */
 
-	    if (ODD (sts)) {
-	      sts = gdh_SetObjectInfo(dh.dataname, datap, dh.attrref.Size);
+	      if (ODD (sts))
+		sts = gdh_SetObjectInfo(dh.dataname, datap, dh.attrref.Size);
+	    } /* Dynamic object */
+	    else {
+	      sts = gdh_SetObjectInfoAttrref(&dh.attrref, datap, dh.attrref.Size);
 	    }
 	  } /* valid segment */
 

src/lib/rt/src/rt_gdh.h

 /* 
- * Proview   $Id: rt_gdh.h,v 1.12 2005-10-07 05:57:28 claes Exp $
+ * Proview   $Id: rt_gdh.h,v 1.13 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -62,7 +62,7 @@ typedef	pwr_tDlid    DLID;
  * gdh_RefObjectInfoList parameter structure.  
  */
 typedef struct {
-  char		        fullname[160]; /**< Name of object or parameter */
+  pwr_tAName		fullname; /**< Name of object or parameter */
   void			*adrs;    /**< Address of requested info */
   unsigned int		bufsize;  /**< Requested buffer size */
 } gdh_sObjRef;

src/lib/rt/src/rt_io_base.c

 /* 
- * Proview   $Id: rt_io_base.c,v 1.14 2005-09-01 14:57:55 claes Exp $
+ * Proview   $Id: rt_io_base.c,v 1.15 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -133,7 +133,7 @@ static pwr_tStatus io_replace_symbol( pwr_sAttrRef *chan, pwr_sAttrRef *sig)
 {
   if ( chan->Objid.vid == cdh_cIoConnectVolume ) {
     // Replace with attrref in IoConnected
-    char name[120];
+    pwr_tAName name;
     pwr_tStatus sts;
     pwr_sAttrRef connect;
     pwr_tCid cid;
@@ -254,7 +254,7 @@ pwr_tStatus io_init_ai_signals(
   pwr_sClass_Ai			*sig_op;
   pwr_sClass_ChanAi		*chan_op;
   pwr_sAttrRef			sig_aref;
-  char				buf[140];
+  pwr_tAName   			buf;
   pwr_tUInt32			sig_count = 0;
   pwr_tClassId			class;
   pwr_sClass_IvArea		*iarea_op;
@@ -334,7 +334,7 @@ pwr_tStatus io_init_ao_signals(
   pwr_sClass_Ao			*sig_op;
   pwr_sClass_ChanAo		*chan_op;
   pwr_sAttrRef			sig_aref;
-  char				buf[140];
+  pwr_tAName   			buf;
   pwr_tUInt32			sig_count = 0;
   pwr_tClassId			class;
   pwr_sClass_IvArea		*iarea_op;
@@ -412,7 +412,7 @@ pwr_tStatus io_init_di_signals(
   pwr_sClass_Di			*sig_op;
   pwr_sClass_ChanDi		*chan_op;
   pwr_sAttrRef			sig_aref;
-  char				buf[140];
+  pwr_tAName		       	buf;
   pwr_tUInt32			sig_count = 0;
   pwr_tClassId			class;
   pwr_sClass_IvArea		*iarea_op;
@@ -491,7 +491,7 @@ pwr_tStatus io_init_do_signals(
   pwr_sClass_Do			*sig_op;
   pwr_sClass_ChanDo		*chan_op;
   pwr_sAttrRef			sig_aref;
-  char				buf[140];
+  pwr_tAName   			buf;
   pwr_tUInt32			sig_count = 0;
   pwr_tClassId			class;
   pwr_sClass_IvArea		*iarea_op;
@@ -610,7 +610,7 @@ pwr_tStatus io_init_co_signals(
   pwr_sClass_Co			*sig_op;
   pwr_sClass_ChanCo		*chan_op;
   pwr_sAttrRef			sig_aref;
-  char				buf[140];
+  pwr_tAName   			buf;
   pwr_tUInt32			sig_count = 0;
   pwr_tClassId			class;
 
@@ -823,7 +823,7 @@ pwr_tStatus io_init_ii_signals(
   pwr_sClass_Ii			*sig_op;
   pwr_sClass_ChanIi		*chan_op;
   pwr_sAttrRef			sig_aref;
-  char				buf[140];
+  pwr_tAName   			buf;
   pwr_tUInt32			sig_count = 0;
   pwr_tClassId			class;
   pwr_sClass_IvArea		*iarea_op;
@@ -903,7 +903,7 @@ pwr_tStatus io_init_io_signals(
   pwr_sClass_Io			*sig_op;
   pwr_sClass_ChanIo		*chan_op;
   pwr_sAttrRef			sig_aref;
-  char				buf[140];
+  pwr_tAName   			buf;
   pwr_tUInt32			sig_count = 0;
   pwr_tClassId			class;
   pwr_sClass_IvArea		*iarea_op;
@@ -1432,8 +1432,8 @@ static pwr_tStatus io_init_card(
   pwr_tStatus 	(* CardClose) ();
   pwr_tStatus 	(* CardRead) ();
   pwr_tStatus 	(* CardWrite) ();
-  char		cname[140];
-  char		attrname[140];
+  pwr_tAName   	cname;
+  pwr_tAName   	attrname;
   pwr_tUInt32	process = 0;
   io_sCard	*cp;
   io_sCard	*clp;
@@ -1872,8 +1872,8 @@ static pwr_tStatus io_init_rack(
   pwr_tStatus 	(* RackClose) ();
   pwr_tStatus 	(* RackRead) ();
   pwr_tStatus 	(* RackWrite) ();
-  char		rname[140];
-  char		attrname[140];
+  pwr_tAName   	rname;
+  pwr_tAName   	attrname;
   pwr_tUInt32	process = 0;
   io_sRack	*rp;
   io_sRack	*rlp;
@@ -1990,8 +1990,8 @@ static pwr_tStatus io_init_agent(
   pwr_tStatus 	(* AgentClose) ();
   pwr_tStatus 	(* AgentRead) ();
   pwr_tStatus 	(* AgentWrite) ();
-  char		aname[140];
-  char		attrname[140];
+  pwr_tAName   	aname;
+  pwr_tAName   	attrname;
   pwr_tUInt32	process = 0;
   io_sAgent	*ap;
   io_sAgent	*alp;
@@ -2642,7 +2642,7 @@ pwr_tStatus io_AiRangeToCoef(
   io_sChannel 	*chanp)
 {
   pwr_sClass_ChanAi	*cop;
-  char			buf[120];
+  pwr_tAName   		buf;
   pwr_tStatus		sts;
   pwr_tFloat32		PolyCoef1;
   pwr_tFloat32		PolyCoef0;
@@ -2706,7 +2706,7 @@ pwr_tStatus io_AoRangeToCoef(
   io_sChannel 	*chanp)
 {
   pwr_sClass_ChanAo	*cop;
-  char			buf[120];
+  pwr_tAName   		buf;
   pwr_tStatus		sts;
   pwr_tFloat32		PolyCoef1;
   pwr_tFloat32		PolyCoef0;

src/lib/rt/src/rt_trace.c

 /* 
- * Proview   $Id: rt_trace.c,v 1.10 2005-09-01 14:57:56 claes Exp $
+ * Proview   $Id: rt_trace.c,v 1.11 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -81,11 +81,12 @@ pwr_tStatus trace_trasetup( tra_tCtx tractx);
 static char	*trace_IdToStr(  pwr_tObjid 	objid);
 
 static void trace_GetTraceAttr( tra_tCtx tractx, flow_tObject object, 
-				char *object_str, char *attr_str, flow_eTraceType *type)
+				char *object_str, char *attr_str, flow_eTraceType *type,
+				int *inverted)
 {
-  char name[120];
+  pwr_tOName name;
 
-  flow_GetTraceAttr( object, name, attr_str, type);
+  flow_GetTraceAttr( object, name, attr_str, type, inverted);
   if ( tractx->has_host) {
     /* Replace "$host" with hostname */
     if ( strncmp( name, "$host", 5) == 0) {
@@ -112,7 +113,7 @@ static int trace_get_filename( pwr_tObjid window_objid, char *filename,
   FILE *fp;
   pwr_tOid host;
   pwr_tCid cid;
-  char cname[80];
+  pwr_tObjName cname;
   pwr_tFileName fname;
   int sts;
   pwr_tOName name;
@@ -176,7 +177,7 @@ static int trace_get_filename( pwr_tObjid window_objid, char *filename,
 static int trace_connect_bc( flow_tObject object, char *name, char *attr, 
 	flow_eTraceType type, void **p)
 {
-  char		attr_str[160];
+  pwr_tAName   	attr_str;
   int		size;
   pwr_tSubid	*subid_p, subid;
   int		sts;
@@ -215,8 +216,8 @@ static int trace_connect_bc( flow_tObject object, char *name, char *attr,
       strcpy( attr_str, tractx->hostname);
       strcat( attr_str, &name[5]);
     }
-    else if ( strncmp( name, "$PlcHost:", 9) == 0) {
-      /* Replace "$PlcHost:" with hostname */
+    else if ( strncmp( name, "$PlcFo:", 7) == 0) {
+      /* Replace "$PlcFo:" with fo name */
       s = strchr( name, '.');
       if ( !s)
 	strcpy( attr_str, tractx->hostname);
@@ -225,8 +226,8 @@ static int trace_connect_bc( flow_tObject object, char *name, char *attr,
 	strcat( attr_str, s);
       }
     }      
-    else if ( strncmp( name, "$PlcConnect:", 12) == 0) {
-      /* Replace "$PlcConnect:" with plcconnect name */
+    else if ( strncmp( name, "$PlcMain:", 9) == 0) {
+      /* Replace "$PlcMain:" with plcconnect name */
       s = strchr( name, '.');
       if ( !s)
 	strcpy( attr_str, tractx->plcconnect);
@@ -259,21 +260,24 @@ static int trace_disconnect_bc( flow_tObject object)
 {
   pwr_tSubid	*subid_p;
   int 		sts;
-  char          name[120];
-  char          attr[32];
+  flow_tTraceObj name;
+  flow_tTraceAttr attr;
   flow_eTraceType type;
+  int		inverted;
 
   if ( flow_GetObjectType( object) == flow_eObjectType_Node) {
 
-    flow_GetTraceAttr( object, name, attr, &type);
+    flow_GetTraceAttr( object, name, attr, &type, &inverted);
     if ( type != flow_eTraceType_Boolean &&
 	 flow_GetNodeGroup( object) != flow_eNodeGroup_Trace)
       return 1;
 
     if ( !( strcmp( name, "") == 0 || strcmp( attr, "") == 0)) {
       flow_GetUserData( object, (void **) &subid_p);
-      sts = gdh_UnrefObjectInfo( *subid_p);
-      XtFree( (char *) subid_p);
+      if ( subid_p) {
+	sts = gdh_UnrefObjectInfo( *subid_p);
+	XtFree( (char *) subid_p);
+      }
     }
   }
   return 1;
@@ -651,10 +655,11 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
 
     if ( tractx->trace_started)
     {
-      char			object_str[120];
-      char			attr_str[120];
-      char			con_attr_str[120];
+      flow_tTraceObj	       	object_str;
+      flow_tTraceAttr  		attr_str;
+      flow_tTraceAttr	       	con_attr_str;
       flow_eTraceType		trace_type;
+      int			inverted;
       flow_tNode		n1;
       flow_tCon			c1;
       int			sts;
@@ -682,7 +687,7 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
 
       /* Find the trace attributes */
       flow_GetTraceAttr( event->con_create.source_object, object_str, attr_str, 
-		&trace_type);
+		&trace_type, &inverted);
 
       /* Get attribute from connection point */
       sts = flow_GetConPointTraceAttr( event->con_create.source_object,
@@ -695,7 +700,7 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
         return 1;
 
       flow_CreateNode( ctx, name, tractx->trace_analyse_nc, event->object.x, event->object.y, NULL, &n1);
-      flow_SetTraceAttr( n1, object_str, attr_str, trace_type);
+      flow_SetTraceAttr( n1, object_str, attr_str, trace_type, 0);
 
       flow_CreateCon( ctx, name, tractx->trace_con_cc, 
 	  	event->con_create.source_object, n1,
@@ -756,9 +761,10 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
     }
     case flow_eEvent_MB3Press:
     {
-      char		object_str[120];
-      char		attr_str[80];
+      flow_tTraceObj   	object_str;
+      flow_tTraceAttr  	attr_str;
       flow_eTraceType	trace_type;
+      int		inverted;
       pwr_tObjid	objid;
       pwr_sAttrRef      attrref;
       int		sts;
@@ -772,7 +778,7 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
 		flow_eNodeGroup_Trace)
           {
             trace_GetTraceAttr( tractx, event->object.object, object_str, attr_str,
-			&trace_type);
+			&trace_type, &inverted);
 
             sts = gdh_NameToObjid( object_str, &objid);
             if ( EVEN(sts)) return 1;
@@ -806,9 +812,10 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
     case flow_eEvent_MB1DoubleClick:
     {
       /* Open attribute editor */
-      char		object_str[120];
-      char		attr_str[80];
+      flow_tTraceObj   	object_str;
+      flow_tTraceAttr  	attr_str;
       flow_eTraceType	trace_type;
+      int		inverted;
       pwr_tObjid	objid;
       int		sts;
 
@@ -820,7 +827,7 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
 		flow_eNodeGroup_Trace)
           {
             trace_GetTraceAttr( tractx, event->object.object, object_str, attr_str, 
-			&trace_type);
+			&trace_type, &inverted);
 
             sts = gdh_NameToObjid( object_str, &objid);
             if ( EVEN(sts)) return 1;
@@ -855,7 +862,7 @@ static int trace_flow_cb( FlowCtx *ctx, flow_tEvent event)
     case flow_eEvent_MB1DoubleClickShift:
     {
       pwr_tOName       		name;
-      char			object_name[120];
+      flow_tName       		object_name;
       pwr_tObjid		objid;
       int			sts;
       tra_tCtx			new_tractx;
@@ -964,8 +971,9 @@ static int trace_get_objid( tra_tCtx tractx, flow_tObject node,
   pwr_tOName	        name;
   pwr_tOName   		object_name;
   int			sts;
-  char			attr_str[80];
+  flow_tTraceAttr      	attr_str;
   flow_eTraceType	trace_type;
+  int			inverted;
 
   /* Try flow node name */
   sts = gdh_ObjidToName( tractx->objid, name, sizeof(name), cdh_mNName); 
@@ -979,7 +987,7 @@ static int trace_get_objid( tra_tCtx tractx, flow_tObject node,
   if ( EVEN(sts))
   {
     /* Try trace object */
-    trace_GetTraceAttr( tractx, node, object_name, attr_str, &trace_type);
+    trace_GetTraceAttr( tractx, node, object_name, attr_str, &trace_type, &inverted);
 
     sts = gdh_NameToObjid( object_name, objid);
     if ( EVEN(sts)) return sts;
@@ -1140,9 +1148,10 @@ static void trace_changevalue (
   pwr_tStatus 		sts;
   char		       	name[200];
   pwr_tBoolean		value;
-  char			object_str[120];
-  char			attr_str[80];
+  flow_tTraceObj      	object_str;
+  flow_tTraceAttr      	attr_str;
   flow_eTraceType	trace_type;
+  int			inverted;
 
   if ( tractx->is_authorized_cb) {
     if ( !(tractx->is_authorized_cb)(tractx->cp.parent_ctx, 
@@ -1163,7 +1172,7 @@ static void trace_changevalue (
   else
   {	    
     /* Toggle the value, start to get the current value */
-    trace_GetTraceAttr( tractx, fnode, object_str, attr_str, &trace_type);
+    trace_GetTraceAttr( tractx, fnode, object_str, attr_str, &trace_type, &inverted);
     strcpy( name, object_str);
     strcat( name, ".");
     strcat( name, attr_str);
@@ -1215,11 +1224,12 @@ static pwr_tStatus	trace_aanalyse_set_value(
   char			name[200];
   pwr_tBoolean		boolean_value;
   pwr_tFloat32		float_value;
-  char			object_str[120];
-  char			attr_str[80];
+  flow_tTraceObj       	object_str;
+  flow_tTraceAttr      	attr_str;
   flow_eTraceType	trace_type;
+  int			inverted;
 
-  flow_GetTraceAttr( tractx->trace_changenode, object_str, attr_str, &trace_type);
+  flow_GetTraceAttr( tractx->trace_changenode, object_str, attr_str, &trace_type, &inverted);
   strcpy( name, object_str);
   strcat( name, ".");
   strcat( name, attr_str);
@@ -1401,7 +1411,7 @@ tra_tCtx trace_new( 	void 		*parent_ctx,
   int		i;
   pwr_tObjid	window_objid;
   pwr_tClassId	class;
-  char   	title[100];
+  char   	title[220];
   int		has_host;
   pwr_tOName   	hostname;
   pwr_tOName   	plcconnect;

src/lib/rt/src/rt_trace.h

 /* 
- * Proview   $Id: rt_trace.h,v 1.7 2005-09-01 14:57:56 claes Exp $
+ * Proview   $Id: rt_trace.h,v 1.8 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -82,11 +82,11 @@ struct tra_sCtx{
 					  unsigned long utility, 
 					  char *arg);
   trace_t_node		*trace_list;
-  char			filename[200];
+  pwr_tFileName	       	filename;
   int			version;
   int			has_host;
-  char			hostname[120];
-  char			plcconnect[120];
+  pwr_tOName   		hostname;
+  pwr_tAName   		plcconnect;
 };
 
 

src/msg/co/src/co_dcli_msg.msg

 ! 
-!  Proview   $Id: co_dcli_msg.msg,v 1.2 2005-09-01 14:58:00 claes Exp $
+!  Proview   $Id: co_dcli_msg.msg,v 1.3 2005-10-21 16:11:23 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -51,5 +51,5 @@ structnotfound	<the struct was not found>				/error
 eof		<end of file>						/error
 undeferr	<undefined error>					/error
 typeundef       <undefined type>                                        /error
-
+toolong		<qualifier value is too long>				/error
 

src/wbl/bcomp/src/pwr_basecontactorfo.flw

@@ -29,7 +29,7 @@
 123
 2
 3
-300 StoDp0
+300 StoDp174
 301
 2
 5
@@ -140,7 +140,7 @@
 303 0
 99
 3
-300 GetDp1
+300 GetDp175
 301
 2
 5
@@ -251,7 +251,7 @@
 303 0
 99
 3
-300 CArea0
+300 CArea9
 301
 2
 5
@@ -419,7 +419,7 @@
 303 1
 99
 3
-300 Disabled3
+300 Disabled177
 301
 2
 5
@@ -530,7 +530,7 @@
 303 0
 99
 3
-300 CArea1
+300 CArea10
 301
 2
 5
@@ -714,7 +714,7 @@
 303 1
 99
 3
-300 Text0
+300 Text28
 301
 2
 5
@@ -760,7 +760,7 @@
 303 0
 99
 3
-300 GetDi5
+300 GetDi179
 301
 2
 5
@@ -871,7 +871,7 @@
 303 0
 99
 3
-300 GetDp6
+300 GetDp180
 301
 2
 5
@@ -982,7 +982,7 @@
 303 0
 99
 3
-300 Text1
+300 Text29
 301
 2
 5
@@ -1028,7 +1028,7 @@
 303 0
 99
 3
-300 Timer0
+300 Timer56
 301
 2
 5
@@ -1176,7 +1176,7 @@
 303 0
 99
 3
-300 GetDp7
+300 GetDp181
 301
 2
 5
@@ -1287,7 +1287,7 @@
 303 0
 99
 3
-300 StoDp8
+300 StoDp182
 301
 2
 5
@@ -1398,7 +1398,7 @@
 303 0
 99
 3
-300 StoSp9
+300 StoSp183
 301
 2
 5
@@ -1509,7 +1509,7 @@
 303 0
 99
 3
-300 Strcat1
+300 Strcat57
 301
 2
 5
@@ -1656,7 +1656,7 @@
 303 0
 99
 3
-300 NameToStr10
+300 NameToStr184
 301
 2
 5
@@ -1767,7 +1767,7 @@
 303 0
 99
 3
-300 GetSp11
+300 GetSp185
 301
 2
 5
@@ -1878,7 +1878,7 @@
 303 0
 99
 3
-300 StoAp12
+300 StoAp186
 301
 2
 5
@@ -1989,7 +1989,7 @@
 303 0
 99
 3
-300 GetAp13
+300 GetAp187
 301
 2
 5
@@ -2100,7 +2100,7 @@
 303 0
 99
 3
-300 StoDp14
+300 StoDp188
 301
 2
 5
@@ -2211,7 +2211,7 @@
 303 0
 99
 3
-300 DSup15
+300 DSup189
 301
 2
 5
@@ -2348,7 +2348,7 @@
 303 0
 99
 3
-300 StoDp16
+300 StoDp190
 301
 2
 5
@@ -2459,7 +2459,7 @@
 303 0
 99
 3
-300 Wait2
+300 Wait58
 301
 2
 5
@@ -2607,7 +2607,7 @@
 303 0
 99
 3
-300 And3
+300 And59
 301
 2
 5
@@ -2770,7 +2770,7 @@
 303 0
 99
 3
-300 GetDi17
+300 GetDi191
 301
 2
 5
@@ -2881,7 +2881,7 @@
 303 0
 99
 3
-300 StoDo18
+300 StoDo192
 301
 2
 5
@@ -2992,7 +2992,7 @@
 303 0
 99
 3
-300 GetDp19
+300 GetDp193
 301
 2
 5
@@ -3103,7 +3103,7 @@
 303 0
 99
 3
-300 Document0
+300 Document10
 301
 2
 6
@@ -3376,7 +3376,7 @@
 125
 2
 10
-1000 StoDp0
+1000 StoDp174
 1002 StoDp3
 1005
 0
@@ -3440,9 +3440,10 @@
 1010 $PlcFo:BaseComponent-Class-BaseContactorFo
 1011 Feedback
 1012 0
+1017 0
 99
 10
-1000 GetDp1
+1000 GetDp175
 1002 GetDp5
 1005
 0
@@ -3506,9 +3507,10 @@
 1010 $PlcFo:BaseComponent-Class-BaseContactorFo
 1011 On
 1012 0
+1017 0
 99
 10
-1000 CArea0
+1000 CArea9
 1002 HasNoFeedback
 1005
 0
@@ -3569,12 +3571,13 @@
 700 1.4
 701 1.5
 99
-1010 BaseComponent-Class-BaseContactor
+1010 $PlcMain:BaseComponent-Class-BaseContactor
 1011 DisableFeedback
 1012 0
+1017 0
 99
 10
-1000 Disabled3
+1000 Disabled177
 1002 Disabled12
 1005
 0
@@ -3638,9 +3641,10 @@
 1010 $PlcMain:BaseComponent-Class-BaseContactor
 1011 DisableFeedback
 1012 0
+1017 0
 99
 10
-1000 CArea1
+1000 CArea10
 1002 HasFeedback
 1005
 0
@@ -3701,12 +3705,13 @@
 700 1.4
 701 0.8
 99
-1010 BaseComponent-Class-BaseContactor
+1010 $PlcMain:BaseComponent-Class-BaseContactor
 1011 DisableFeedback
 1012 0
+1017 1
 99
 10
-1000 Text0
+1000 Text28
 1002 Text10
 1005
 0
@@ -3770,9 +3775,10 @@
 1010 $host-W-Text10
 1011 DisableFeedback
 1012 3
+1017 1
 99
 10
-1000 GetDi5
+1000 GetDi179
 1002 GetDi1
 1005
 0
@@ -3836,9 +3842,10 @@
 1010 $PlcMain:BaseComponent-Class-BaseContactor.Feedback
 1011 ActualValue
 1012 0
+1017 0
 99
 10
-1000 GetDp6
+1000 GetDp180
 1002 GetDp4
 1005
 0
@@ -3902,9 +3909,10 @@
 1010 $PlcFo:BaseComponent-Class-BaseContactorFo
 1011 On
 1012 0
+1017 0
 99
 10
-1000 Text1
+1000 Text29
 1002 Text9
 1005
 0
@@ -3968,9 +3976,10 @@
 1010 $host-W-Text9
 1011 On
 1012 3
+1017 0
 99
 10
-1000 Timer0
+1000 Timer56
 1002 ShowHMI
 1005
 0
@@ -4035,9 +4044,10 @@
 1010 $host-W-ShowHMI
 1011 Status
 1012 0
+1017 0
 99
 10
-1000 GetDp7
+1000 GetDp181
 1002 GetDp3
 1005
 0
@@ -4101,9 +4111,10 @@
 1010 $PlcFo:BaseComponent-Class-BaseContactorFo
 1011 Error
 1012 0
+1017 0
 99
 10
-1000 StoDp8
+1000 StoDp182
 1002 StoDp2
 1005
 0
@@ -4167,9 +4178,10 @@
 1010 $PlcMain:BaseComponent-Class-BaseContactor
 1011 IndError
 1012 0
+1017 0
 99
 10
-1000 StoSp9
+1000 StoSp183
 1002 StoSp0
 1005
 0
@@ -4233,9 +4245,10 @@
 1010 $host-W-StoSp0
 1011 IndError
 1012 3
+1017 0
 99
 10
-1000 Strcat1
+1000 Strcat57
 1002 Strcat1
 1005
 0
@@ -4299,9 +4312,10 @@
 1010 $host-W-Strcat1
 1011 IndError
 1012 3
+1017 0
 99
 10
-1000 NameToStr10
+1000 NameToStr184
 1002 NameToStr0
 1005
 0
@@ -4365,9 +4379,10 @@
 1010 $host-W-NameToStr0
 1011 IndError
 1012 3
+1017 0
 99
 10
-1000 GetSp11
+1000 GetSp185
 1002 GetSp0
 1005
 0
@@ -4431,9 +4446,10 @@
 1010 $host-W-GetSp0
 1011 IndError
 1012 3
+1017 0
 99
 10
-1000 StoAp12
+1000 StoAp186
 1002 StoAp1
 1005
 0
@@ -4497,9 +4513,10 @@
 1010 $host-W-StoAp1
 1011 IndError
 1012 3
+1017 0
 99
 10
-1000 GetAp13
+1000 GetAp187
 1002 GetAp0
 1005
 0
@@ -4563,9 +4580,10 @@
 1010 $PlcMain:BaseComponent-Class-BaseContactor
 1011 FbTimeLimit
 1012 3
+1017 0
 99
 10
-1000 StoDp14
+1000 StoDp188
 1002 StoDp1
 1005
 0
@@ -4629,9 +4647,10 @@
 1010 $PlcFo:BaseComponent-Class-BaseContactorFo
 1011 Feedback
 1012 0
+1017 0
 99
 10
-1000 DSup15
+1000 DSup189
 1002 DSup0
 1005
 0
@@ -4696,9 +4715,10 @@
 1010 $host-W-DSup0
 1011 Action
 1012 0
+1017 0
 99
 10
-1000 StoDp16
+1000 StoDp190
 1002 StoDp0
 1005
 0
@@ -4762,9 +4782,10 @@
 1010 $PlcFo:BaseComponent-Class-BaseContactorFo
 1011 Error
 1012 0
+1017 0
 99
 10
-1000 Wait2
+1000 Wait58
 1002 TimeOut
 1005
 0
@@ -4829,9 +4850,10 @@
 1010 $host-W-TimeOut
 1011 Status
 1012 0
+1017 0
 99
 10
-1000 And3
+1000 And59
 1002 And0
 1005
 0
@@ -4895,9 +4917,10 @@
 1010 $host-W-And0
 1011 Status
 1012 0
+1017 0
 99
 10
-1000 GetDi17
+1000 GetDi191
 1002 GetDi0
 1005
 0
@@ -4961,9 +4984,10 @@
 1010 $PlcMain:BaseComponent-Class-BaseContactor.Feedback
 1011 ActualValue
 1012 0
+1017 0
 99
 10
-1000 StoDo18
+1000 StoDo192
 1002 StoDo0
 1005
 0
@@ -5027,9 +5051,10 @@
 1010 $PlcMain:BaseComponent-Class-BaseContactor.Order
 1011 ActualValue
 1012 0
+1017 0
 99
 10
-1000 GetDp19
+1000 GetDp193
 1002 GetDp0
 1005
 0
@@ -5093,9 +5118,10 @@
 1010 $PlcFo:BaseComponent-Class-BaseContactorFo
 1011 On
 1012 0
+1017 0
 99
 10
-1000 Document0
+1000 Document10
 1002 Document0
 1005
 0
@@ -5154,7 +5180,7 @@
 "Class-BaseContactorFo-Code"
 "W"
 ""
-"18-OCT-2005 08:38"
+"18-OCT-2005 13:40"
 ""
 1001
 7
@@ -5164,6 +5190,7 @@
 1010 $host-W-Document0
 1011 On
 1012 3
+1017 0
 99
 11
 1100 1.27
@@ -5632,7 +5659,7 @@
 1.35
 1.35
 1122 0
-1123 0
+1123 6
 1124 
 1125 
 1126 
@@ -6105,8 +6132,8 @@
 1121
 1.2
 1.2
-1122 0
-1123 0
+1122 140611792
+1123 138762856
 1124 
 1125 
 1126 
@@ -6342,8 +6369,8 @@
 1121
 1.05
 1.05
-1122 0
-1123 0
+1122 917506
+1123 1245200
 1124 
 1125 
 1126 
@@ -6579,8 +6606,8 @@
 1121
 1.1
 1.1
-1122 0
-1123 0
+1122 8394904
+1123 8394904
 1124 
 1125 
 1126 
@@ -6816,8 +6843,8 @@
 1121
 1.05
 1.05
-1122 0
-1123 0
+1122 8394936
+1123 8394936
 1124 
 1125 
 1126 
@@ -7053,8 +7080,8 @@
 1121
 1.85
 1.85
-1122 0
-1123 0
+1122 141784504
+1123 120
 1124 
 1125 
 1126 
@@ -7290,8 +7317,8 @@
 1121
 1.35
 1.35
-1122 0
-1123 0
+1122 589825
+1123 720906
 1124 
 1125 
 1126 
@@ -7531,8 +7558,8 @@
 1.35
 1.4
 1.4
-1122 0
-1123 0
+1122 917511
+1123 65530
 1124 
 1125 
 1126 
@@ -7768,8 +7795,8 @@
 1121
 1.35
 1.35
-1122 0
-1123 0
+1122 65532
+1123 917505
 1124 
 1125 
 1126 
@@ -8005,8 +8032,8 @@
 1121
 1.35
 1.35
-1122 0
-1123 0
+1122 851969
+1123 655374
 1124 
 1125 
 1126 
@@ -8242,8 +8269,8 @@
 1121
 1.4
 1.4
-1122 0
-1123 0
+1122 1245190
+1123 65523
 1124 
 1125 
 1126 
@@ -8479,8 +8506,8 @@
 1121
 0.8
 0.8
-1122 0
-1123 0
+1122 8394647
+1123 8394647
 1124 
 1125 
 1126 
@@ -8720,8 +8747,8 @@
 0.8
 1.5
 1.5
-1122 0
-1123 0
+1122 8394679
+1123 8394679
 1124 
 1125 
 1126 

src/wbl/mcomp/src/abb.wb_load

@@ -7570,7 +7570,7 @@ signals are connected to converters digitala input."
       Object Code PlcTemplate 212 12-OCT-2005 12:58:20.00
         Body RtBody 01-JAN-1970 01:00:00.00
         EndBody
-        Body DevBody 18-OCT-2005 09:24:09.96
+        Body DevBody 18-OCT-2005 15:47:18.70
           Buffer PlcProgram
             Attr oid = "ABB:Class-ABB_ACS800MotorAggrFo-Code"
             Attr cid = "pwrb:Class-PlcTemplate"
@@ -7607,8 +7607,8 @@ signals are connected to converters digitala input."
         Object W WindowPlc 213 12-OCT-2005 12:58:20.00
           Body RtBody 01-JAN-1970 01:00:00.00
           EndBody
-          Body DevBody 18-OCT-2005 09:24:09.96
-            Attr Modified = "18-OCT-2005 09:24:09.96"
+          Body DevBody 18-OCT-2005 15:47:18.70
+            Attr Modified = "18-OCT-2005 15:47:18.70"
             Buffer PlcWindow
               Attr oid = "ABB:Class-ABB_ACS800MotorAggrFo-Code-W"
               Attr cid = "pwrb:Class-WindowPlc"
@@ -14652,7 +14652,7 @@ SSAB safetyswitch, Contactor"
       Object Code PlcTemplate 748 12-OCT-2005 12:58:20.00
         Body RtBody 01-JAN-1970 01:00:00.00
         EndBody
-        Body DevBody 18-OCT-2005 09:24:29.14
+        Body DevBody 18-OCT-2005 15:47:39.19
           Buffer PlcProgram
             Attr oid = "ABB:Class-ABB_ACS800MotorAggrSim-Code"
             Attr cid = "pwrb:Class-PlcTemplate"
@@ -14686,8 +14686,8 @@ SSAB safetyswitch, Contactor"
         Object W WindowPlc 749 12-OCT-2005 12:58:20.00
           Body RtBody 01-JAN-1970 01:00:00.00
           EndBody
-          Body DevBody 18-OCT-2005 09:24:29.14
-            Attr Modified = "18-OCT-2005 09:24:29.14"
+          Body DevBody 18-OCT-2005 15:47:39.19
+            Attr Modified = "18-OCT-2005 15:47:39.19"
             Buffer PlcWindow
               Attr oid = "ABB:Class-ABB_ACS800MotorAggrSim-Code-W"
               Attr cid = "pwrb:Class-WindowPlc"

src/wbl/pwrb/src/pwrb_c_carea.wb_load

 ! 
-!  Proview   $Id: pwrb_c_carea.wb_load,v 1.1 2005-10-07 05:57:31 claes Exp $
+!  Proview   $Id: pwrb_c_carea.wb_load,v 1.2 2005-10-21 16:11:24 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -21,7 +21,6 @@
 SObject pwrb:Class
 !/**
 !  @Version 1.0
-!  @Code rt_plc_macro_grafcet.h
 !  @Group Plc,PlcLogic
 !  @Summary Conditional execution of plc-objects in a sub-window
 !  Conditional execution of objects located in an area.
@@ -49,7 +48,7 @@ SObject pwrb:Class
       !/**
       !  Specifies whether the objects in the area  will be executed 
       !  or not. FALSE means no execution and TRUE means execution
-      !  of the objects in the sub-window.
+      !  of the objects in the area.
       !*/
       Object in $Input 1 
         Body SysBody

src/wbl/pwrb/src/pwrb_c_cstoattrrefp.wb_load

 ! 
-!  Proview   $Id: pwrb_c_cstoattrrefp.wb_load,v 1.1 2005-10-18 05:06:22 claes Exp $
+!  Proview   $Id: pwrb_c_cstoattrrefp.wb_load,v 1.2 2005-10-21 16:11:24 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -24,10 +24,10 @@ SObject pwrb:Class
 !/**
 !  @Version 1.0
 !  @Code rt_plc_macro_io.h
-!  @Group Plc,PlcIO
+!  @Group Plc,PlcData
 !  @Summary Conditional storage of attribute reference attribute
 !  Conditional Storage of Attribute Reference attribute.
-!  @image orm_cstoatrrefp_fo.gif
+!  @image orm_cstoattrrefp_fo.gif
 !  
 !  Conditional storage of an attribute reference value (parameter,
 !  input, or output signal) on a specified parameter in a

src/wbl/pwrb/src/pwrb_c_disabled.wb_load

 ! 
-!  Proview   $Id: pwrb_c_disabled.wb_load,v 1.1 2005-10-07 05:57:31 claes Exp $
+!  Proview   $Id: pwrb_c_disabled.wb_load,v 1.2 2005-10-21 16:11:24 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -95,7 +95,7 @@ SObject pwrb:Class
         Attr devbody_annotation = 1
         Attr compmethod = 62
         Attr compindex = 0
-        Attr tracemethod = 1
+        Attr tracemethod = 5
         Attr traceindex = 1
         Attr connectmethod = 27
         Attr executeordermethod = 0

src/wbl/wb/src/wb.wb_load

 ! 
-!  Proview   $Id: wb.wb_load,v 1.5 2005-09-01 14:58:03 claes Exp $
+!  Proview   $Id: wb.wb_load,v 1.6 2005-10-21 16:11:24 claes Exp $
 !  Copyright (C) 2005 SSAB Oxelsund AB.
 !
 !  This program is free software; you can redistribute it and/or 
@@ -819,7 +819,7 @@ SObject wb:
            Attr PageBreak = 2
            Attr ClearRowsPre = 1
            Attr ClearRowsPost = 1
-           Attr TCMarginString = "    "
+           Attr TCMarginString = "  "
            Attr Class = "WindowPlc,WindowCond,WindowOrderact,WindowSubstep"
            Attr P1Parameter = "PrintObjName"
            Attr P1CarriageRet = 1
@@ -836,7 +836,7 @@ SObject wb:
              Attr P1ColumnHeader = "Signals"
              Attr P1MarginString = "    "
              Attr P1CarriageRet = 1
-             Attr P1SizeTabs = 10
+             Attr P1SizeTabs = -1
            EndBody
          EndObject
        EndObject
@@ -856,7 +856,7 @@ SObject wb:
          Attr Class = "$NodeHier,$LibHier,$PlantHier"
          Attr P1Parameter = "PrintObjName"
          Attr P1CarriageRet = 1
-         Attr P1SizeTabs = 6
+         Attr P1SizeTabs = -1
        EndBody
        Object Signals ListDescriptor
          Body DevBody
@@ -865,21 +865,21 @@ SObject wb:
            Attr ClearRowsPre = 1
            Attr Class = "Di,Do,Dv,Ai,Ao,Av,Co,Po,Ii,Io,Iv"
            Attr P1Parameter = "PrintObjName"
-           Attr P1MarginString = "    "
+           Attr P1MarginString = "  "
            Attr P1CarriageRet = 1
-           Attr P1SizeTabs = 10
-          Attr P1Segments = 1
+           Attr P1SizeTabs = -1
+           Attr P1Segments = 1
          EndBody
          Object CrossRef ListDescriptor
            Body DevBody
              Attr Crossreference = 1
              Attr AlphaOrder = 1
              Attr P1Parameter = "PrintObjName"
-             Attr P1MarginString = "                                 "
-             Attr P1SizeTabs = 13
+             Attr P1MarginString = "    "
+             Attr P1SizeTabs = -1
              Attr P2Parameter = "PrintObjClass"
              Attr P2CarriageRet = 1
-             Attr P2SizeTabs = 2
+             Attr P2SizeTabs = -1
            EndBody
          EndObject
        EndObject
@@ -898,18 +898,18 @@ SObject wb:
          Attr ClearRowsPost = 1
          Attr P1Parameter = "PrintObjName"
          Attr P1CarriageRet = 1
-         Attr P1SizeTabs = 6
+         Attr P1SizeTabs = -1
        EndBody
        Object CrossRef ListDescriptor
          Body DevBody
            Attr Crossreference = 1
            Attr AlphaOrder = 1
            Attr P1Parameter = "PrintObjName"
-           Attr P1MarginString = "                                 "
+           Attr P1MarginString = "    "
            Attr P1SizeTabs = 13
            Attr P2Parameter = "PrintObjClass"
            Attr P2CarriageRet = 1
-           Attr P2SizeTabs = 2
+           Attr P2SizeTabs = -1
          EndBody
        EndObject
      EndObject
@@ -930,7 +930,7 @@ SObject wb:
            Attr P1Parameter = "PrintObjName"
            Attr P1MarginString = "_Obj_ "
            Attr P1CarriageRet = 1
-           Attr P1SizeTabs = 8
+           Attr P1SizeTabs = -1
            Attr P2Parameter = "Code"
            Attr P2CarriageRet = 1
          EndBody
@@ -944,7 +944,7 @@ SObject wb:
            Attr P1Parameter = "PrintObjName"
            Attr P1MarginString = "_Obj_ "
            Attr P1CarriageRet = 1
-           Attr P1SizeTabs = 8
+           Attr P1SizeTabs = -1
            Attr P2Parameter = "Expr"
            Attr P2CarriageRet = 1
          EndBody

wb/lib/wb/src/wb_admin_command.cpp

 /* 
- * Proview   $Id: wb_admin_command.cpp,v 1.4 2005-09-06 10:43:30 claes Exp $
+ * Proview   $Id: wb_admin_command.cpp,v 1.5 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -139,12 +139,12 @@ static int	admin_login_func(	void		*client_data,
     return 1;
   }
 
-  if ( EVEN( dcli_get_qualifier( "dcli_arg1", arg1_str)))
+  if ( EVEN( dcli_get_qualifier( "dcli_arg1", arg1_str, sizeof(arg1_str))))
   {
     admin->message('E',"Username and password required");
     return 1;
   }
-  if ( EVEN( dcli_get_qualifier( "dcli_arg2", arg2_str)))
+  if ( EVEN( dcli_get_qualifier( "dcli_arg2", arg2_str, sizeof(arg2_str))))
   {
     admin->message('E',"Username and password required");
     return 1;
@@ -187,7 +187,7 @@ static int	admin_show_func(void		*client_data,
   char	arg1_str[80];
   int	arg1_sts;
 
-  arg1_sts = dcli_get_qualifier( "dcli_arg1", arg1_str);
+  arg1_sts = dcli_get_qualifier( "dcli_arg1", arg1_str, sizeof(arg1_str));
 
   if ( strncmp( arg1_str, "VERSION", strlen( arg1_str)) == 0)
   {

wb/lib/wb/src/wb_attribute.cpp

 /* 
- * Proview   $Id: wb_attribute.cpp,v 1.34 2005-10-07 05:57:28 claes Exp $
+ * Proview   $Id: wb_attribute.cpp,v 1.35 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -718,7 +718,7 @@ const char *wb_attribute::attrName() const
 {
   check();
 
-  static char str[200];
+  static pwr_tAName str;
   
   if ( m_adrep) {
     strcpy( str, m_adrep->subName());

wb/lib/wb/src/wb_erep.cpp

 /* 
- * Proview   $Id: wb_erep.cpp,v 1.39 2005-09-06 10:43:31 claes Exp $
+ * Proview   $Id: wb_erep.cpp,v 1.40 2005-10-21 16:11:22 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -388,9 +388,9 @@ void wb_erep::load( pwr_tStatus *sts, char *db)
     loadMeta( sts, db);
     bindMethods();
     loadLocalWb( sts);
-    wb_vrepref *vrep = new wb_vrepref( this, ldh_cPlcConnectVolume);
+    wb_vrepref *vrep = new wb_vrepref( this, ldh_cPlcMainVolume);
     addExtern( sts, vrep);
-    vrep = new wb_vrepref( this, ldh_cPlcHostVolume);
+    vrep = new wb_vrepref( this, ldh_cPlcFoVolume);
     addExtern( sts, vrep);
     vrep = new wb_vrepref( this, ldh_cIoConnectVolume);
     addExtern( sts, vrep);
@@ -403,9 +403,9 @@ void wb_erep::load( pwr_tStatus *sts, char *db)
   bindMethods();
   loadLocalWb( sts);
 
-  wb_vrepref *vrep = new wb_vrepref( this, ldh_cPlcConnectVolume);
+  wb_vrepref *vrep = new wb_vrepref( this, ldh_cPlcMainVolume);
   addExtern( sts, vrep);
-  vrep = new wb_vrepref( this, ldh_cPlcHostVolume);
+  vrep = new wb_vrepref( this, ldh_cPlcFoVolume);
   addExtern( sts, vrep);
   vrep = new wb_vrepref( this, ldh_cIoConnectVolume);
   addExtern( sts, vrep);
@@ -965,10 +965,10 @@ void wb_erep::setRefMerep( wb_merep *merep)
   pwr_tStatus sts;
   m_ref_merep_occupied = true;
 
-  wb_vrepref *vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcConnectVolume);
+  wb_vrepref *vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcMainVolume);
   if ( ODD(sts))
     vrepref->setMerep( merep);
-  vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcHostVolume);
+  vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcFoVolume);
   if ( ODD(sts))
     vrepref->setMerep( merep);
   vrepref = (wb_vrepref *) volume( &sts, ldh_cIoConnectVolume);
@@ -981,10 +981,10 @@ void wb_erep::resetRefMerep()
   pwr_tStatus sts;
   m_ref_merep_occupied = false;
 
-  wb_vrepref *vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcConnectVolume);
+  wb_vrepref *vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcMainVolume);
   if ( ODD(sts))
     vrepref->setMerep( m_merep);
-  vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcHostVolume);
+  vrepref = (wb_vrepref *) volume( &sts, ldh_cPlcFoVolume);
   if ( ODD(sts))
     vrepref->setMerep( m_merep);
   vrepref = (wb_vrepref *) volume( &sts, ldh_cIoConnectVolume);