Skip to content

P
proview
Commit 70080dce authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Xtt, xttgraph and xttmultiview, array of object and borders added

parent e1da2c8b
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 31 deletions
xtt/lib/xtt/gtk/xtt_multiview_gtk.cpp
View file @ 70080dce
......@@ -284,7 +284,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
case pwr_eMultiViewContentEnum_AlarmList: {
if ( xnav->ev) {
sala[i*rows + j] = (EvAlaGtk *)xnav->ev->open_alarmlist_satellite( "No title",
&lsts, w, h, 0, 0, mv.Action[i*rows+j].Object.Objid, ev_mAlaOptions_Embedded, toplevel);
&lsts, w, h, 0, 0, mv.Action[i*rows+j].Object[0].Objid, ev_mAlaOptions_Embedded, toplevel);
if ( !sala[i*rows + j])
continue;
comp_widget[i*rows + j] = sala[i*rows + j]->get_widget();
......@@ -295,7 +295,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
case pwr_eMultiViewContentEnum_EventList: {
if ( xnav->ev) {
seve[i*rows + j] = (EvEveGtk *)xnav->ev->open_eventlist_satellite( "No title",
&lsts, w, h, 0, 0, mv.Action[i*rows+j].Object.Objid, ev_mAlaOptions_Embedded, toplevel);
&lsts, w, h, 0, 0, mv.Action[i*rows+j].Object[0].Objid, ev_mAlaOptions_Embedded, toplevel);
if ( !seve[i*rows + j])
continue;
comp_widget[i*rows + j] = seve[i*rows + j]->get_widget();
......@@ -306,22 +306,41 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
case pwr_eMultiViewContentEnum_Graph:
case pwr_eMultiViewContentEnum_ObjectGraph: {
char *objectname_p = 0;
pwr_tAName objectname;
char objectname[800];
double borders[4];
double *bordersp = 0;
char *s;
if ( !cdh_ObjidIsNull(mv.Action[i*rows+j].Object.Objid)) {
lsts = gdh_AttrrefToName( &mv.Action[i*rows+j].Object, objectname, sizeof(objectname),
for ( int k = 0; k < 4; k++) {
pwr_tAName oname;
if ( cdh_ObjidIsNull(mv.Action[i*rows+j].Object[k].Objid))
break;
lsts = gdh_AttrrefToName( &mv.Action[i*rows+j].Object[k], oname, sizeof(oname),
cdh_mName_volumeStrict);
if ( ODD(lsts))
objectname_p = objectname;
else
objectname_p = 0;
if ( EVEN(lsts))
break;
if ( k == 0)
strncpy( objectname, oname, sizeof(objectname));
else {
strncat( objectname, ",", sizeof(objectname));
strncat( objectname, oname, sizeof(objectname));
}
objectname_p = objectname;
}
if ( mv.Action[i*rows+j].Borders[0] != 0 || mv.Action[i*rows+j].Borders[1] != 0 ||
mv.Action[i*rows+j].Borders[2] != 0 || mv.Action[i*rows+j].Borders[3] != 0) {
for ( int k = 0; k < 4; k++)
borders[k] = mv.Action[i*rows+j].Borders[k];
bordersp = borders;
}
gectx[i*rows + j] = new XttGeGtk( toplevel, this, "No title",
graph_name, scrollbar, menu, 0, w, h, mv_x, mv_y,
1.0, objectname_p, 0, 0,
ge_mOptions_Embedded, 0, 0,
ge_mOptions_Embedded, 0, bordersp,
multiview_ge_command_cb, multiview_ge_get_current_objects_cb,
multiview_ge_is_authorized_cb);
......@@ -396,7 +415,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
pwr_tAttrRef arefv[2];
int skip = 0;
lsts = gdh_GetAttrRefTid( &mv.Action[i*rows+j].Object, &classid);
lsts = gdh_GetAttrRefTid( &mv.Action[i*rows+j].Object[0], &classid);
if (EVEN(lsts)) break;
switch ( classid) {
......@@ -405,7 +424,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
break;
case pwr_cClass_PlotGroup:
plotgroup_found = 1;
plotgroup = mv.Action[i*rows+j].Object;
plotgroup = mv.Action[i*rows+j].Object[0];
arefv[0] = plotgroup;
break;
default:
......@@ -420,7 +439,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
0, &plotgroup, w, h, (unsigned int)curve_mOptions_Embedded, sts);
}
else {
arefv[0] = mv.Action[i*rows+j].Object;
arefv[0] = mv.Action[i*rows+j].Object[0];
memset( &arefv[1], 0, sizeof(arefv[0]));
trend[i*rows + j] = new XttTrendGtk( this, toplevel, (char *)"No title", &widget,
arefv, 0, w, h, (unsigned int)curve_mOptions_Embedded, sts);
......@@ -464,13 +483,13 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
pwr_tCid classid;
int skip = 0;
if ( cdh_ObjidIsNull(mv.Action[i*rows+j].Object.Objid))
if ( cdh_ObjidIsNull(mv.Action[i*rows+j].Object[0].Objid))
break;
GtkWidget *widget;
pwr_tAttrRef arefv[2];
pwr_tAttrRef plotgroup;
arefv[0] = mv.Action[i*rows+j].Object;
arefv[0] = mv.Action[i*rows+j].Object[0];
memset( &arefv[1], 0, sizeof(arefv[0]));
......@@ -484,7 +503,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
sevHistObjectFound = true;
break;
case pwr_cClass_PlotGroup:
plotgroup = mv.Action[i*rows+j].Object;
plotgroup = mv.Action[i*rows+j].Object[0];
plotgroup_found = 1;
break;
default:
......@@ -557,7 +576,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
}
}
else if ( sevHistObjectFound ) {
lsts = gdh_ArefANameToAref( &mv.Action[i*rows+j].Object, "Object", &attr_aref);
lsts = gdh_ArefANameToAref( &mv.Action[i*rows+j].Object[0], "Object", &attr_aref);
if ( EVEN(lsts)) break;
lsts = gdh_GetObjectInfoAttrref( &attr_aref, &attr_aref, sizeof(attr_aref));
......@@ -577,11 +596,11 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
oidv[oid_cnt] = attr_aref.Objid;
sevhistobjectv[oid_cnt] = true;
strcpy( onamev[oid_cnt], "");
sevhist_aref = mv.Action[i*rows+j].Object;
sevhist_aref = mv.Action[i*rows+j].Object[0];
oid_cnt = 1;
}
else {
lsts = gdh_ArefANameToAref( &mv.Action[i*rows+j].Object, "Attribute", &attr_aref);
lsts = gdh_ArefANameToAref( &mv.Action[i*rows+j].Object[0], "Attribute", &attr_aref);
if ( EVEN(lsts)) break;
lsts = gdh_GetObjectInfoAttrref( &attr_aref, &attr_aref, sizeof(attr_aref));
......@@ -599,7 +618,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
oidv[0] = attr_aref.Objid;
sevhistobjectv[0] = false;
oid_cnt = 1;
sevhist_aref = mv.Action[i*rows+j].Object;
sevhist_aref = mv.Action[i*rows+j].Object[0];
}
oidv[oid_cnt] = pwr_cNOid;
......@@ -656,7 +675,7 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
pwr_tObjid objid;
pwr_tCid cid;
objid = mv.Action[i*rows+j].Object.Objid;
objid = mv.Action[i*rows+j].Object[0].Objid;
if ( cdh_ObjidIsNull(objid))
break;
......@@ -953,7 +972,7 @@ int XttMultiViewGtk::set_subwindow_source( const char *name, char *source, char
appl.insert( applist_eType_Trend, (void *)trend[i*rows + j], &arefv[0],
"", NULL);
mv.Action[i*rows+j].Object = object_aref;
mv.Action[i*rows+j].Object[0] = object_aref;
break;
}
......@@ -1145,7 +1164,7 @@ int XttMultiViewGtk::set_subwindow_source( const char *name, char *source, char
//appl.insert( applist_eType_Trend, (void *)trend[i*rows + j], &arefv[0],
// "", NULL);
mv.Action[i*rows+j].Object = object_aref;
mv.Action[i*rows+j].Object[0] = object_aref;
}
case pwr_eMultiViewContentEnum_Video: {
pwr_sClass_XttVideo xttvideo;
......
xtt/lib/xtt/src/xtt_xnav_command.cpp
View file @ 70080dce
......@@ -846,7 +846,7 @@ static int xnav_set_func( void *client_data,
XttMultiView *mvctx;
pwr_tOName graph_str;
char name_str[80];
pwr_tOName object_str;
char object_str[800];
char *object_p;
pwr_tOName source_str;
int cont;
......@@ -8800,9 +8800,11 @@ int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance,
char action[80];
char *s;
int sts;
pwr_tAName instance_str;
char instance_str[800];
pwr_tAName name;
int scrollbars, menu, navigator;
double borders[4];
double *bordersp = 0;
sts = gdh_ObjidToName( xttgraph, name,
sizeof(name), cdh_mName_volumeStrict);
......@@ -8813,14 +8815,34 @@ int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance,
cdh_ToLower( action, xttgraph_o.Action);
if ( !instance) {
if ( cdh_ObjidIsNotNull( xttgraph_o.Object)) {
sts = gdh_ObjidToName( xttgraph_o.Object,
instance_str, sizeof( instance_str), cdh_mName_volumeStrict);
if ( ODD(sts))
instance = instance_str;
for ( int i = 0; i < 4; i++) {
pwr_tOName oname;
if ( cdh_ObjidIsNull( xttgraph_o.Object[i]))
break;
sts = gdh_ObjidToName( xttgraph_o.Object[i],
oname, sizeof( oname), cdh_mName_volumeStrict);
if ( EVEN(sts))
break;
if ( i == 0)
strncpy( instance_str, oname, sizeof(instance_str));
else {
strncat( instance_str, ",", sizeof(instance_str));
strncat( instance_str, oname, sizeof(instance_str));
}
instance = instance_str;
}
}
if ( xttgraph_o.Borders[0] != 0 || xttgraph_o.Borders[1] != 0 ||
xttgraph_o.Borders[2] != 0 || xttgraph_o.Borders[3] != 0) {
for ( int i = 0; i < 4; i++)
borders[i] = xttgraph_o.Borders[i];
bordersp = borders;
}
if ( (s = strstr( action, ".pwg")))
{
// Open graph
......@@ -8844,7 +8866,7 @@ int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance,
open_graph( xttgraph_o.Title, action, scrollbars,
menu, navigator, xttgraph_o.Width,
xttgraph_o.Height, xttgraph_o.X, xttgraph_o.Y, instance,
focus, inputempty, use_default_access, access, options, basewidget, 0);
focus, inputempty, use_default_access, access, options, basewidget, bordersp);
}
else if ( (strstr( action, ".class")))
{
......
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