Changeset 14113

Timestamp:

06/08/12 11:22:36 (12 years ago)

Author:

tbretz

Message:

Improved observation list history; changed name of sound files.

File:

• trunk/FACT++/src/smartfact.cc (modified) (6 diffs)

trunk/FACT++/src/smartfact.cc

@@ -678 +678 @@
 
         if (last<FSC::State::kConnected && state==FSC::State::kConnected)
-            SetAudio("sound_13");
+            SetAudio("startup");
 
         if (last==FSC::State::kConnected && state<FSC::State::kConnected)
-            SetAudio("sound_14");
+            SetAudio("shutdown");
     }
 
@@ -711 +711 @@
 
             ostringstream out;
-            out << HTML::kBlue << '\t' << d.GetTimeAsStr("%H:%M:%S") << " " << d.Ptr<char>(16);
+            out << d.GetTimeAsStr("%H:%M:%S") << " <#darkgreen>" << d.Ptr<char>(16);
             if (!fDriveControlSourceName.empty())
-                out << " [" << fDriveControlSourceName << "]\n";
+                out << " [" << fDriveControlSourceName << ']';
+            out << "</#><br/>";
             fMcpConfigurationHist.push_back(out.str());
         }
@@ -723 +724 @@
 
             ostringstream out;
-            out << HTML::kGreen << '\t' << d.GetTimeAsStr("%H:%M:%S") << " " << fMcpConfigurationName << '\n';
+            out << d.GetTimeAsStr("%H:%M:%S") << " <#darkred>" << fMcpConfigurationName;
+            if (!fDriveControlSourceName.empty())
+                out << " [" << fDriveControlSourceName << ']';
+            out << "</#><br/>";
             fMcpConfigurationHist.push_back(out.str());
-            if (!fDriveControlSourceName.empty())
-                out << " [" << fDriveControlSourceName << "]\n";
         }
 
@@ -737 +739 @@
         ostringstream out;
         out << d.GetJavaDate() << '\n';
+        out << HTML::kWhite << '\t';
         for (auto it=fMcpConfigurationHist.rbegin(); it!=fMcpConfigurationHist.rend(); it++)
             out << *it;
-
-        ofstream(fPath+"/observations.txt") << out.str();
+        out << '\n';
+
+        ofstream(fPath+"/observations.data") << out.str();
 
         return GetCurrentState();
@@ -1784 +1788 @@
                 observer.lat = lat;
 
-                ln_hrz_posn hrz;
                 ln_equ_posn pos;
                 pos.ra  = ra*15;
                 pos.dec = dec;
 
+                ln_hrz_posn hrz;
                 ln_get_hrz_from_equ(&pos, &observer, now.JD(), &hrz);
-                //az =    hrz.az;
 
                 string col = HTML::kWhite;
@@ -1951 +1954 @@
         if (newerr)
         {
-            SetAudio("sound_7");
+            SetAudio("error");
 
             out << now.JavaDate() << '\n';