Skip to content

P
proview
Commit 1010e4f0 authored by claes's avatar claes
Browse files
Options

Newattribute flag set to indicate new object

parent f0242605
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 3 deletions
wb/lib/wb/src/wb_vrepmem.cpp
View file @ 1010e4f0
/*
* Proview $Id: wb_vrepmem.cpp,v 1.23 2006-05-24 15:00:41 claes Exp $
* Proview $Id: wb_vrepmem.cpp,v 1.24 2007-09-19 15:18:34 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -742,6 +742,7 @@ wb_orep *wb_vrepmem::createObject(pwr_tStatus *sts, wb_cdef cdef, wb_destination
memo->m_cid = cdef.cid();
memo->m_flags = cdef.flags();
memo->m_ohtime = time;
memo->m_created = 1;
memo->rbody_size = cdef.size( pwr_eBix_rt);
if ( memo->rbody_size) {
memo->m_rbtime = time;
......@@ -896,6 +897,7 @@ wb_orep *wb_vrepmem::copyObject(pwr_tStatus *sts, const wb_orep *orep, wb_destin
memo->m_oid.vid = m_vid;
memo->m_cid = orep->cid();
memo->m_ohtime = time;
memo->m_created = 1;
wb_attribute rbody;
rbody = wb_attribute( LDH__SUCCESS, (wb_orep *)orep, "RtBody");
......@@ -1880,6 +1882,10 @@ bool wb_vrepmem::commit(pwr_tStatus *sts)
{
pwr_tCmd cmd;
if ( m_classeditor) {
classeditorCommit();
}
// Play safe and save the previous file...
sprintf( cmd, "pwrp_env.sh save file %s", m_filename);
system( cmd);
......@@ -1948,6 +1954,73 @@ bool wb_vrepmem::classeditorCheck( ldh_eDest dest_code, mem_object *dest, pwr_tC
return false;
}
if ( fth) {
switch ( fth->m_cid) {
case pwr_eClass_ObjBodyDef:
switch ( cid) {
case pwr_eClass_Param:
case pwr_eClass_Intern:
case pwr_eClass_Input:
case pwr_eClass_Output:
case pwr_eClass_ObjXRef:
case pwr_eClass_AttrXRef:
case pwr_eClass_Buffer:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_ClassDef:
switch ( cid) {
case pwr_eClass_ObjBodyDef:
case pwr_eClass_GraphPlcNode:
case pwr_eClass_GraphPlcConnection:
case pwr_eClass_GraphPlcWindow:
case pwr_eClass_GraphPlcProgram:
case pwr_eClass_RtMenu:
case pwr_eClass_Menu:
case pwr_eClass_DbCallBack:
case pwr_cClass_PlcTemplate:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_ClassHier:
switch ( cid) {
case pwr_eClass_ClassDef:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_TypeHier:
switch ( cid) {
case pwr_eClass_Type:
case pwr_eClass_TypeDef:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_TypeDef:
switch ( cid) {
case pwr_eClass_Bit:
case pwr_eClass_Value:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
default: ;
}
}
switch ( cid) {
case pwr_eClass_ClassHier: {
// Top object, named Class
......@@ -2164,6 +2237,73 @@ bool wb_vrepmem::classeditorCheckMove( mem_object *memo, ldh_eDest dest_code,
return false;
}
if ( fth) {
switch ( fth->m_cid) {
case pwr_eClass_ObjBodyDef:
switch ( memo->m_cid) {
case pwr_eClass_Param:
case pwr_eClass_Intern:
case pwr_eClass_Input:
case pwr_eClass_Output:
case pwr_eClass_ObjXRef:
case pwr_eClass_AttrXRef:
case pwr_eClass_Buffer:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_ClassDef:
switch ( memo->m_cid) {
case pwr_eClass_ObjBodyDef:
case pwr_eClass_GraphPlcNode:
case pwr_eClass_GraphPlcConnection:
case pwr_eClass_GraphPlcWindow:
case pwr_eClass_GraphPlcProgram:
case pwr_eClass_RtMenu:
case pwr_eClass_Menu:
case pwr_eClass_DbCallBack:
case pwr_cClass_PlcTemplate:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_ClassHier:
switch ( memo->m_cid) {
case pwr_eClass_ClassDef:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_TypeHier:
switch ( memo->m_cid) {
case pwr_eClass_Type:
case pwr_eClass_TypeDef:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
case pwr_eClass_TypeDef:
switch ( memo->m_cid) {
case pwr_eClass_Bit:
case pwr_eClass_Value:
break;
default:
*sts = LDH__CLASSMISPLACED;
return false;
}
break;
default: ;
}
}
switch ( memo->m_cid) {
case pwr_eClass_ClassHier:
case pwr_eClass_TypeHier: {
......@@ -2203,6 +2343,36 @@ bool wb_vrepmem::classeditorCheckMove( mem_object *memo, ldh_eDest dest_code,
return true;
}
void wb_vrepmem::classeditorCommit()
{
// Set 'newattribute' bit in flag in $Attribute objects to indicate that
// template object should be updated with defaultvalues.
if ( !root_object)
return;
for ( mem_object *o1 = root_object->fch; o1; o1 = o1->fws) {
for ( mem_object *o2 = o1->fch; o2; o2 = o2->fws) {
for ( mem_object *o3 = o2->fch; o3; o3 = o3->fws) {
switch ( o3->m_cid) {
case pwr_eClass_Param:
if ( o3->m_created)
((pwr_sParam *)o3->rbody)->Info.Flags |= PWR_MASK_NEWATTRIBUTE;
else
((pwr_sParam *)o3->rbody)->Info.Flags &= ~PWR_MASK_NEWATTRIBUTE;
break;
case pwr_eClass_Intern:
if ( o3->m_created)
((pwr_sIntern *)o3->rbody)->Info.Flags |= PWR_MASK_NEWATTRIBUTE;
else
((pwr_sIntern *)o3->rbody)->Info.Flags &= ~PWR_MASK_NEWATTRIBUTE;
break;
default: ;
}
}
}
}
}
void wb_vrepmem::printPaletteFile()
{
// Print new palette file
......
wb/lib/wb/src/wb_vrepmem.h
View file @ 1010e4f0
/*
* Proview $Id: wb_vrepmem.h,v 1.18 2006-05-11 07:12:20 claes Exp $
* Proview $Id: wb_vrepmem.h,v 1.19 2007-09-19 15:18:34 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -38,7 +38,7 @@ class mem_object
public:
mem_object() : rbody_size(0), dbody_size(0), docblock_size(0), rbody(0), dbody(0),
docblock(0), m_cid(0), m_tid(0), fth(0), bws(0), fws(0), fch(0),
is_built(0)
is_built(0), m_created(0)
{
strcpy( m_name, "");
strcpy( cname, "");
......@@ -186,6 +186,7 @@ class mem_object
pwr_tOid fwsoid;
pwr_tOid fchoid;
int is_built;
int m_created;
pwr_tTime m_ohtime;
pwr_tTime m_rbtime;
pwr_tTime m_dbtime;
......@@ -372,6 +373,7 @@ public:
pwr_tOix *oix, char *name, pwr_tStatus *sts, bool import_paste);
bool classeditorCheckMove( mem_object *memo, ldh_eDest dest_code,
mem_object *dest, pwr_tStatus *sts);
void classeditorCommit();
private:
bool nameCheck( mem_object *memo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7