cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwUi,cwIo,cwUiTest.cpp,html/uiTest/js/ui.js,html/uiTest/ui.cfg : Added 'string_disp' type.

Browse Source
This commit is contained in:
kevin 2021-12-27 16:48:58 -05:00
parent ef4c937c6a
commit babda9b32d
7 changed files with 145 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cwIo.cpp
View File

@ -2769,6 +2769,24 @@ cw::rc_t cw::io::uiCreateOption( handle_t h, unsigned& uuIdRef, unsigned par
return rc;
}
cw::rc_t cw::io::uiCreateStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title )
{
rc_t rc;
ui::handle_t uiH;
if((rc = _handleToUiHandle(h,uiH)) == kOkRC )
rc = ui::createStrDisplay(uiH,uuIdRef,parentUuId,eleName,appId,chanId,clas,title);
return rc;
}
cw::rc_t cw::io::uiCreateStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title, const char* value )
{
rc_t rc;
ui::handle_t uiH;
if((rc = _handleToUiHandle(h,uiH)) == kOkRC )
rc = ui::createStrDisplay(uiH,uuIdRef,parentUuId,eleName,appId,chanId,clas,title,value);
return rc;
}
cw::rc_t cw::io::uiCreateStr( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title )
{
rc_t rc;

3
cwIo.h
View File

@ -303,6 +303,9 @@ namespace cw
rc_t uiCreateSelect( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t uiCreateOption( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t uiCreateStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t uiCreateStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title, const char* value );
rc_t uiCreateStr( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t uiCreateStr( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title, const char* value );

9
cwUi.cpp
View File

@ -39,6 +39,7 @@ namespace cw
{ "check", false },
{ "select", false },
{ "option", false },
{ "str_disp", false },
{ "string", false },
{ "numb_disp", false },
{ "number", false },
@ -1254,7 +1255,7 @@ unsigned cw::ui::parentAndAppIdToUuId( handle_t h, unsigned parentAppId, unsigne
for(unsigned i=0; i<p->eleN; ++i)
if( p->eleA[i] != nullptr )
if(((p->eleA[i]->phys_parent==nullptr && parentAppId==kRootAppId) ||
(p->eleA[i]->logical_parent->appId==parentAppId))
(p->eleA[i]->logical_parent!=nullptr && p->eleA[i]->logical_parent->appId==parentAppId))
&& p->eleA[i]->appId == appId )
return p->eleA[i]->uuId;
return kInvalidId;
@ -1395,6 +1396,12 @@ cw::rc_t cw::ui::createSelect( handle_t h, unsigned& uuIdRef, unsigned parentUuI
cw::rc_t cw::ui::createOption( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title )
{ return _createOneEle( _handleToPtr(h), uuIdRef, "option", kInvalidId, parentUuId, eleName, appId, chanId, clas, title ); }
cw::rc_t cw::ui::createStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title )
{ return _createOneEle( _handleToPtr(h), uuIdRef, "str_disp", kInvalidId, parentUuId, eleName, appId, chanId, clas, title ); }
cw::rc_t cw::ui::createStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title, const char* value )
{ return _createOneEle( _handleToPtr(h), uuIdRef, "str_disp", kInvalidId, parentUuId, eleName, appId, chanId, clas, title, "value", value ); }
cw::rc_t cw::ui::createStr( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title )
{ return _createOneEle( _handleToPtr(h), uuIdRef, "string", kInvalidId, parentUuId, eleName, appId, chanId, clas, title ); }

2
cwUi.h
View File

@ -104,6 +104,8 @@ namespace cw
rc_t createSelect( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t createOption( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t createStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t createStrDisplay( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title, const char* value );
rc_t createStr( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title );
rc_t createStr( handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title, const char* value );
rc_t createNumbDisplay(handle_t h, unsigned& uuIdRef, unsigned parentUuId, const char* eleName, unsigned appId, unsigned chanId, const char* clas, const char* title, unsigned decPl );

22
cwUiTest.cpp
View File

@ -70,7 +70,8 @@ namespace cw
kOpt1Id,
kOpt2Id,
kOpt3Id,
kListId
kListId,
kStatusId
};
rc_t uiTestCreateUi( ui_test_t* p, unsigned wsSessId=kInvalidId )
@ -251,10 +252,22 @@ namespace cw
break;
case kSelId:
printf("sel: %i\n",v->u.i);
p->appSelId = v->u.i;
{
printf("sel: %i\n",v->u.i);
p->appSelId = v->u.i;
handle_t uiH = srv::uiHandle(p->wsUiSrvH);
unsigned uuId = parentAndAppIdToUuId( uiH, kPanelDivId, kStatusId );
const unsigned sN = 32;
char s[ sN ];
snprintf(s,sN,"sel:%i",v->u.i);
sendValueString( uiH, uuId, s );
}
break;
case kProgressId:
break;
default:
cwLogWarning("Unhandled value message: uuid:%i appId:%i\n",uuId,appId);
}
@ -383,7 +396,8 @@ cw::rc_t cw::ui::test( const object_t* cfg )
{ kSelId, kOpt2Id, "myOpt2" },
{ kSelId, kOpt3Id, "myOpt3" },
{ kPanelDivId, kUiRptBtnId, "uiRptBtnId" },
{ kPanelDivId, kListId, "myListId" }
{ kPanelDivId, kListId, "myListId" },
{ kPanelDivId, kStatusId, "status" }
};

97
html/uiTest/js/ui.js
View File

@ -244,6 +244,13 @@ function ui_send_click( ele )
ws_send("click " + ele.id )
}
function ui_send_select( ele, selectedFl )
{
let selected_value = selectedFl ? 1 : 0;
ws_send("select " + ele.id + " " + selected_value )
}
function ui_send_echo( ele )
{
@ -524,6 +531,37 @@ function _ui_on_focus( ele )
_focusVal = ele.value;
}
function ui_set_str_display( ele_id, value )
{
var ele = dom_id_to_ele(ele_id);
if( typeof(value)=="string")
{
ele.innerHTML = value;
}
}
function ui_create_str_display( parent_ele, d )
{
var ele = ui_create_ctl( parent_ele, "label", d.title, d, "uiStringDisp" );
if( ele != null )
{
if( d.hasOwnProperty('value') )
{
ui_set_str_display(ele.id, d.value);
}
else
{
ui_send_echo(ele);
}
}
return ele;
}
function _ui_on_string_blur( ele )
{
if( ele.id == _focusId )
@ -843,6 +881,10 @@ function ui_set_value( d )
case "option":
break;
case "str_disp":
ui_set_str_display(ele.id,d.value);
break
case "string":
ele.value = d.value
break;
@ -888,7 +930,8 @@ function _ui_modify_class( ele, classLabelArg, enableFl )
function ui_set_select( ele, enableFl )
{
_ui_modify_class("uiSelected")
_ui_modify_class(ele,"uiSelected",enableFl)
ui_send_select( ele, enableFl )
}
@ -927,6 +970,28 @@ function ui_set_enable( ele, enableFl )
ele.disabled = !enableFl
}
function ui_set_order_key(ele, orderKey)
{
let parent = ele.parentElement // get the parent of the element to reorder
ele = parent.removeChild( ele ) // remove the element to reorder from the parent list
ele.order = orderKey
let i = 0;
for(i=0; i<parent.children.length; ++i)
{
if( parent.children[i].hasOwnProperty("order") && parent.children[i].order >= orderKey)
{
parent.insertBefore( ele, parent.children[i] )
break
}
}
// no element was found greater than this element ....
if( i == parent.children.length )
parent.appendChild(ele) // ... insert the element at the end of the child lsit
}
function ui_set( d )
{
@ -949,19 +1014,23 @@ function ui_set( d )
break;
case "select":
ui_set_select(ele,d.enableFl)
ui_set_select(ele,d.value)
break
case "clickable":
ui_set_clickable(ele,d.enableFl)
ui_set_clickable(ele,d.value)
break
case "visible":
ui_set_visible(ele,d.enableFl)
ui_set_visible(ele,d.value)
break
case "enable":
ui_set_enable(ele,d.enableFl)
ui_set_enable(ele,d.value)
break
case "order":
ui_set_order_key(ele,d.value)
break
}
@ -1020,6 +1089,10 @@ function ui_create( d )
ele = ui_create_option( parent_ele, d );
break;
case "str_disp":
ele = ui_create_str_display( parent_ele, d );
break;
case "string":
ele = ui_create_string( parent_ele, d );
break;
@ -1060,6 +1133,16 @@ function ui_create( d )
}
}
function ui_destroy( d )
{
if( typeof(d.uuId) == "number" )
d.uuId = d.uuId.toString()
var ele = dom_id_to_ele(d.uuId)
if( ele != null )
ele.parentElement.removeChild( ele )
}
@ -1082,6 +1165,10 @@ function ws_on_msg( jsonMsg )
ui_create( d )
break;
case 'destroy':
ui_destroy( d )
break
case 'value':
ui_set_value( d )
break;

5
html/uiTest/ui.cfg
View File

@ -35,8 +35,11 @@
row: {
list:{ name: myListId, title:"My List", clickable: 1 },
list: { name: myListId, title:"My List", clickable: 1 },
},
row: {
str_disp: { name: status, title:"Status", value:"Set w/ 'Select'." }
}
},