Commit bbaa0d44 authored by Claes Sjofors's avatar Claes Sjofors

Xtt multiwindow, pane, fix and table layout added

parent 01d7cb95
...@@ -41,7 +41,7 @@ SObject pwrb:Class ...@@ -41,7 +41,7 @@ SObject pwrb:Class
! @Group Operator,NodeConfiguration ! @Group Operator,NodeConfiguration
! !
! Definition of an array element in a XttMultiView object, describing ! Definition of an array element in a XttMultiView object, describing
! the content of one part of the view. ! the content of a cell in the view.
! !
! @b See also ! @b See also
! @classlink XttMultiView pwrb_xttmultiview.html ! @classlink XttMultiView pwrb_xttmultiview.html
...@@ -68,8 +68,14 @@ SObject pwrb:Class ...@@ -68,8 +68,14 @@ SObject pwrb:Class
!/** !/**
! Content type. ! Content type.
! - Graph A Ge graph. ! - Graph A Ge graph.
! - ObjectGraph A Ge object or hierarchy graph.(NYI) ! - ObjectGraph A Ge object or hierarchy graph.
! - AlarmList An alarm list ! - AlarmList An alarm list
! - MultiView Another multiview specified with an XttMultiView object.
! - EvenList An event list
! - TrendCurve A trend curve specified with a DsTrend, DsTrendCurve or PlotGroup object.
! - FastCurve Not yet implemented.
! - SevHistory History curve specified with a SevHist, SevHistObject or PlotGroup object.
! - Video A video stream specified with an XttVideo object.
!*/ !*/
Object Type $Attribute 2 Object Type $Attribute 2
Body SysBody Body SysBody
......
...@@ -41,18 +41,46 @@ SObject pwrb:Class ...@@ -41,18 +41,46 @@ SObject pwrb:Class
! @Group Operator,NodeConfiguration ! @Group Operator,NodeConfiguration
! @Summary Defines the action of a pushbutton in the operator window ! @Summary Defines the action of a pushbutton in the operator window
! The XttMultiView object defines a xtt window that is built by a number ! The XttMultiView object defines a xtt window that is built by a number
! Ge graphs and alarm windows. ! Ge graphs, alarm windows, curves other multiviews etc.
! The window is structured as a table with rows and columns. ! The window is structured as a table with rows and columns.
! The content and layout of each table cell is specified in the Action array. ! The content and layout of each table cell is specified in the Action array.
! Each element in the action array correspons to a cell in the table where ! Each element in the action array correspons to a cell in the table where
! index 0 is the top cell in the first column, index 1 the second row in ! index 0 is the top cell in the first column, index 1 the second row in
! the first column etc. ! the first column etc.
! !
! For ge graps the pwg-file for the graph is specified, and, if the graph ! Example Action array index for a multiview with 3 rows and 3 columns
! is an object graph or hierarchy graph, also the object is specified. ! ----------------
! For alarm windows an alarm view can be specified in the Object attribute. ! | 0 | 3 | 6 |
! ----------------
! | 1 | 4 | 7 |
! ----------------
! | 2 | 5 | 8 |
! ----------------
! !
! The multiwiew are opened by the xtt command ! The type of window displayed in a cell is specified in Action[].Type.
!
! Graph
! Specify the pwg file in Action[].Action.
!
! ObjectGraph
! Specify the pwg file in Action[].Action and the instance object in Action[].Object[0].
!
! AlarmList and EventList
! Specify an AlarmView in the Action[]Object[0] attribute.
!
! MultiView
! Specify the name of the XttMultiView object in Actino[].Action.
!
! TrendCurve
! Specify the DsTrend, DsTrendCurve or PlotGroup object in Action[].Object[0].
!
! SevHistory
! Specify the SevHist, SevHistObject or PlotGroup object in Action[].Object[0].
!
! Video
! Specify the XttVideo object in Action.Object[0].
!
! The multiwiew is opened by the xtt command
! !
! > open multiview 'object' [/width=] [/height=] [/xpos=] [/ypos=] ! > open multiview 'object' [/width=] [/height=] [/xpos=] [/ypos=]
! !
...@@ -82,9 +110,15 @@ SObject pwrb:Class ...@@ -82,9 +110,15 @@ SObject pwrb:Class
EndObject EndObject
!/** !/**
! Layout management. ! Layout management.
! - Box ! - Box The cells in each row is packed in horizontal boxes, and these boxes are
! - Fix (NYI) ! then packed in a vertical box.
! - Table (NYI) ! - Fix Fix layout with position specified in X, Y and size in Width and Height.
! Column and row doesn't have any meaning and only specifies the number of cells.
! Not resizeable.
! - Pane The cells in each row is inserted in horizontal paned windows, and these
! Windows are then inserted in vertical paned windows. Maximum two rows and two
! columns are supported.
! - Table The cells are ordered in rows and columns. Not resizable.
!*/ !*/
Object Layout $Attribute 2 Object Layout $Attribute 2
Body SysBody Body SysBody
......
...@@ -79,6 +79,16 @@ SObject pwrb:Type ...@@ -79,6 +79,16 @@ SObject pwrb:Type
Attr Value = 2 Attr Value = 2
EndBody EndBody
EndObject EndObject
!/**
! Pane layout.
!*/
Object Pane $Value
Body SysBody
Attr PgmName = "Pane"
Attr Text = "Pane"
Attr Value = 3
EndBody
EndObject
EndObject EndObject
EndSObject EndSObject
......
This diff is collapsed.
...@@ -60,6 +60,7 @@ class XttMultiViewGtk : public XttMultiView { ...@@ -60,6 +60,7 @@ class XttMultiViewGtk : public XttMultiView {
GtkWidget *exchange_widget[MV_SIZE]; GtkWidget *exchange_widget[MV_SIZE];
GtkWidget *box_widget; GtkWidget *box_widget;
GtkWidget *toplevel; GtkWidget *toplevel;
GtkWidget *col_widget;
XttGeGtk *gectx[MV_SIZE]; XttGeGtk *gectx[MV_SIZE];
XttMultiViewGtk *mvctx[MV_SIZE]; XttMultiViewGtk *mvctx[MV_SIZE];
EvAlaGtk *sala[MV_SIZE]; EvAlaGtk *sala[MV_SIZE];
...@@ -67,6 +68,12 @@ class XttMultiViewGtk : public XttMultiView { ...@@ -67,6 +68,12 @@ class XttMultiViewGtk : public XttMultiView {
XttTrendGtk *trend[MV_SIZE]; XttTrendGtk *trend[MV_SIZE];
XttSevHistGtk *sevhist[MV_SIZE]; XttSevHistGtk *sevhist[MV_SIZE];
XttStreamGtk *strmctx[MV_SIZE]; XttStreamGtk *strmctx[MV_SIZE];
int comp_width[MV_SIZE];
int comp_height[MV_SIZE];
int comp_x[MV_SIZE];
int comp_y[MV_SIZE];
int orig_width;
int orig_height;
CoWowFocusTimerGtk focustimer; CoWowFocusTimerGtk focustimer;
XttMultiViewGtk( GtkWidget *parent_wid, void *parent_ctx, const char *name, pwr_tAttrRef *aref, XttMultiViewGtk( GtkWidget *parent_wid, void *parent_ctx, const char *name, pwr_tAttrRef *aref,
......
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