git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / common / diagnostics / graph.h

diff --git a/common/diagnostics/graph.h b/common/diagnostics/graph.h
index dc8aac1e64fb34d077cf6f2a9656057e9baeb302..268d74cb528aa8bbeba5e4199278a52b259502e7 100644 (file)
--- a/common/diagnostics/graph.h
+++ b/common/diagnostics/graph.h
@@ -1,9 +1,27 @@
+/*\r
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+*\r
+*  This file is part of CasparCG.\r
+*\r
+*    CasparCG is free software: you can redistribute it and/or modify\r
+*    it under the terms of the GNU General Public License as published by\r
+*    the Free Software Foundation, either version 3 of the License, or\r
+*    (at your option) any later version.\r
+*\r
+*    CasparCG is distributed in the hope that it will be useful,\r
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+*    GNU General Public License for more details.\r
+\r
+*    You should have received a copy of the GNU General Public License\r
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+*/\r
 #pragma once\r
 \r
 #include "../memory/safe_ptr.h"\r
 \r
-#include "../utility/printer.h"\r
-\r
+#include <functional>\r
 #include <string>\r
 #include <vector>\r
 #include <map>\r
@@ -11,7 +29,11 @@
 #include <boost/range/iterator_range.hpp>\r
 #include <boost/circular_buffer.hpp>\r
 \r
-namespace caspar { namespace diagnostics {\r
+namespace caspar {\r
+               \r
+typedef std::function<std::wstring()> printer;\r
+       \r
+namespace diagnostics {\r
        \r
 struct color\r
 {\r
@@ -29,24 +51,24 @@ struct color
 \r
 class graph\r
 {\r
-       friend safe_ptr<graph> create_graph(const std::string& name);\r
-       friend safe_ptr<graph> create_graph(const printer& parent_printer);\r
-       graph(const std::string& name);\r
-       graph(const printer& parent_printer);\r
+       friend void register_graph(const safe_ptr<graph>& graph);\r
 public:\r
-       void update(const std::string& name, float value);\r
-       void set(const std::string& name, float value);\r
-       void tag(const std::string& name);\r
-       void guide(const std::string& name, float value);\r
+       graph();\r
+       void set_text(const std::string& value);\r
+       void set_text(const std::wstring& value);\r
+       void update_value(const std::string& name, double value);\r
+       void set_value(const std::string& name, double value);\r
        void set_color(const std::string& name, color c);\r
+       void add_tag(const std::string& name);\r
+       void add_guide(const std::string& name, double value);\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r
 };\r
 \r
-safe_ptr<graph> create_graph(const std::string& name);\r
-safe_ptr<graph> create_graph(const printer& parent_printer);\r
-       \r
+void register_graph(const safe_ptr<graph>& graph);\r
+void show_graphs(bool value);\r
+\r
 //namespace v2\r
 //{\r
 //     \r