All from pwr46 local

src/doc/prm/src/os_linux/hw_x86/Doxyfile

@@ -543,6 +543,7 @@ INPUT                  = $(pwre_sroot)/doc/prm/src/doxygen.dx \
                          $(pwre_sroot)/lib/rt/src/rt_qcom.h \
                          $(pwre_croot)/nmps/lib/nmps/src/nmps_appl.h \
                          $(pwre_sroot)/lib/rt/src/rt_appl.h \
+                         $(pwre_sroot)/lib/rt/src/rt_appl.cpp \
                          $(pwre_sroot)/lib/co/src/co_time.c \
                          $(pwre_sroot)/lib/co/src/co_cdh.c \
                          $(pwre_sroot)/lib/rt/src/rt_gdh.c \

src/doc/prm/src/os_linux/hw_x86/makefile

@@ -41,7 +41,7 @@ $(clean_html) : clean_%.html : %.html
 $(doc_dir)/prm/index.html : ../../doxygen.dx
 	@ echo "doxygen documentation $(source) $(target)"
 	@ doxygen
-	@ if [ -e latex ]; then \
+	@ if [ "`eval which pdflatex`" != "" ]; then \
 	    ./repl.sh latex/*.tex; \
 	    cd latex; \
 	    make pdf; \
@@ -49,10 +49,10 @@ $(doc_dir)/prm/index.html : ../../doxygen.dx
 	    cp classra__appl.pdf $(pwr_doc)/en_us/; \
 	    cp classrt__appl.pdf $(pwr_doc)/en_us/; \
 	    cd ..; \
-	    rm -r -f latex; \
 	    rm -f repl.sed; \
 	    rm -f repl.tmp; \
-	  fi
+	  fi; \
+	  rm -r -f latex;
 
 
 

src/doc/prm/src/ra_advappl.cpp

@@ -62,7 +62,7 @@ void MyAppl::init( qcom_sQid *qid)
  }
 
  // Create a queue to receive stop and restart events
- if (!qcom_Init(&sts, 0, "rs_appl")) {
+ if (!qcom_Init(&sts, 0, "rs_appl")) {
    errh_Fatal("qcom_Init, %m", sts); 
    errh_SetStatus( PWR__APPLTERM);
    exit(sts);
@@ -70,14 +70,14 @@ void MyAppl::init( qcom_sQid *qid)
 
  qAttr.type = qcom_eQtype_private;
  qAttr.quota = 100;
- if (!qcom_CreateQ(&sts, qid, &qAttr, "events")) {
+ if (!qcom_CreateQ(&sts, qid, &qAttr, "events")) {
    errh_Fatal("qcom_CreateQ, %m", sts);
    errh_SetStatus( PWR__APPLTERM);
    exit(sts);
  } 
 
  qini = qcom_cQini;
- if (!qcom_Bind(&sts, qid, &qini)) {
+ if (!qcom_Bind(&sts, qid, &qini)) {
    errh_Fatal("qcom_Bind(Qini), %m", sts);
    errh_SetStatus( PWR__APPLTERM);
    exit(-1);
@@ -90,7 +90,7 @@ void MyAppl::open()
  pwr_tStatus sts;
 
  // Get configuration object
- sts = gdh_NameToObjid( "Noder-Node-MyAppl", &oid);
+ sts = gdh_NameToObjid( "Noder-Node-MyAppl", &oid);
  if ( EVEN(sts)) throw co_error(sts);
 
  aproc_RegisterObject( oid);
@@ -121,12 +121,12 @@ int main()
  int swap = 0;
  bool first_scan = true;
 
- appl.init( &qid);
+ appl.init( &qid);
 
  try {
    appl.open();
  }
- catch ( co_error& e) {
+ catch ( co_error& e) {
    errh_Error( (char *)e.what().c_str());
    errh_Fatal( "rs_appl aborting");
    errh_SetStatus( PWR__APPLTERM);
@@ -144,21 +144,21 @@ int main()
 
    get.maxSize = sizeof(mp);
    get.data = mp;
-   qcom_Get( &sts, &qid, &get, tmo);
+   qcom_Get( &sts, &qid, &get, tmo);
    if (sts == QCOM__TMO || sts == QCOM__QEMPTY) {
      if ( !swap)
-appl.scan();
+       appl.scan();
    } 
    else {
      ini_mEvent  new_event;
      qcom_sEvent *ep = (qcom_sEvent*) get.data;
 
-     new_event.m  = ep->mask;
-     if (new_event.b.oldPlcStop && !swap) {
+     new_event.m  = ep->mask;
+     if (new_event.b.oldPlcStop && !swap) {
        errh_SetStatus( PWR__APPLRESTART);
        swap = 1;
        appl.close();
-     } else if (new_event.b.swapDone && swap) {
+     } else if (new_event.b.swapDone && swap) {
        swap = 0;
        appl.open();
        errh_SetStatus( PWR__ARUN);

src/lib/rt/src/rt_nmps_lock.h

@@ -20,6 +20,10 @@
 #ifndef	rt_nmps_lock_h
 #define rt_nmps_lock_h
 
+#if defined __cplusplus
+extern "C" {
+#endif
+
 #include "pwr.h"
 #include "rt_sect.h"
 
@@ -33,4 +37,7 @@ void nmps_create_lock( pwr_tStatus *sts);
 void nmps_delete_lock( pwr_tStatus *sts);
 void nmps_unlink_lock( pwr_tStatus *sts);
 
+#if defined __cplusplus
+}
+#endif
 #endif

src/tools/pkg/deb/pwr/control

 Package: pwr46
-Version: 4.6.0-4
+Version: 4.6.0-5
 Section: base
 Priority: optional
 Architecture: i386
@@ -15,3 +15,5 @@ Description: Proview development and runtime environment package
   - Sev: error handling improved.
  4.6.0-4
   - Metric fonts in Ge and Xtt.
+ 4.6.0-5
+  - Wb, Xtt: Problem with insensitive radiobuttons fixed.

src/tools/pkg/deb/pwrdemo/control

 Package: pwrdemo46
-Version: 4.6.0-4
+Version: 4.6.0-5
 Section: base
 Priority: optional
 Architecture: i386

src/tools/pkg/deb/pwrrt/control

 Package: pwrrt
-Version: 4.6.0-4
+Version: 4.6.0-5
 Section: base
 Priority: optional
 Architecture: i386
@@ -15,3 +15,5 @@ Description:
   - Sev: error handling improved.
  4.6.0-4
   - Metric fonts in Ge and Xtt.
+ 4.6.0-5
+  - Wb, Xtt: Problem with insensitive radiobuttons fixed.

src/tools/pkg/deb/pwrsev/control

 Package: pwrsev
-Version: 4.6.0-4
+Version: 4.6.0-5
 Section: base
 Priority: optional
 Architecture: i386

wb/changelog.txt

@@ -117,3 +117,4 @@
 081009 cs  wb        New pages in Configure DirectoryVolume wizard to register a volume and open the database for a volume.
 081009 cs  wb        New script functions CheckSystemGroup, GetNextFreeUserVid, CheckNewVid, CheckNewVolumeName and GetCurrentVolume.
 081110 cs  plc       Bugfix in execute order for Set/Res/Sto objects without input or output connection.
+081218 cs  plc       Bugfix in flow file. Trace data wasn't stored at change of mode from edit to view.
\ No newline at end of file

wb/lib/wb/src/wb_foe.cpp

@@ -71,12 +71,7 @@ void WFoe::activate_save()
   vldh_t_wind	wind;
   vldh_t_node	parent_node;
   int		sts;
-  int 		size;
-  pwr_tOName 	name;
   vldh_t_plc	plc;
-  pwr_tFileName 	fname;
-  char 		classname[80];
-  pwr_tObjid 	classdef;
 
   if ( msg_label_id != 0 ) message( ""); 
 
@@ -98,28 +93,8 @@ void WFoe::activate_save()
     }
   }
   clock_cursor();
-  if ( !classeditor) {
-    sts = gre->set_trace_attributes( 0);
-    sts = gre->save( 0);
-    sts = gre->undelete_reset();
-  }
-  else {
-    sts = ldh_ObjidToName( wind->hw.ldhses, plc->lp.oid,
-			   ldh_eName_Hierarchy, name, sizeof( name), &size); 
-    if ( EVEN(sts)) return;
-    
-    sts = ldh_GetParent( wind->hw.ldhses, plc->lp.oid, &classdef);
-    if ( EVEN(sts)) return;
-
-    sts = ldh_ObjidToName( wind->hw.ldhses, classdef,
-			   ldh_eName_Object, classname, sizeof( classname), &size); 
-    if ( EVEN(sts)) return;
-    cdh_ToLower( classname, classname);
-    sprintf( fname, "$pwrp_load/pwr_%s.flw", classname);
-    sts = gre->set_trace_attributes( name);
-    sts = gre->save( fname);
-    sts = gre->undelete_reset();	  
-  }
+  sts = create_flow();
+  sts = gre->undelete_reset();	  
   disable_ldh_cb();
   sts = vldh_wind_save( gre->wind);
   enable_ldh_cb();
@@ -1399,12 +1374,11 @@ void WFoe::exit_save( WFoe *foe)
     }
   }
   foe->clock_cursor();
+  sts = foe->create_flow();
   foe->disable_ldh_cb();
   sts = vldh_wind_save( foe->gre->wind);
   foe->error_msg( sts);
 	
-  foe->gre->save( 0);
-
   foe->normal_cursor();
   if ( sts == VLDH__PLCNOTSAVED ) {
     foe->msgbox( "Save the plcprogram in the hierarchy editor first");
@@ -3804,7 +3778,7 @@ void WFoe::edit_exit_save( WFoe *foe)
     return;
   }
 
-  foe->gre->save( 0);
+  foe->create_flow();
 	
   /* Change the funktion */
   switch( foe->wanted_function) {
@@ -3888,8 +3862,7 @@ int WFoe::redraw_and_save()
   enable_ldh_cb();
   if ( EVEN(sts)) return sts;
 
-  sts = gre->set_trace_attributes( 0);
-  sts = gre->save( 0);
+  sts = create_flow();
   if ( EVEN(sts)) return sts;
 
   return FOE__SUCCESS;

wb/lib/wb/src/wb_gcg.cpp

@@ -15823,7 +15823,8 @@ static pwr_tStatus gcg_replace_ref( gcg_ctx gcgctx, pwr_sAttrRef *attrref,
 
     attrref->Objid = connect_arp->Objid;
     attrref->Offset += connect_arp->Offset;
-    if ( attrref->Flags.b.Object && (attrref->Offset || attrref->Size < connect_arp->Size)) {
+    if ( attrref->Flags.b.Object && 
+	 (attrref->Offset || ( attrref->Size && attrref->Size < connect_arp->Size))) {
       attrref->Flags.b.Object = 0;
       attrref->Flags.b.ObjectAttr = 1;
     }

xtt/lib/flow/gtk/flow_draw_gtk.cpp

@@ -1160,6 +1160,9 @@ static char *font_string( flow_eDrawType gc_type, double size)
   default:
     sprintf( str, "%s %f", FONTSTR, FONT_SCALE * size);
   }
+  for ( char *s = str; *s; s++)
+    if ( *s == ',')
+      *s = '.';
   return str;
 }
 

xtt/lib/ge/src/ge_dyn.cpp

@@ -4306,6 +4306,9 @@ int GeValueInput::change_value( grow_tObject object, char *text)
 
   db = dyn->parse_attr_name( value_element->attribute, parsed_name, &inverted, 
 			       &attr_type, &attr_size);
+  if ( parsed_name[0] == '&')
+    dyn->graph->get_reference_name( parsed_name, parsed_name);
+
   if ( !annot_size ) {
     pwr_sAttrRef 	ar;
     pwr_tTypeId 	a_type_id;

xtt/lib/ge/src/ge_graph.cpp

@@ -511,7 +511,7 @@ void Graph::open( char *filename)
   grow->grow_setup();
 
   // Set temporary language translation on class graphs
-  if ( strcmp( object_name, "") != 0)
+  // if ( strcmp( object_name, "") != 0)
     grow_EnableEvent( grow->ctx, glow_eEvent_Translate, 
 		      glow_eEventType_CallBack, graph_grow_cb);