Changeset 11577

Timestamp:

07/24/11 21:11:43 (13 years ago)

Author:

tbretz

Message:

Moved Dim:Setup to Main::execute

Location:

trunk/FACT++/src

Files:

• Main.h (modified) (1 diff)
• biasctrl.cc (modified) (1 diff)
• datalogger.cc (modified) (1 diff)
• drivectrl.cc (modified) (1 diff)
• fadctrl.cc (modified) (1 diff)
• fscctrl.cc (modified) (1 diff)
• ftmctrl.cc (modified) (1 diff)
• mcp.cc (modified) (1 diff)
• scheduler.cc (modified) (1 diff)

trunk/FACT++/src/Main.h

@@ -43 +43 @@
     int execute(Configuration &conf, bool dummy=false)
     {
+        Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
+
+        // -----------------------------------------------------------------
+
         static T shell(conf.GetName().c_str(),
                    conf.Has("console") ? conf.Get<int>("console")!=1 : 0);

trunk/FACT++/src/biasctrl.cc

@@ -649 +649 @@
     }
 
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
     //try
     {

trunk/FACT++/src/datalogger.cc

@@ -2495 +2495 @@
     }
 
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
 //    try
     {

trunk/FACT++/src/drivectrl.cc

@@ -1026 +1026 @@
     }
 
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
     //try
     {

trunk/FACT++/src/fadctrl.cc

@@ -2096 +2096 @@
     }
 
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
 //    try
     {

trunk/FACT++/src/fscctrl.cc

@@ -615 +615 @@
     }
 
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
     //try
     {

trunk/FACT++/src/ftmctrl.cc

@@ -2471 +2471 @@
     }
 
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
     //try
     {

trunk/FACT++/src/mcp.cc

@@ -505 +505 @@
     }
 
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
     //try
     {

trunk/FACT++/src/scheduler.cc

@@ -799 +799 @@
     }
 
-    if (conf.HasVersion() || conf.HasPrint())
-        return -1;
-
-    if (conf.HasHelp())
-    {
-        PrintHelp();
-        return -1;
-    }
-
-    Dim::Setup(conf.Get<string>("dns"), conf.Get<string>("host"));
-
 //    try
     {