Changeset 13826

Timestamp:

05/23/12 10:42:46 (13 years ago)

Author:

tbretz

Message:

Fixeda few issues with synchonous and asynchronous treatment of the DimNetwork virtual functions.

File:

• trunk/FACT++/gui/FactGui.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -292 +292 @@
         DimNetwork::AddServer(s);
 
+        const State state = GetState(s, GetCurrentState(s));
+
         QApplication::postEvent(this,
-           new FunctionEvent(bind(&FactGui::handleAddServer, this, s)));
+           new FunctionEvent(bind(&FactGui::handleAddServer, this, s, state)));
     }
 
     void AddService(const string &server, const string &service, const string &fmt, bool iscmd)
     {
+        const vector<Description> v = GetDescription(server, service);
+
         QApplication::postEvent(this,
-           new FunctionEvent(bind(&FactGui::handleAddService, this, server, service, fmt, iscmd)));
+           new FunctionEvent(bind(&FactGui::handleAddService, this, server, service, fmt, iscmd, v)));
     }
 
@@ -320 +324 @@
     void AddDescription(const string &server, const string &service, const vector<Description> &vec)
     {
+        const bool iscmd = IsCommand(server, service)==true;
+
         QApplication::postEvent(this,
-           new FunctionEvent(bind(&FactGui::handleAddDescription, this, server, service, vec)));
+           new FunctionEvent(bind(&FactGui::handleAddDescription, this, server, service, vec, iscmd)));
     }
 
     // ======================================================================
 
-    void handleAddServer(const string &server)
-    {
-        const State s = GetState(server, GetCurrentState(server));
-        handleStateChanged(Time(), server, s);
-    }
-
-    void handleAddService(const string &server, const string &service, const string &/*fmt*/, bool iscmd)
+    void handleAddServer(const string &server, const State &state)
+    {
+        handleStateChanged(Time(), server, state);
+    }
+
+    void handleAddService(const string &server, const string &service, const string &/*fmt*/, bool iscmd, const vector<Description> &vec)
     {
         QStandardItem *item = AddServiceItem(server, service, iscmd);
-        const vector<Description> v = GetDescription(server, service);
-        AddDescription(item, v);
+        AddDescription(item, vec);
     }
 
@@ -382 +386 @@
     }
 
-    void handleAddDescription(const string &server, const string &service, const vector<Description> &vec)
-    {
-        const bool iscmd = IsCommand(server, service)==true;
-
+    void handleAddDescription(const string &server, const string &service, const vector<Description> &vec, bool iscmd)
+    {
         QStandardItem *item = AddServiceItem(server, service, iscmd);
         AddDescription(item, vec);