Changeset 10799 for trunk

Timestamp:

05/24/11 17:39:48 (14 years ago)

Author:

tbretz

Message:

Simplified program options handling; only send enable of a general settings register if it changed at all; only sent trigger counter if the received report was dynamic data.

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (4 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -20 +20 @@
 #include "Converter.h"
 
-#include "FACT.h"
 #include "tools.h"
 
@@ -807 +806 @@
     void Enable(FTM::StaticData::GeneralSettings type, bool enable)
     {
-        fStaticData.Enable(type, enable);
+        if (fStaticData.IsEnabled(type)!=enable)
+        {
+            fStaticData.Enable(type, enable);
+            CmdSendStatDat();
+        }
     }
 
@@ -960 +963 @@
     {
         ConnectionFTM::UpdateHeader();
+
+        if (fHeader.fType!=FTM::kDynamicData)
+            return;
 
         const FTM::DimTriggerCounter data(fHeader);
@@ -1871 +1877 @@
     catch (po::multiple_occurrences &e)
     {
-        cout << "Error: " << e.what() << " of '" << e.get_option_name() << "' option." << endl;
-        cout << endl;
+        cerr << "Program options invalid due to: " << e.what() << " of '" << e.get_option_name() << "'." << endl;
         return -1;
     }
 #endif
-    catch (std::exception &e)
-    {
-        cout << "Error: " << e.what() << endl;
-        cout << endl;
-
+    catch (exception& e)
+    {
+        cerr << "Program options invalid due to: " << e.what() << endl;
         return -1;
     }
 
-    if (conf.HasPrint())
+    if (conf.HasVersion() || conf.HasPrint())
         return -1;
-
-    if (conf.HasVersion())
-    {
-        FACT::PrintVersion(argv[0]);
-        return -1;
-    }
 
     if (conf.HasHelp())