Changeset 1884 in orxonox.OLD for orxonox/branches

Timestamp:

May 10, 2004, 1:22:35 PM (21 years ago)

Author:

patrick

Message:

/orxonox/branch/gui/ log working now

Location:

orxonox/branches/gui/console

Files:

• orxonox_console.cc (modified) (2 diffs)
• orxonox_console_entry.cc (modified) (3 diffs)
• orxonox_console_entry.h (modified) (1 diff)

orxonox/branches/gui/console/orxonox_console.cc

@@ -31 +31 @@
 void OrxonoxConsole::createWindow ()
 {
+  //entry = new OrxonoxConsoleEntry(*log, entry);
   
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -43 +44 @@
       gtk_box_pack_start(GTK_BOX(vbox_main), log.createLog(), TRUE, TRUE, 0);
       gtk_box_pack_start(GTK_BOX(vbox_main), entry.createEntry(), FALSE, FALSE, 0);
-      entry.setLog(&log);
+      entry.setLog(&log,&entry);
     }
   gtk_container_add(GTK_CONTAINER(window), vbox_main);

orxonox/branches/gui/console/orxonox_console_entry.cc

@@ -27 +27 @@
 #include "orxonox_console_entry.h"
 
-/*OrxonoxConsoleEntry::OrxonoxConsoleEntry(OrxonoxConsoleLog* log)
-  {
+
+OrxonoxConsoleEntry* OrxonoxConsoleEntry::test = 0;
+
+/*
+OrxonoxConsoleEntry::OrxonoxConsoleEntry(OrxonoxConsoleLog* log, 
+                                         OrxonoxConsoleEntry* test)
+{
   consoleLog = log;
-  }*/
+
+}
+*/
 
 GtkWidget* OrxonoxConsoleEntry::createEntry()
@@ -55 +62 @@
 }
 
-void OrxonoxConsoleEntry::setLog(OrxonoxConsoleLog* log)
+void OrxonoxConsoleEntry::setLog(OrxonoxConsoleLog* log, OrxonoxConsoleEntry* entry)
 {
   consoleLog = log;
+  test = entry;
 }
 
@@ -65 +73 @@
   char* entryText = (char*)gtk_entry_get_text(GTK_ENTRY(entry));
   printf("%s\n", entryText);
-  //sendtoLog(entryText);
+  test->sendtoLog(entryText);
   gtk_entry_set_text(GTK_ENTRY(entry),"");
   // freen entryText;

orxonox/branches/gui/console/orxonox_console_entry.h

@@ -19 +19 @@
   GtkWidget *entry;
   OrxonoxConsoleLog* consoleLog;
+
+  static OrxonoxConsoleEntry* test;
   
 
 
  public:
-  //  OrxonoxConsoleEntry(OrxonoxConsoleLog* log);
+  //OrxonoxConsoleEntry(OrxonoxConsoleLog* log, OrxonoxConsoleEntry* test);
   
   GtkWidget* createEntry(void);
-  void setLog(OrxonoxConsoleLog* log);
+  void setLog(OrxonoxConsoleLog* log, OrxonoxConsoleEntry* entry);
   static void submit(GtkWidget *widget, GtkWidget* data);
   void sendtoLog(char* submitText);