layers: remove last remnants of get<T> to read ints from json

[staging/windowmanager.git] / src / layers.cpp

diff --git a/src/layers.cpp b/src/layers.cpp
index 1e44a1b..8f79451 100644 (file)
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -1,6 +1,18 @@
-//
-// Created by m on 7/27/17.
-//
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include <algorithm>
 
@@ -13,27 +25,25 @@ namespace wm {
 using json = nlohmann::json;
 
 layer::layer(nlohmann::json const &j) {
-   DB(j);
    if (j["type"] == "range") {
-      this->id_min = get<int>(j["first_surface_id"]);
-      this->id_max = get<int>(j["last_surface_id"]);
+      this->id_min = j["first_surface_id"];
+      this->id_max = j["last_surface_id"];
    } else {
-      this->id_min = this->id_max = get<int>(j["surface_id"]);
+      this->id_min = this->id_max = j["surface_id"];
    }
    this->name = j["name"].get<std::string>();
-   this->layer_id = get<int>(j["layer_id"]);
-   this->rect = genivi::rect{-1, -1, 0, 0};
+   this->layer_id = j["layer_id"];
+   this->rect = genivi::full_rect;
    if (j["area"]["type"] == "rect") {
       auto jr = j["area"]["rect"];
       this->rect = genivi::rect{
-         get<int32_t>(jr["width"]), get<int32_t>(jr["height"]),
-         get<int32_t>(jr["x"]), get<int32_t>(jr["y"]),
+         jr["width"], jr["height"],
+         jr["x"], jr["y"],
       };
    }
 }
 
 struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
-   DB(j);
    try {
       layer_map stl{};
       auto m = j["mappings"];
@@ -55,24 +65,28 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
          }
       }
 
+      auto msi = j.find("main_surface");
+      if (msi != j.end()) {
+         stl.main_surface = (*msi)["surface_id"];
+      }
+
       // Check lookup
       auto jtests = j.value("tests", json());
 
       if (!jtests.empty()) {
-         DB("Embedded tests...");
+         logdebug("Embedded tests...");
          std::vector<std::pair<int, int>> tests;
          tests.reserve(jtests.size());
          std::transform(std::cbegin(jtests), std::cend(jtests),
                         std::back_inserter(tests), [](json const &j) {
                            return std::make_pair(
-                              get<int>(j["surface_id"]),
-                              get<int>(j["expect_layer_id"]));
+                              j["surface_id"],
+                              j["expect_layer_id"]);
                         });
 
          for (auto sid : tests) {
             int lid = stl.get_layer_id(sid.first).value_or(-1);
-            DB("this=" << sid.first << ", that=" << lid
-                       << ", expect=" << sid.second);
+            logdebug("this=%d, that=%d, expect=%d", sid.first, lid, sid.second);
             if (lid != sid.second) {
                return Err<layer_map>("ID Map embedded test failed!");
             }
@@ -119,4 +133,36 @@ optional<genivi::rect> layer_map::get_layer_rect(int surface_id) {
    return e ? optional<genivi::rect>(e->rect) : nullopt;
 }
 
+json layer::to_json() const {
+   auto is_full = this->rect == genivi::full_rect;
+
+   json r{};
+   if (is_full) {
+      r = {{"type", "full"}};
+   } else {
+      r = {{"type", "rect"},
+           {"rect",
+            {{"x", this->rect.x},
+             {"y", this->rect.y},
+             {"width", this->rect.w},
+             {"height", this->rect.h}}}};
+   }
+
+   return {
+      {"id_min", this->id_min},
+      {"id_max", this->id_max},
+      {"name", this->name},
+      {"layer_id", this->layer_id},
+      {"area", r},
+   };
+}
+
+json layer_map::to_json() const {
+   json j{};
+   for (auto const &i : this->mapping) {
+      j.push_back(i.to_json());
+   }
+   return j;
+}
+
 }  // namespace wm