Xtt multiwindow, pane, fix and table layout added

src/wbl/pwrb/src/pwrb_c_a_multiviewelement.wb_load

@@ -41,7 +41,7 @@ SObject pwrb:Class
 !  @Group Operator,NodeConfiguration
 !
 !  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
 !  @classlink XttMultiView pwrb_xttmultiview.html
@@ -68,8 +68,14 @@ SObject pwrb:Class
       !/**
       !  Content type.
       !  - Graph       A Ge graph.
-      !  - ObjectGraph A Ge object or hierarchy graph.(NYI)
+      !  - ObjectGraph A Ge object or hierarchy graph.
       !  - 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 
         Body SysBody

src/wbl/pwrb/src/pwrb_c_xttmultiview.wb_load

@@ -41,18 +41,46 @@ SObject pwrb:Class
 !  @Group Operator,NodeConfiguration
 !  @Summary Defines the action of a pushbutton in the operator window
 !  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 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
 !  index 0 is the top cell in the first column, index 1 the second row in
 !  the first column etc.
 !
-!  For ge graps the pwg-file for the graph is specified, and, if the graph
-!  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.
+!  Example Action array index for a multiview with 3 rows and 3 columns
+!  ----------------
+!  | 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=]  
 !
@@ -82,9 +110,15 @@ SObject pwrb:Class
       EndObject
       !/**
       ! Layout management.
-      ! - Box
-      ! - Fix (NYI)
-      ! - Table (NYI)
+      ! - Box   The cells in each row is packed in horizontal boxes, and these boxes are 
+      !         then packed in a vertical box.
+      ! - 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
         Body SysBody

src/wbl/pwrb/src/pwrb_td_multiviewlayoutenum.wb_load

@@ -79,6 +79,16 @@ SObject pwrb:Type
        Attr Value = 2
      EndBody
     EndObject
+    !/**
+    !  Pane layout.
+    !*/
+    Object Pane $Value
+     Body SysBody
+       Attr PgmName = "Pane"
+       Attr Text = "Pane"
+       Attr Value = 3
+     EndBody
+    EndObject
   EndObject
 EndSObject
 

xtt/lib/xtt/gtk/xtt_multiview_gtk.cpp

@@ -118,7 +118,30 @@ void XttMultiViewGtk::activate_exit( GtkWidget *w, gpointer data)
 
 void XttMultiViewGtk::action_resize( GtkWidget *w, GtkAllocation *allocation, gpointer data)
 {
-  // XttMultiView *multiview = (XttMultiView *)data;
+#if 0
+  XttMultiViewGtk *mv = (XttMultiViewGtk *)data;
+  GtkRequisition req;
+  static int skip = 0;
+  int window_width, window_height;
+
+  if ( !mv->toplevel->window)
+    return;
+  if ( skip) {
+    skip--;
+    return;
+  }
+
+  //gtk_widget_get_preferred_size( GTK_WIDGET(mv->toplevel), &req);
+  // gtk_widget_size_request( GTK_WIDGET(mv->toplevel), &req);
+  gdk_window_get_size( mv->toplevel->window, &window_width, &window_height);
+  double factor = float(window_width) / mv->orig_width;
+
+  for ( int i = 0; i < mv->cols * mv->rows; i++) {
+    gtk_fixed_move( GTK_FIXED(mv->col_widget), mv->comp_widget[i], factor * mv->comp_x[i], factor * mv->comp_y[i]);
+    gtk_widget_set_size_request( GTK_WIDGET(mv->comp_widget[i]), factor * mv->comp_width[i], factor * mv->comp_height[i]);
+  }
+  skip = mv->cols * mv->rows;
+#endif
 }
 
 XttMultiViewGtk::~XttMultiViewGtk()
@@ -205,18 +228,28 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
   memset( strmctx, 0, sizeof(strmctx));
   memset( comp_widget, 0, sizeof(comp_widget));
   memset( exchange_widget, 0, sizeof(exchange_widget));
+  memset( comp_width, 0, sizeof(comp_width));
+  memset( comp_height, 0, sizeof(comp_height));
+  memset( comp_x, 0, sizeof(comp_x));
+  memset( comp_y, 0, sizeof(comp_y));
+
+  *sts = gdh_GetObjectInfoAttrref( &aref, &mv, sizeof(mv));
+  if ( EVEN(*sts)) return;
 
   if ( mv_width != 0 && mv_height != 0) {
     window_width = mv_width;
     window_height = mv_height;
   }
+  else if ( mv.Width != 0 && mv.Height != 0) {
+    window_width = mv.Width;
+    window_height = mv.Height;
+  }
   else {
     window_width = 600;
     window_height = 500;
   }
-
-  *sts = gdh_GetObjectInfoAttrref( &aref, &mv, sizeof(mv));
-  if ( EVEN(*sts)) return;
+  orig_width = window_width;
+  orig_height = window_height;
 
   char *titleutf8 = g_convert( mv.Title, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
 
@@ -237,6 +270,9 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
     if ( mv.Options & pwr_mMultiViewOptionsMask_HideDecorations)
       gtk_window_set_decorated( GTK_WINDOW(toplevel), FALSE);
 
+    if ( mv.Layout == pwr_eMultiViewLayoutEnum_Fix|| mv.Layout == pwr_eMultiViewLayoutEnum_Table)
+      gtk_window_set_resizable( GTK_WINDOW(toplevel), FALSE);
+
     if ( mv.Options & pwr_mMultiViewOptionsMask_Dialog) {
       gtk_window_set_type_hint( GTK_WINDOW(toplevel), GDK_WINDOW_TYPE_HINT_DIALOG);
       gtk_widget_set_size_request( GTK_WIDGET(toplevel), window_width, window_height);
@@ -254,15 +290,50 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
     box_widget = gtk_hbox_new( FALSE, 0);
   }
 
-  if ( mv.Layout == pwr_eMultiViewLayoutEnum_Box) {
-    GtkWidget *col_widget = gtk_hbox_new( FALSE, 0);
+  if ( mv.Layout == pwr_eMultiViewLayoutEnum_Fix) {
+    // g_signal_connect( toplevel, "size_allocate", G_CALLBACK(action_resize), this);
+  }
     
+  {
     rows = mv.Rows;
     cols = mv.Columns;
 
+    switch ( mv.Layout) {
+    case pwr_eMultiViewLayoutEnum_Box:
+      col_widget = gtk_hbox_new( FALSE, 0);
+      break;
+    case pwr_eMultiViewLayoutEnum_Fix:
+      col_widget = gtk_fixed_new();
+      break;
+    case pwr_eMultiViewLayoutEnum_Pane:      
+      col_widget = gtk_hpaned_new();
+      break;
+    case pwr_eMultiViewLayoutEnum_Table:      
+      col_widget = gtk_table_new( rows, cols, FALSE);
+      break;
+    default:
+      return;
+    }
+
     bool escape = false;
     for ( int i = 0; i < cols; i++) {
-      GtkWidget *row_widget = gtk_vbox_new( FALSE, 0);
+      GtkWidget *row_widget;
+
+      if ( mv.Layout == pwr_eMultiViewLayoutEnum_Pane && i > 1)
+	break;
+      
+      switch ( mv.Layout) {
+      case pwr_eMultiViewLayoutEnum_Box:
+	row_widget = gtk_vbox_new( FALSE, 0);
+	break;
+      case pwr_eMultiViewLayoutEnum_Fix:
+      case pwr_eMultiViewLayoutEnum_Table:
+	break;
+      case pwr_eMultiViewLayoutEnum_Pane:      
+	row_widget = gtk_vpaned_new();
+	break;
+      default: ;
+      }
 
       for ( int j = 0; j < rows; j++) {
 	pwr_tFileName graph_name;
@@ -272,9 +343,13 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	  escape = true;
 	  break;
 	}
+	if ( mv.Layout == pwr_eMultiViewLayoutEnum_Pane && j > 1)
+	  break;
 
-	w = mv.Action[i*rows+j].Width;
-	h = mv.Action[i*rows+j].Height;
+	w = comp_width[i*rows+j] = mv.Action[i*rows+j].Width;
+	h = comp_height[i*rows+j] = mv.Action[i*rows+j].Height;
+	comp_x[i*rows+j] = mv.Action[i*rows+j].X;
+	comp_y[i*rows+j] = mv.Action[i*rows+j].Y;
 	scrollbar = (mv.Action[i*rows+j].Options & pwr_mMultiViewElemOptionsMask_Scrollbars) ? 1 : 0;
 	menu = (mv.Action[i*rows+j].Options & pwr_mMultiViewElemOptionsMask_Menu) ? 1 : 0;
 	strcpy( graph_name, mv.Action[i*rows+j].Action);
@@ -288,7 +363,6 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	    if ( !sala[i*rows + j])
 	      continue;
 	    comp_widget[i*rows + j] = sala[i*rows + j]->get_widget();
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
 	  }
 	  break;
 	}
@@ -299,7 +373,6 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	    if ( !seve[i*rows + j])
 	      continue;
 	    comp_widget[i*rows + j] = seve[i*rows + j]->get_widget();
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
 	  }
 	  break;
 	}
@@ -361,14 +434,6 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	  appl.insert( applist_eType_Graph, (void *)gectx[i*rows + j], pwr_cNObjid, graph_name,
 		       objectname_p);
 	
-
-	  if ( mv.Action[i*rows+j].Options & pwr_mMultiViewElemOptionsMask_Exchangeable) {
-	    exchange_widget[i*rows+j] = gtk_hbox_new( FALSE, 0);
-	    gtk_box_pack_start( GTK_BOX(exchange_widget[i*rows+j]), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(exchange_widget[i*rows + j]), TRUE, TRUE, 0);
-	  }
-	  else
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
 	  break;
 	}
 	case pwr_eMultiViewContentEnum_MultiView: {
@@ -397,13 +462,6 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 
 	  appl.insert( applist_eType_MultiView, (void *)mvctx[i*rows + j], &aref, "", NULL);
 	
-	  if ( mv.Action[i*rows+j].Options & pwr_mMultiViewElemOptionsMask_Exchangeable) {
-	    exchange_widget[i*rows+j] = gtk_hbox_new( FALSE, 0);
-	    gtk_box_pack_start( GTK_BOX(exchange_widget[i*rows+j]), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(exchange_widget[i*rows + j]), TRUE, TRUE, 0);
-	  }
-	  else
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
 	  break;
 	}
 	case pwr_eMultiViewContentEnum_TrendCurve: {
@@ -457,14 +515,6 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	  appl.insert( applist_eType_Trend, (void *)trend[i*rows + j], &arefv[0], 
 		       "",  NULL);
 	
-
-	  if ( mv.Action[i*rows+j].Options & pwr_mMultiViewElemOptionsMask_Exchangeable) {
-	    exchange_widget[i*rows+j] = gtk_hbox_new( FALSE, 0);
-	    gtk_box_pack_start( GTK_BOX(exchange_widget[i*rows+j]), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(exchange_widget[i*rows + j]), TRUE, TRUE, 0);
-	  }
-	  else
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
 	  break;
 	}
 	case pwr_eMultiViewContentEnum_SevHistory: {
@@ -660,14 +710,6 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	  //appl.insert( applist_eType_Trend, (void *)trend[i*rows + j], &arefv[0], 
 	  //	       "",  NULL);
 	
-
-	  if ( mv.Action[i*rows+j].Options & pwr_mMultiViewElemOptionsMask_Exchangeable) {
-	    exchange_widget[i*rows+j] = gtk_hbox_new( FALSE, 0);
-	    gtk_box_pack_start( GTK_BOX(exchange_widget[i*rows+j]), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(exchange_widget[i*rows + j]), TRUE, TRUE, 0);
-	  }
-	  else
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
 	  break;
 	}
 	case pwr_eMultiViewContentEnum_Video: {
@@ -704,24 +746,82 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	  appl.insert( applist_eType_Stream, (void *)strmctx[i*rows + j], objid, xttvideo.Title,
 		       xttvideo.URL);
 	
+	  break;
+	}
+	default: ;
+	}
+
+
 	if ( mv.Action[i*rows+j].Options & pwr_mMultiViewElemOptionsMask_Exchangeable) {
 	  exchange_widget[i*rows+j] = gtk_hbox_new( FALSE, 0);
 	  gtk_box_pack_start( GTK_BOX(exchange_widget[i*rows+j]), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
+	  switch ( mv.Layout) {
+	  case pwr_eMultiViewLayoutEnum_Box:
 	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(exchange_widget[i*rows + j]), TRUE, TRUE, 0);
-	  }
+	    break;
+	  case pwr_eMultiViewLayoutEnum_Fix:
+	    gtk_fixed_put( GTK_FIXED(col_widget), GTK_WIDGET(exchange_widget[i*rows + j]), mv.Action[i*rows+j].X, mv.Action[i*rows+j].Y);
+	    gtk_widget_set_size_request( GTK_WIDGET(comp_widget[i*rows + j]), mv.Action[i*rows+j].Width, mv.Action[i*rows+j].Height);
+	    break;
+	  case pwr_eMultiViewLayoutEnum_Pane:      
+	    if ( j == 0)
+	      gtk_paned_pack1( GTK_PANED(row_widget), GTK_WIDGET(exchange_widget[i*rows + j]), TRUE, TRUE);
 	    else
-	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
+	      gtk_paned_pack2( GTK_PANED(row_widget), GTK_WIDGET(exchange_widget[i*rows + j]), TRUE, TRUE);
+	    break;
+	  case pwr_eMultiViewLayoutEnum_Table:
+	    gtk_table_attach( GTK_TABLE(col_widget), GTK_WIDGET(exchange_widget[i*rows + j]), j, j+1, i, i+1,
+			      GTK_FILL, GTK_FILL, 0, 0);
 	    break;
+	  default: ;
+	  }
 	}
+	else {
+	  switch ( mv.Layout) {
+	  case pwr_eMultiViewLayoutEnum_Box:
+	    gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE, 0);
+	    break;
+	  case pwr_eMultiViewLayoutEnum_Fix:
+	    gtk_fixed_put( GTK_FIXED(col_widget), GTK_WIDGET(comp_widget[i*rows + j]), mv.Action[i*rows+j].X, mv.Action[i*rows+j].Y);
+	    gtk_widget_set_size_request( GTK_WIDGET(comp_widget[i*rows + j]), mv.Action[i*rows+j].Width, mv.Action[i*rows+j].Height);
+	    break;
+	  case pwr_eMultiViewLayoutEnum_Pane:      
+	    if ( j == 0)
+	      gtk_paned_pack1( GTK_PANED(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE);
+	    else
+	      gtk_paned_pack2( GTK_PANED(row_widget), GTK_WIDGET(comp_widget[i*rows + j]), TRUE, TRUE);
+	    break;
+	  case pwr_eMultiViewLayoutEnum_Table:
+	    gtk_table_attach( GTK_TABLE(col_widget), GTK_WIDGET(comp_widget[i*rows + j]), j, j+1, i, i+1,
+			      GTK_FILL, GTK_FILL, 0, 0);
 	  default: ;
 	  }
-	if ( (j + 1) % rows != 0 && mv.Options & pwr_mMultiViewOptionsMask_RowSeparators)
+	}
+
+	if ( mv.Layout == pwr_eMultiViewLayoutEnum_Box &&
+	     ((j + 1) % rows != 0 && mv.Options & pwr_mMultiViewOptionsMask_RowSeparators))
 	  gtk_box_pack_start( GTK_BOX(row_widget), GTK_WIDGET(gtk_hseparator_new()), FALSE, FALSE, 0);
 	  
       }
+
+      switch ( mv.Layout) {
+      case pwr_eMultiViewLayoutEnum_Box:
 	gtk_box_pack_start( GTK_BOX(col_widget), GTK_WIDGET(row_widget), TRUE, TRUE, 0);
+	break;
+      case pwr_eMultiViewLayoutEnum_Fix:
+	break;
+      case pwr_eMultiViewLayoutEnum_Pane:      
+	if ( i == 0)
+	  gtk_paned_pack1( GTK_PANED(col_widget), GTK_WIDGET(row_widget), TRUE, TRUE);
+	else
+	  gtk_paned_pack2( GTK_PANED(col_widget), GTK_WIDGET(row_widget), TRUE, TRUE);
+	break;
+	break;
+      default: ;
+      }
 
-      if ( i != cols - 1 && mv.Options & pwr_mMultiViewOptionsMask_ColumnSeparators)
+      if ( mv.Layout == pwr_eMultiViewLayoutEnum_Box &&
+	   (i != cols - 1 && mv.Options & pwr_mMultiViewOptionsMask_ColumnSeparators))
 	gtk_box_pack_start( GTK_BOX(col_widget), GTK_WIDGET(gtk_vseparator_new()), FALSE, FALSE, 0);
 
       if ( escape)
@@ -732,10 +832,6 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
     else
       gtk_box_pack_start( GTK_BOX(box_widget), GTK_WIDGET(col_widget), FALSE, FALSE, 0);
   }
-  else if ( mv.Layout == pwr_eMultiViewLayoutEnum_Fix) {
-  }
-  else if ( mv.Layout == pwr_eMultiViewLayoutEnum_Table) {
-  }
 
 
   if ( !(options & ge_mOptions_Embedded)) {

xtt/lib/xtt/gtk/xtt_multiview_gtk.h

@@ -60,6 +60,7 @@ class XttMultiViewGtk : public XttMultiView {
   GtkWidget	*exchange_widget[MV_SIZE];
   GtkWidget	*box_widget;
   GtkWidget	*toplevel;
+  GtkWidget	*col_widget;
   XttGeGtk	*gectx[MV_SIZE];
   XttMultiViewGtk *mvctx[MV_SIZE];
   EvAlaGtk 	*sala[MV_SIZE];
@@ -67,6 +68,12 @@ class XttMultiViewGtk : public XttMultiView {
   XttTrendGtk	*trend[MV_SIZE];
   XttSevHistGtk	*sevhist[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;
 
   XttMultiViewGtk( GtkWidget *parent_wid, void *parent_ctx, const char *name, pwr_tAttrRef *aref,