Merge branch 'master' of pwrcvs:/data1/git/pwr

profibus/lib/wb/gtk/wb_c_pndevice_gtk.cpp

@@ -176,7 +176,7 @@ static pwr_tStatus CopyDevice (
   memset( aref, 0, sizeof(aref));
   aref[0] = ip->Pointed;
   sts = ldh_CopyObjectTrees( ip->PointedSession, aref, ip->Pointed.Objid,
-			     ldh_eDest_After, 0, 1, 0);
+			     ldh_eDest_After, 0, 1, 0, 0);
   if ( EVEN(sts)) return sts;
 
   sts = ldh_GetNextSibling( ip->PointedSession, ip->Pointed.Objid, &oid);

src/exp/inc/src/pwr_version.h

@@ -88,10 +88,10 @@
 # define SET_VERSION(a, b, c, d)  ((pwr_tVersion)((a << 24) + (a << 16) + (a << 8) + a))		  
 #endif
 
-#define pwrv_cBuildTimeStr       "10-MAY-2012 09:00:00"
+#define pwrv_cBuildTimeStr       "12-SEP-2012 12:00:00"
 
-#define pwrv_cPwrVersionStr      "V4.8.5"
-#define pwrv_cPwrVersion         SET_VERSION('V', 4, 8, 5)
+#define pwrv_cPwrVersionStr      "V4.8.6"
+#define pwrv_cPwrVersion         SET_VERSION('V', 4, 8, 6)
 
 #define pwrv_cWbdbVersionShortStr "V48"
 #define pwrv_cPwrCopyright	 "Copyright (C) 2005-2012 SSAB EMEA AB"

src/tools/pkg/deb/pwr/control

 Package: pwr48
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386
@@ -40,3 +40,10 @@ Description: Proview development and runtime environment package
    - Display of invert, test and conversion for signals and channels in rt_xtt.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and faster scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/deb/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr48 (>= 4.8.5-1)
+Depends: pwr48 (>= 4.8.6-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  Proview Demo Project

src/tools/pkg/deb/pwrrt/control

 Package: pwrrt
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386
@@ -33,3 +33,10 @@ Description:
    - Display of invert, test and conversion for signals and channels in rt_xtt.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and faster scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/deb/pwrsev/control

 Package: pwrsev
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386

src/tools/pkg/deb_armel/pwrrt/control

@@ -2,7 +2,7 @@ Source: pwrrt
 Section: unknown
 Priority: extra
 Build-Depends: 
-Standards-Version: 4.8.4-1
+Standards-Version: 4.8.6-1
 Maintainer: Claes Sjofors <claes.sjofors@proview.se>
 Homepage: <proview.se>
 
@@ -32,3 +32,15 @@ Description: Proview runtime environment
    - Report server.
  4.8.4-1
    - Buffer input and output channels and signals.
+ 4.8.5-1
+   - Support for several plc processes.
+   - Display of invert, test and conversion for signals and channels in rt_xtt.
+   - Ge pie chart and bar chart.
+   - Trend curves with larger buffers and faster scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/deb_x86_64/pwr/control

 Package: pwr48
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: amd64
@@ -40,3 +40,10 @@ Description: Proview development and runtime environment package
    - Display of invert, test and conversion for signals and channels in rt_xtt.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and faster scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/deb_x86_64/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: pwr48 (>= 4.8.5-1)
+Depends: pwr48 (>= 4.8.6-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  Proview Demo Project

src/tools/pkg/deb_x86_64/pwrrt/control

 Package: pwrrt
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: amd64
@@ -33,3 +33,10 @@ Description:
    - Display of invert, test and conversion for signals and channels in rt_xtt.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and faster scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/deb_x86_64/pwrsev/control

 Package: pwrsev
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: amd64

src/tools/pkg/openbsd/pwr/control

 Package: pwr48
-Version: 4.8.3
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386
@@ -32,3 +32,20 @@ Description: Proview development and runtime environment package
    - Support for USB joystick.
  4.8.3-1
    - Support for OpenBSD.
+ 4.8.3-1
+   - Post server for sending emails and sms.
+   - Report server.
+ 4.8.4-1
+   - Buffer input and output channels and signals.
+ 4.8.5-1
+   - Support for several plc processes.
+   - Display of invert, test and conversion for signals and channels in rt_xtt.
+   - Ge pie chart and bar chart.
+   - Trend curves with larger buffers and faster scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/openbsd/pwrrt/control

 Package: pwrrt
-Version: 4.8.2-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386
@@ -23,3 +23,20 @@ Description:
    - Support for Hilscher cifX Profinet Controller.
    - UDP communication configured with IO objects.
    - Support for USB joystick.
+ 4.8.3-1
+   - Post server for sending emails and sms.
+   - Report server.
+ 4.8.4-1
+   - Buffer input and output channels and signals.
+ 4.8.5-1
+   - Support for several plc processes.
+   - Display of invert, test and conversion for signals and channels in rt_xtt.
+   - Ge pie chart and bar chart.
+   - Trend curves with larger buffers and faster scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/ubu/pwr/control

@@ -3,7 +3,7 @@ Section: devel
 Package: pwr48
 Priority: optional
 Maintainer: Proview <postmaster@proview.se>
-Version: 4.8.5-1
+Version: 4.8.6-1
 Architecture: i386
 Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu6), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), libdb5.1++ (>=5.1.25-11build1), libmysql++3 (>= 3.1.0-2), g++ (>= 4:4.6.1-2ubuntu5), xfonts-100dpi
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
@@ -43,3 +43,10 @@ Description: Proview development and runtime environment package
    - Support for several plc processes.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and shorter scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/ubu/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr48 (>= 4.8.5-1)
+Depends: pwr48 (>= 4.8.6-1)
 Replaces:
 Maintainer: Proview <postmaster@proview.se>
 Homepage: http://www.proview.se

src/tools/pkg/ubu/pwrrt/control

 Package: pwrrt
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386
@@ -30,3 +30,10 @@ Description:
    - Support for several plc processes.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and shorter scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/ubu/pwrsev/control

 Package: pwrsev
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: i386

src/tools/pkg/ubu_x86_64/pwr/control

@@ -3,7 +3,7 @@ Section: devel
 Package: pwr48
 Priority: optional
 Maintainer: Proview <postmaster@proview.se>
-Version: 4.8.5-1
+Version: 4.8.6-1
 Architecture: amd64
 Depends: libc6 (>= 2.15-0ubuntu10), libgtk2.0-0 (>= 2.24.10-0ubuntu6), libasound2 (>= 1.0.25-1ubuntu10), libdb5.1 (>=5.1.25-11build1), libdb5.1++ (>=5.1.25-11build1), libmysql++3 (>= 3.1.0-2), g++ (>= 4:4.6.1-2ubuntu5), xfonts-100dpi
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
@@ -43,3 +43,10 @@ Description: Proview development and runtime environment package
    - Support for several plc processes.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and shorter scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/ubu_x86_64/pwrdemo/control

 Package: pwrdemo48
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: pwr48 (>= 4.8.5-1)
+Depends: pwr48 (>= 4.8.6-1)
 Replaces:
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package

src/tools/pkg/ubu_x86_64/pwrrt/control

 Package: pwrrt
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: amd64
@@ -30,3 +30,10 @@ Description:
    - Support for several plc processes.
    - Ge pie chart and bar chart.
    - Trend curves with larger buffers and shorter scantimes. Snapshot function.
+ 4.8.6-1
+   - Trend and fast curves in web interface.
+   - Pie chart and bar chart in web interface.
+   - Display values as hex, octal or binary in xtt.
+   - Configure operator log in OpPlace object.
+   - Plc, several processes, handling of error log and process status.
+   - DataArithmL with 8191 characters added.

src/tools/pkg/ubu_x86_64/pwrsev/control

 Package: pwrsev
-Version: 4.8.5-1
+Version: 4.8.6-1
 Section: base
 Priority: optional
 Architecture: amd64

xtt/lib/flow/motif/flow_x.c

-/** 
+ /** 
  * Proview   Open Source Process Control.
  * Copyright (C) 2005-2012 SSAB EMEA AB.
  *
@@ -36,10 +36,6 @@
 
 //
 // Interface to Xlib and Xt macros which is compiled with alignment on alpha.
- * Proview   Open Source Process Control.
- * Copyright (C) 2005-2011 SSAB Oxelosund AB.
- *
- * This file is part of Proview.
 // does the #pragma alignment...
 //
 

xtt/lib/glow/motif/glow_draw_xlib.cpp

@@ -1710,7 +1710,7 @@ int GlowDrawXLib::text_cursor( GlowWind *wind, int x, int y, char *text, int len
 
   int width, height, descent;
   get_text_extent( text, pos, gc_type, idx, font_idx,
-			&width, &height, &descent, size);
+		   &width, &height, &descent, size, 0);
 
   if ( w->clip_on)
     set_clip( w, get_gc( this, gc_type, idx));

xtt/lib/xtt/motif/xtt_ge_motif.h

-x/* 
+/* 
  * Proview   Open Source Process Control.
  * Copyright (C) 2005-2012 SSAB EMEA AB.
  *

xtt/lib/xtt/motif/xtt_xattone_motif.cpp

@@ -148,7 +148,7 @@ int XAttOneMotif::change_value( int set_focus)
   sts = gdh_GetObjectInfoAttrref( &aref, aval, sizeof(aval));
   if ( EVEN(sts)) return sts;
 
-  XNav::attrvalue_to_string( atype, atype, &aval, buf, sizeof(buf), &len, NULL);
+  XNav::attrvalue_to_string( atype, atype, &aval, buf, sizeof(buf), &len, NULL, 0);
 
   value = buf;
 

xtt/lib/xtt/motif/xtt_xnav_motif.cpp

@@ -227,7 +227,7 @@ RtTrace *XNavMotif::plctrace_new( pwr_tOid oid, pwr_tStatus *sts)
 
 XAtt *XNavMotif::xatt_new( pwr_tAttrRef *arp, int advanced_user, pwr_tStatus *sts)
 {
-  return new XAttMotif( form_widget, this, arp, advanced_user, 0, sts);
+  return new XAttMotif( form_widget, this, arp, advanced_user, sts);
 }
 
 XCrr *XNavMotif::xcrr_new( pwr_tAttrRef *arp, int advanced_user, pwr_tStatus *sts)