[glass] Move NetworkTablesSettings to libglassnt (#3224)

glass/src/app/native/cpp/NetworkTablesSettings.cpp

@@ -1,73 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-#include "NetworkTablesSettings.h"
-
-#include <utility>
-
-#include <imgui.h>
-#include <imgui_stdlib.h>
-#include <ntcore_cpp.h>
-#include <wpi/SmallVector.h>
-#include <wpi/StringRef.h>
-#include <wpi/raw_ostream.h>
-
-#include "glass/Context.h"
-
-NetworkTablesSettings::NetworkTablesSettings(NT_Inst inst,
-                                             const char* storageName)
-    : m_inst{inst} {
-  auto& storage = glass::GetStorage(storageName);
-  m_pMode = storage.GetIntRef("mode");
-  m_pIniName = storage.GetStringRef("iniName", "networktables.ini");
-  m_pServerTeam = storage.GetStringRef("serverTeam");
-  m_pListenAddress = storage.GetStringRef("listenAddress");
-}
-
-void NetworkTablesSettings::Update() {
-  if (!m_restart) {
-    return;
-  }
-  m_restart = false;
-  nt::StopClient(m_inst);
-  nt::StopServer(m_inst);
-  nt::StopLocal(m_inst);
-  if (*m_pMode == 1) {
-    wpi::StringRef serverTeam{*m_pServerTeam};
-    unsigned int team;
-    if (!serverTeam.contains('.') && !serverTeam.getAsInteger(10, team)) {
-      nt::StartClientTeam(m_inst, team, NT_DEFAULT_PORT);
-    } else {
-      wpi::SmallVector<wpi::StringRef, 4> serverNames;
-      wpi::SmallVector<std::pair<wpi::StringRef, unsigned int>, 4> servers;
-      serverTeam.split(serverNames, ',', -1, false);
-      for (auto&& serverName : serverNames) {
-        servers.emplace_back(serverName, NT_DEFAULT_PORT);
-      }
-      nt::StartClient(m_inst, servers);
-    }
-  } else if (*m_pMode == 2) {
-    nt::StartServer(m_inst, m_pIniName->c_str(), m_pListenAddress->c_str(),
-                    NT_DEFAULT_PORT);
-  }
-}
-
-void NetworkTablesSettings::Display() {
-  static const char* modeOptions[] = {"Disabled", "Client", "Server"};
-  ImGui::Combo("Mode", m_pMode, modeOptions, 3);
-  switch (*m_pMode) {
-    case 1:
-      ImGui::InputText("Team/IP", m_pServerTeam);
-      break;
-    case 2:
-      ImGui::InputText("Listen Address", m_pListenAddress);
-      ImGui::InputText("ini Filename", m_pIniName);
-      break;
-    default:
-      break;
-  }
-  if (ImGui::Button("Apply")) {
-    m_restart = true;
-  }
-}

glass/src/app/native/cpp/NetworkTablesSettings.h

@@ -1,32 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-#pragma once
-
-#include <string>
-
-#include <ntcore_cpp.h>
-
-namespace wpi {
-template <typename T>
-class SmallVectorImpl;
-}  // namespace wpi
-
-class NetworkTablesSettings {
- public:
-  explicit NetworkTablesSettings(
-      NT_Inst inst = nt::GetDefaultInstance(),
-      const char* storageName = "NetworkTables Settings");
-
-  void Update();
-  void Display();
-
- private:
-  NT_Inst m_inst;
-  bool m_restart = true;
-  int* m_pMode;
-  std::string* m_pIniName;
-  std::string* m_pServerTeam;
-  std::string* m_pListenAddress;
-};

glass/src/app/native/cpp/main.cpp

@@ -10,12 +10,12 @@
 #include <wpi/SmallString.h>
 #include <wpigui.h>
 
-#include "NetworkTablesSettings.h"
 #include "glass/Context.h"
 #include "glass/Model.h"
 #include "glass/View.h"
 #include "glass/networktables/NetworkTables.h"
 #include "glass/networktables/NetworkTablesProvider.h"
+#include "glass/networktables/NetworkTablesSettings.h"
 #include "glass/other/Log.h"
 #include "glass/other/Plot.h"
 
@@ -37,7 +37,7 @@ static std::unique_ptr<glass::PlotProvider> gPlotProvider;
 static std::unique_ptr<glass::NetworkTablesProvider> gNtProvider;
 
 static std::unique_ptr<glass::NetworkTablesModel> gNetworkTablesModel;
-static std::unique_ptr<NetworkTablesSettings> gNetworkTablesSettings;
+static std::unique_ptr<glass::NetworkTablesSettings> gNetworkTablesSettings;
 static glass::LogData gNetworkTablesLog;
 static glass::Window* gNetworkTablesWindow;
 static glass::Window* gNetworkTablesSettingsWindow;
@@ -111,7 +111,7 @@ static void NtInitialize() {
   }
 
   // NetworkTables settings window
-  gNetworkTablesSettings = std::make_unique<NetworkTablesSettings>();
+  gNetworkTablesSettings = std::make_unique<glass::NetworkTablesSettings>();
   gui::AddEarlyExecute([] { gNetworkTablesSettings->Update(); });
 
   gNetworkTablesSettingsWindow = gNtProvider->AddWindow(