working version of guiEvents module

git-svn-id: http://ltt.polymtl.ca/svn@219 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/lttv/modules/Makefile.am b/ltt/branches/poly/lttv/modules/Makefile.am
index db3a3fc75784d582107bd262ab5c21e021f7e6c2..99102465a22a9af2a31dbb32f560c1b276008576 100644 (file)
--- a/ltt/branches/poly/lttv/modules/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/Makefile.am
@@ -6,8 +6,13 @@
 
 SUBDIRS = gui
 
+AM_CFLAGS = $(GLIB_CFLAGS) 
+AM_CFLAGS += $(GTK_CFLAGS)
+LIBS += $(GLIB_LIBS)
+LIBS += $(GTK_LIBS) -lmainWinApi
+
 libdir = ${lttvplugindir}
 
-#lib_LTLIBRARIES = libsimple.la
-#libsimple_la_LDFLAGS = -module
-#libsimple_la_SOURCES = simple.c
+lib_LTLIBRARIES = libguiEvents.la
+libguiEvents_la_LDFLAGS = -module
+libguiEvents_la_SOURCES = guiEvents.c

diff --git a/ltt/branches/poly/lttv/modules/guiEvents.c b/ltt/branches/poly/lttv/modules/guiEvents.c
index b4427c3ef83e44fc7c1fb2a3447e01473f3b57e8..6392a3d74cb207618c6d04c26b11ffec3b7a283a 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiEvents.c
+++ b/ltt/branches/poly/lttv/modules/guiEvents.c
@@ -40,11 +40,14 @@
 
 #include "icons/hGuiEventsInsert.xpm"
 
+
 /** Array containing instanced objects. Used when module is unloaded */
 static GSList *sEvent_Viewer_Data_List = NULL ;
 
+
 typedef struct _EventViewerData {
 
+  mainWindow * mw;
        /* Model containing list data */
   GtkListStore *Store_M;
 
@@ -72,9 +75,9 @@ typedef struct _EventViewerData {
 } EventViewerData ;
 
 //! Event Viewer's constructor hook
-GtkWidget *hGuiEvents(GtkWidget *pmParentWindow);
+GtkWidget *hGuiEvents(mainWindow *pmParentWindow);
 //! Event Viewer's constructor
-EventViewerData *GuiEvents(void);
+EventViewerData *GuiEvents(mainWindow *pmParentWindow);
 //! Event Viewer's destructor
 void GuiEvents_Destructor(EventViewerData *Event_Viewer_Data);
 
@@ -108,10 +111,10 @@ G_MODULE_EXPORT void init() {
        g_critical("GUI Event Viewer init()");
 
        /* Register the toolbar insert button */
-       //ToolbarItemReg(hGuiEventsInsert_xpm, "Insert Event Viewer", hGuiEvents);
+       ToolbarItemReg(hGuiEventsInsert_xpm, "Insert Event Viewer", hGuiEvents);
 
        /* Register the menu item insert entry */
-       //MenuItemReg("/", "Insert Event Viewer", hGuiEvents);
+       MenuItemReg("/", "Insert Event Viewer", hGuiEvents);
 }
 
 void destroy_walk(gpointer data, gpointer user_data)
@@ -135,10 +138,10 @@ G_MODULE_EXPORT void destroy() {
        g_slist_foreach(sEvent_Viewer_Data_List, destroy_walk, NULL );
        
        /* Unregister the toolbar insert button */
-       //ToolbarItemUnreg(hGuiEvents);
+       ToolbarItemUnreg(hGuiEvents);
 
        /* Unregister the menu item insert entry */
-       //MenuItemUnreg(hGuiEvents);
+       MenuItemUnreg(hGuiEvents);
 }
 
 /* Enumeration of the columns */
@@ -163,9 +166,9 @@ enum
  * @return The widget created.
  */
 GtkWidget *
-hGuiEvents(GtkWidget *pmParentWindow)
+hGuiEvents(mainWindow * pmParentWindow)
 {
-       EventViewerData* Event_Viewer_Data = GuiEvents() ;
+       EventViewerData* Event_Viewer_Data = GuiEvents(pmParentWindow) ;
 
        return Event_Viewer_Data->HBox_V ;
        
@@ -178,11 +181,13 @@ hGuiEvents(GtkWidget *pmParentWindow)
  * @return The Event viewer data created.
  */
 EventViewerData *
-GuiEvents(void)
+GuiEvents(mainWindow *pmParentWindow)
 {
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
        EventViewerData* Event_Viewer_Data = g_new(EventViewerData,1) ;
+
+       Event_Viewer_Data->mw = pmParentWindow;
        
        /* TEST DATA, TO BE READ FROM THE TRACE */
        Event_Viewer_Data->Number_Of_Events = 1000 ;
@@ -320,7 +325,7 @@ GuiEvents(void)
   gtk_widget_show(Event_Viewer_Data->VScroll_VC);
 
        /* Add the object's information to the module's array */
-  g_slist_append(sEvent_Viewer_Data_List, Event_Viewer_Data);
+  sEvent_Viewer_Data_List = g_slist_append(sEvent_Viewer_Data_List, Event_Viewer_Data);
 
        Event_Viewer_Data->First_Event = -1 ;
        Event_Viewer_Data->Last_Event = 0 ;
@@ -775,6 +780,7 @@ GuiEvents_Destructor(EventViewerData *Event_Viewer_Data)
        //gtk_widget_destroy(GTK_WIDGET(Event_Viewer_Data->Store_M));
 
        g_slist_remove(sEvent_Viewer_Data_List,Event_Viewer_Data);
+       g_free(Event_Viewer_Data);
 }
 
 //FIXME : call hGuiEvents_Destructor for corresponding data upon widget destroy
@@ -798,7 +804,7 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data)
 }
 
 
-
+/* it will be registered and called by the main window */
 int Event_Selected_Hook(void *hook_data, void *call_data)
 {
        EventViewerData *Event_Viewer_Data = (EventViewerData*) hook_data;
@@ -1181,7 +1187,7 @@ static void destroy_cb( GtkWidget *widget,
 }
 
 
-
+/*
 int main(int argc, char **argv)
 {
        GtkWidget *Window;
@@ -1190,10 +1196,10 @@ int main(int argc, char **argv)
        EventViewerData *Event_Viewer_Data;
        guint ev_sel = 444 ;
        
-       /* Initialize i18n support */
+       // Initialize i18n support 
   gtk_set_locale ();
 
-  /* Initialize the widget set */
+  // Initialize the widget set 
   gtk_init (&argc, &argv);
 
        init();
@@ -1208,20 +1214,20 @@ int main(int argc, char **argv)
   VBox_V = gtk_vbox_new(0, 0);
        gtk_container_add (GTK_CONTAINER (Window), VBox_V);
 
-  //ListViewer = hGuiEvents(Window);
+   //ListViewer = hGuiEvents(Window);
   //gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, TRUE, TRUE, 0);
 
   //ListViewer = hGuiEvents(Window);
   //gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, FALSE, TRUE, 0);
        
-       Event_Viewer_Data = GuiEvents();
+       Event_Viewer_Data = GuiEvents(g_new(mainWindow,1));
        ListViewer = Event_Viewer_Data->HBox_V;
-  gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, TRUE, TRUE, 0);
-
+       gtk_box_pack_start(GTK_BOX(VBox_V), ListViewer, TRUE, TRUE, 0);
+       
   gtk_widget_show (VBox_V);
        gtk_widget_show (Window);
 
-       Event_Selected_Hook(Event_Viewer_Data, &ev_sel);
+       //      Event_Selected_Hook(Event_Viewer_Data, &ev_sel);
        
        gtk_main ();
 
@@ -1234,7 +1240,7 @@ int main(int argc, char **argv)
        
        return 0;
 }
-
+*/
 
 /*\@}*/