Squashed 'third_party/allwpilib/' changes from e473a00f97..e4b91005cf
e4b91005cf [examples] Update SwerveModule constructor doc (NFC) (#4042)
a260bfd83b [examples] Remove "this" keyword from SwerveModule (#4043)
18e262a100 [examples] Fix multiple doc typos in SwerveControllerCommand example (NFC) (#4044)
4bd1f526ab [wpilibc] Prevent StopMotor from terminating robot during MotorSafety check (#4038)
27847d7eb2 [sim] Expose GUI control functions via HAL_RegisterExtension (#4034)
b2a8d3f0f3 [wpilibc] Add mechanism to reset MotorSafety list (#4037)
49adac9564 [wpilib] Check for signedness in ArcadeDriveIK() (#4028)
a19d1133b1 [wpiutil] libuv: Fix sign compare warnings in gcc 11.2 (#4031)
dde91717e4 [build] cmake: Add ability to customize target warnings (#4032)
e9050afd67 [sim] Update sim match time to match real robot (#4024)
165d2837cf [wpilib] Preferences: Set Persistent in Init methods (#4025)
ac7549edca [glass] Fix snprintf truncation warning (#4029)
4d96bc72e0 [wpilibj] Fix typos in error messages for non-null assertions (#4014)
3411eee20f [hal] Replace hardcoded sim array sizes with constants (#4015)
74de97eeca [wpilibc] Add mechanism to reset various global structures (#4007)
4e3cc25012 [examples] Fix periodic function rate comment (NFC) (#4013)
90c1db393e [sim] Add exported functions to control the sim GUI (#3995)
2f43274aa4 [wpilibj] MechanismRoot2d: Add flush to setPosition (#4011)
aeca09db09 [glass] Support remapping of Enter key (#3994)
c107f22c67 [sim] Sim GUI: don't force-show Timing and Other Devices (#4001)
68fe51e8da [wpigui] Update PFD to latest, fix kdialog multiselect (#4005)
8d08d67cf1 [wpigui] PFD: Add console warning if file chooser unavailable (#4003)
4f1782f66e [wpilibc] Only call HAL_Report when initializing SmartDashboard (#4006)
3f77725cd3 Remove uses of iostream (#4004)
5635f33a32 [glass] Increase plot depth to 20K points (#3993)
bca4b7111b [glass] Fix PlotSeries::SetSource() (#3991)
6a6366b0d6 [commands] Add until() as alias for withInterrupt() (#3981)
16bf2c70c5 [wpilib] Fix joystick out of range error messages (#3988)
4b3edb742c [wpilib] Fix ADIS16448 IMU default constructor not working in Java (#3989)
fcf23fc9e9 [hal] Fix potential gamedata out of bounds read (#3983)
af5ef510c5 [wpilibc] Fix REV PH pulse duration units (#3982)
05401e2b81 [wpilib] Write REV PH firmware version to roboRIO to display on driver station (#3977)
9fde0110b6 Update to 2022 v4.0 image (#3944)
b03f8ddb2e [examples] fix incorrect variable in Arm Simulation Pref (#3980)
a26df2a022 [examples] Update ArmSimulation example to use Preferences (#3976)
d68d6674e8 [examples] Armbot: rename kCos to kG (#3975)
a8f0f6bb90 [wpilibj] Fix ADIS16448 getRate to return rate instead of angle (#3974)
dd9c92d5bf [build] Remove debug info from examples (#3971)
84df14dd70 [rtns] Fix icons (#3972)
560094ad92 [examples] Correct Mecanum example axes (#3955)
7ea1be9c01 [wpilibc] Fix typo in hardware version for REV PDH (#3969)
700f13bffd [wpilibj] Make methods public for Java REV PDH (#3970)
b6aa7c1aa9 [wpilibj] Make methods public for Java REVPH (#3968)
eb4d183e48 [wpimath] Fix clang-tidy bugprone-integer-division warning (#3966)
77e4e81e1e [wpilib] Add Field widget to BuiltInWidgets in shuffleboard (#3961)
88f5cb6eb0 [build] Publish PDBs with C++ tools (#3960)
efae552f3e [wpimath] Remove DifferentialDriveKinematics include from odometry (#3958)
46b277421a [glass] Update Speed Controller Type name for 2022 WPILib (#3952)
42908126b9 [wpilib] Add DCMotorSim (#3910)
a467392cbd [wpiutil] StackTrace: Add ability to override default implementation (#3951)
78d0bcf49d [templates] Add SimulationInit()/SimulationPeriodic() to robot templates (#3943)
02a0ced9b0 [wpilib] MecanumDrive: update docs for axis to match implementation (NFC) (#3942)
4ccfe1c9f2 [wpilib] Added docs clarification on units for drive class WheelSpeeds (NFC) (#3939)
830c0c5c2f [wpilib] MechanismLigament2d: Add getters for color and line weight (#3947)
5548a37465 [wpilib] PowerDistribution: Add module type getter (#3948)
2f9a600de2 [hal] Fix PCM one shot (#3949)
559db11a20 [myRobot] Skip deploying debug libraries for myRobot deploys (#3950)
76c78e295b [examples] Reorder SwerveModules in SwerveControllerCommand example odometry update (#3934)
debbd5ff4b [wpilib] Improve PowerDistribution docs (NFC) (#3925)
841174f302 [commands] Change command vendordep JSON version number to 1.0.0 (#3938)
8c55844f91 [wpilib] Remove comment about Mecanum right side inverted (NFC) (#3929)
0b990bf0f5 [hal] Fix PCM sticky faults clear function crashing (#3932)
104d7e2abc [hal] Don't throw exceptions in PCM JNI (#3933)
5ba69e1af1 [examples] Updated type in Java SwerveModule (#3928)
f3a0b5c7d7 [wpimath] Fix Java SimpleMotorFeedforward Docs (NFC) (#3926)
7f4265facc [wpimath] Add LinearFilter::FiniteDifference() (#3900)
63d1fb3bed [wpiutil] Modify fmt to not throw on write failure (#3919)
36af6d25a5 [wpimath] Fix input vector in pose estimator docs (NFC) (#3923)
8f387f7255 [wpilibj] Switch ControlWord mutex to actual reentrant mutex (#3922)
792e735e08 [wpimath] Move TrajectoryGenerator::SetErrorHandler definition to .cpp (#3920)
3b76de83eb [commands] Fix ProfiledPIDCommand use-after-free (#3904)
ad9f738cfa [fieldimages] Fix maven publishing (#3897)
49455199e5 [examples] Use left/rightGroup.Get() for simulator inputs to fix inversions (#3908)
64426502ea [wpimath] Fix arm -> flywheel typo (NFC) (#3911)
8cc112d196 [wpiutil] Fix wpi::array for move-only types (#3917)
e78cd49861 [build] Upgrade Java formatter plugins (#3894)
cfb4f756d6 [build] Upgrade to shadow 7.1.2 (#3893)
ba0908216c [wpimath] Fix crash in KF latency compensator (#3888)
a3a0334fad [build] cmake: Move fieldImages to WITH_GUI (#3885)
cf7460c3a8 [fieldImages] Add 2022 field (#3883)
db0fbb6448 [wpimath] Fix LQR matrix constructor overload for Q, R, and N (#3884)
8ac45f20bb [commands] Update Command documentation (NFC) (#3881)
b3707cca0b [wpiutil] Upgrade to fmt 8.1.1 (#3879)
a69ee3ece9 [wpimath] Const-qualify Twist2d scalar multiply (#3882)
750d9a30c9 [examples] Fix Eigen out of range error when running example (#3877)
41c5b2b5ac [rtns] Add cmake build (#3866)
6cf3f9b28e [build] Upgrade to Gradle 7.3.3 (#3878)
269cf03472 [examples] Add communication examples (e.g. arduino) (#2500)
5ccfc4adbd [oldcommands] Deprecate PIDWrappers, since they use deprecated interfaces (#3868)
b6f44f98be [hal] Add warning about onboard I2C (#3871)
0dca57e9ec [templates] romieducational: Invert drivetrain and disable motor safety (#3869)
22c4da152e [wpilib] Add GetRate() to ADIS classes (#3864)
05d66f862d [templates] Change the template ordering to put command based first (#3863)
b09f5b2cf2 [wpilibc] Add virtual dtor for LinearSystemSim (#3861)
a2510aaa0e [wpilib] Make ADIS IMU classes unit-safe (#3860)
947f589916 [wpilibc] Rename ADIS_16470_IMU.cpp to match class name (#3859)
bbd8980a20 [myRobot] Fix cameraserver library order (#3858)
831052f118 [wpilib] Add simulation support to ADIS classes (#3857)
c137569f91 [wpilib] Throw exception if the REV Pneumatic Hub firmware version is older than 22.0.0 (#3853)
dae61226fa Fix Maven Artifacts readme (#3856)
3ad4594a88 Update Maven artifacts readme for 2022 (#3855)
112acb9a62 [wpilibc] Move ADIS IMU constants to inside class (#3852)
ecee224e81 [wpilib] Allow SendableCameraWrappers to take arbitrary URLs (#3850)
a3645dea34 LICENSE: Bump year range to include 2022 (#3854)
7c09f44898 [wpilib] Use PSI for compressor config and sensor reading (#3847)
f401ea9aae [wpigui] Remove wpiutil linkage (#3851)
bf8517f1e6 [wpimath] TimeInterpolatableBufferTest: Fix lint warnings (#3849)
528087e308 [hal] Use enums with fixed underlying type in clang C (#3297)
1f59ff72f9 [wpilib] Add ADIS IMUs (#3777)
315be873c4 [wpimath] Add TimeInterpolatableBuffer (#2695)
b8d019cdb4 [wpilib] Rename NormalizeWheelSpeeds to DesaturateWheelSpeeds (#3791)
102f23bbdb [wpilibj] DriverStation: Set thread interrupted state (#3846)
b85c24a79c [wpilib] Add warning about onboard I2C (#3842)
eee29daaf9 [newCommands] Trigger: Allow override of debounce type (#3845)
aa9dfabde2 [wpimath] Move debouncer to filters (#3838)
5999a26fba [wpiutil] Add GetSystemTime() (#3840)
1e82595ffb [examples] Fix arcade inversions (#3841)
e373fa476b [wpiutil] Add disableMockTime to JNI (#3839)
dceb5364f4 [examples] Ensure right side motors are inverted (#3836)
baacbc8e24 [wpilib] Tachometer: Add function to return RPS (#3833)
84b15f0883 [templates] Add Java Romi Educational template (#3837)
c0da9d2d35 [examples] Invert Right Motor in Romi Java examples (#3828)
0fe0be2733 [build] Change project year to intellisense (#3835)
eafa947338 [wpimath] Make copies of trajectory constraint arguments (#3832)
9d13ae8d01 [wpilib] Add notes for Servo get that it only returns cmd (NFC) (#3820)
2a64e4bae5 [wpimath] Give drivetrain a more realistic width in TrajectoryJsonTest.java (#3822)
c3fd20db59 [wpilib] Fix trajectory sampling in DifferentialDriveSim test (#3821)
6f91f37cd0 [examples] Fix SwerveControllerCommand order of Module States (#3815)
5158730b81 [wpigui] Upgrade to imgui 1.86, GLFW 3.3.6 (#3817)
2ad2d2ca96 [wpiutil] MulticastServiceResolver: Fix C array returning functions (#3816)
b5fd29774f [wpilibj] Trigger: implement BooleanSupplier interface (#3811)
9f8f330e96 [wpilib] Fix Mecanum and SwerveControllerCommand when desired rotation passed (#3808)
1ad3b1b333 [hal] Don't copy byte to where null terminator goes (#3807)
dfc24425c3 [build] Fix gazebo gradle IDE warnings (#3806)
c02577bb51 [glass] Configure delay loading for windows camera server support (#3803)
c9e6a96a61 [wpilib] Document range of Servo angle (NFC) (#3796)
9778626f34 [wpilib, hal] Add support for getting faults and versions from power distribution (#3794)
34b2d0dae1 [wpilib, hal] High Level REV PH changes (#3792)
59a7528fd6 [cscore] Fix crash when usbcamera is deleted before message pump thread fully starts (#3804)
11d9859ef1 [build] Update plugins to remove log4j vulnerabilities (#3805)
e44ed752ad [glass] Fix CollapsingHeader in Encoder, PCM, and DeviceTree (#3797)
52b2dd5b89 [build] Bump native utils to remove log4j (#3802)
c46636f218 [wpilib] Improve new counter classes documentation (NFC) (#3801)
dc531462e1 [build] Update to gradle 7.3.2 (#3800)
92ba98621c [wpimath] Add helper variable templates for units type traits (#3790)
d41d051f1b [wpilibc] Fix Mecanum & Swerve ControllerCommand lambda capture (#3795)
c5ae0effac OtherVersions.md: Add one missing case of useLocal (#3788)
b3974c6ed3 [wpimath] Upgrade to Drake v0.37.0 (#3786)
589a00e379 [wpilibc] Start DriverStation thread from RobotBase (#3785)
8d9836ca02 [wpilib] Improve curvature drive documentation (NFC) (#3783)
8b5bf8632e [myRobot] Add wpimath and wpiutil JNI (#3784)
1846114491 [examples] Update references from characterization to SysId (NFC) (#3782)
2c461c794e [build] Update to gradle 7.3 (#3778)
109363daa4 [hal] Add remaining driver functions for REVPH (#3776)
41d26bee8d [hal] Refactor REV PDH (#3775)
7269a170fb Upgrade maven deps to latest versions and fix new linter errors (#3772)
441f2ed9b0 [build] actions: use fixed image versions instead latest (#3761)
15275433d4 [examples] Fix duplicate port allocations in C++ SwerveBot/SwerveDrivePoseEstimator/RomiReference (#3773)
1ac02d2f58 [examples] Fix drive Joystick axes in several examples (#3769)
8ee6257e92 [wpilib] DifferentialDrivetrainSim.KitbotMotor: Add NEO and Falcon 500 (#3762)
d81ef2bc5c [wpilib] Fix deadlocks in Mechanism2d et al. (#3770)
acb64dff97 [wpimath] Make RamseteController::Calculate() more concise (#3763)
3f6cf76a8c [hal] Refactor REV PH CAN frames (#3756)
3ef2dab465 [wpilib] DutyCycleEncoder: add setting of duty cycle range (#3759)
a5a56dd067 Readme: Add Visual Studio 2022 (#3760)
04957a6d30 [wpimath] Fix units of RamseteController's b and zeta (#3757)
5da54888f8 [glass] Upgrade imgui to 0.85, implot to HEAD, glfw to 3.3.5 (#3754)
6c93365b0f [wpiutil] MulticastService cleanup (#3750)
1c4a8bfb66 [cscore] Cleanup Windows USB camera impl (#3751)
d51a1d3b3d [rtns] Fix icon (#3749)
aced2e7da6 Add roboRIO Team Number Setter tool (#3744)
fa1ceca83a [wpilibj] Use DS cache for iterative robot control word cache (#3748)
0ea05d34e6 [build] Update to gradle 7.2 (#3746)
09db4f672b [build] Update to native utils 2022.6.1 (#3745)
4ba80a3a8c [wpigui] Don't recursively render frames in size callback (#3743)
ae208d2b17 [wpiutil] StringExtras: Add substr() (#3742)
6f51cb3b98 [wpiutil] MulticastResolver: make event manual reset, change to multiple read (#3736)
f6159ee1a2 [glass] Fix Drive widget handling of negative rotation (#3739)
7f401ae895 [build] Update NI libraries to 2022.2.3 (#3738)
0587b7043a [glass] Use JSON files for storage instead of imgui ini
0bbf51d566 [wpigui] Change maximized to bool
92c6eae6b0 [wpigui] PFD: Add explicit to constructors
141354cd79 [wpigui] Add hooks for custom load/save settings
f6e9fc7d71 [wpiutil] Handle multicast service collision on linux (#3734)
d8418be7d1 [glass, outlineviewer] Return 0 from WinMain (#3735)
82066946e5 [wpiutil] Add mDNS resolver and announcer (#3733)
4b1defc8d8 [wpilib] Remove automatic PD type from module type enum (#3732)
da90c1cd2c [wpilib] Add bang-bang controller (#3676)
3aa54fa027 [wpilib] Add new counter implementations (#2447)
b156db400d [hal, wpilib] Incorporate pneumatic control type into wpilibc/j (#3728)
9aba2b7583 [oldCommands] Add wrappers for WPILib objects to work with old PID Controller (#3710)
a9931223f0 [hal] Add REV PH faults (#3729)
aacf9442e4 [wpimath] Fix units typo in LinearSystemId source comment (#3730)
7db10ecf00 [wpilibc] Make SPI destructor virtual since SPI contains virtual functions (#3727)
a0a5b2aea5 [wpimath] Upgrade to EJML 0.41 (#3726)
eb835598a4 [hal] Add HAL functions for compressor config modes on REV PH (#3724)
f0ab6df5b6 [wpimath] Upgrade to Drake v0.36.0 (#3722)
075144faa3 [docs] Parse files without extensions with Doxygen (#3721)
32468a40cb [hal] Remove use of getDmaDescriptor from autospi (#3717)
38611e9dd7 [hal] Fix REVPH Analog Pressure channel selection (#3716)
4d78def31e [wpilib] Add DeadbandElimination forwarding to PWMMotorController (#3714)
3be0c1217a [wpilibcExamples] Make GearsBot use idiomatic C++ (#3711)
42d3a50aa2 [hal] Check error codes during serial port initialization (#3712)
52f1464029 Add project with field images and their json config files (#3668)
68ce62e2e9 [hal] Add autodetect for power modules (#3706)
3dd41c0d37 [wpilib] Don't print PD errors for LiveWindow reads (#3708)
7699a1f827 [hal] Fix sim not working with automatic PD type and default module (#3707)
Change-Id: I6b0b8fa8b2d2a24071240f624db9ec6d127f6648
git-subtree-dir: third_party/allwpilib
git-subtree-split: e4b91005cf69161f1cb3d934f6526232e6b9169e
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/glass/src/lib/native/cpp/Context.cpp b/glass/src/lib/native/cpp/Context.cpp
index 936acb2..1de4af8 100644
--- a/glass/src/lib/native/cpp/Context.cpp
+++ b/glass/src/lib/native/cpp/Context.cpp
@@ -7,13 +7,21 @@
#include <algorithm>
#include <cinttypes>
#include <cstdio>
+#include <filesystem>
+#include <fmt/format.h>
#include <imgui.h>
#include <imgui_internal.h>
#include <imgui_stdlib.h>
#include <wpi/StringExtras.h>
+#include <wpi/fs.h>
+#include <wpi/json.h>
+#include <wpi/json_serializer.h>
+#include <wpi/raw_istream.h>
+#include <wpi/raw_ostream.h>
#include <wpi/timestamp.h>
#include <wpigui.h>
+#include <wpigui_internal.h>
#include "glass/ContextInternal.h"
@@ -21,172 +29,292 @@
Context* glass::gContext;
-static bool ConvertInt(Storage::Value* value) {
- value->type = Storage::Value::kInt;
- if (auto val = wpi::parse_integer<int>(value->stringVal, 10)) {
- value->intVal = val.value();
- return true;
+static void WorkspaceResetImpl() {
+ // call reset functions
+ for (auto&& reset : gContext->workspaceReset) {
+ if (reset) {
+ reset();
+ }
}
- return false;
+
+ // clear storage
+ for (auto&& root : gContext->storageRoots) {
+ root.second->Clear();
+ }
+
+ // ImGui reset
+ ImGui::ClearIniSettings();
}
-static bool ConvertInt64(Storage::Value* value) {
- value->type = Storage::Value::kInt64;
- if (auto val = wpi::parse_integer<int64_t>(value->stringVal, 10)) {
- value->int64Val = val.value();
- return true;
+static void WorkspaceInit() {
+ for (auto&& init : gContext->workspaceInit) {
+ if (init) {
+ init();
+ }
}
- return false;
+
+ for (auto&& root : gContext->storageRoots) {
+ root.getValue()->Apply();
+ }
}
-static bool ConvertBool(Storage::Value* value) {
- value->type = Storage::Value::kBool;
- if (auto val = wpi::parse_integer<int>(value->stringVal, 10)) {
- value->intVal = (val.value() != 0);
- return true;
+static bool JsonToWindow(const wpi::json& jfile, const char* filename) {
+ if (!jfile.is_object()) {
+ ImGui::LogText("%s top level is not object", filename);
+ return false;
}
- return false;
+
+ // loop over JSON and generate ini format
+ std::string iniStr;
+ wpi::raw_string_ostream ini{iniStr};
+
+ for (auto&& jsection : jfile.items()) {
+ if (!jsection.value().is_object()) {
+ ImGui::LogText("%s section %s is not object", filename,
+ jsection.key().c_str());
+ return false;
+ }
+ for (auto&& jsubsection : jsection.value().items()) {
+ if (!jsubsection.value().is_object()) {
+ ImGui::LogText("%s section %s subsection %s is not object", filename,
+ jsection.key().c_str(), jsubsection.key().c_str());
+ return false;
+ }
+ ini << '[' << jsection.key() << "][" << jsubsection.key() << "]\n";
+ for (auto&& jkv : jsubsection.value().items()) {
+ try {
+ auto& value = jkv.value().get_ref<const std::string&>();
+ ini << jkv.key() << '=' << value << "\n";
+ } catch (wpi::json::exception&) {
+ ImGui::LogText("%s section %s subsection %s value %s is not string",
+ filename, jsection.key().c_str(),
+ jsubsection.key().c_str(), jkv.key().c_str());
+ return false;
+ }
+ }
+ ini << '\n';
+ }
+ }
+ ini.flush();
+
+ ImGui::LoadIniSettingsFromMemory(iniStr.data(), iniStr.size());
+ return true;
}
-static bool ConvertFloat(Storage::Value* value) {
- value->type = Storage::Value::kFloat;
- if (auto val = wpi::parse_float<float>(value->stringVal)) {
- value->floatVal = val.value();
- return true;
- }
- return false;
-}
-
-static bool ConvertDouble(Storage::Value* value) {
- value->type = Storage::Value::kDouble;
- if (auto val = wpi::parse_float<double>(value->stringVal)) {
- value->doubleVal = val.value();
- return true;
- }
- return false;
-}
-
-static void* GlassStorageReadOpen(ImGuiContext*, ImGuiSettingsHandler* handler,
- const char* name) {
- auto ctx = static_cast<Context*>(handler->UserData);
- auto& storage = ctx->storage[name];
- if (!storage) {
- storage = std::make_unique<Storage>();
- }
- return storage.get();
-}
-
-static void GlassStorageReadLine(ImGuiContext*, ImGuiSettingsHandler*,
- void* entry, const char* line) {
- auto storage = static_cast<Storage*>(entry);
- auto [key, val] = wpi::split(line, '=');
- auto& keys = storage->GetKeys();
- auto& values = storage->GetValues();
- auto it = std::find(keys.begin(), keys.end(), key);
- if (it == keys.end()) {
- keys.emplace_back(key);
- values.emplace_back(std::make_unique<Storage::Value>(val));
+static bool LoadWindowStorageImpl(const std::string& filename) {
+ std::error_code ec;
+ wpi::raw_fd_istream is{filename, ec};
+ if (ec) {
+ ImGui::LogText("error opening %s: %s", filename.c_str(),
+ ec.message().c_str());
+ return false;
} else {
- auto& value = *values[it - keys.begin()];
- value.stringVal = val;
- switch (value.type) {
- case Storage::Value::kInt:
- ConvertInt(&value);
- break;
- case Storage::Value::kInt64:
- ConvertInt64(&value);
- break;
- case Storage::Value::kBool:
- ConvertBool(&value);
- break;
- case Storage::Value::kFloat:
- ConvertFloat(&value);
- break;
- case Storage::Value::kDouble:
- ConvertDouble(&value);
- break;
- default:
- break;
+ try {
+ return JsonToWindow(wpi::json::parse(is), filename.c_str());
+ } catch (wpi::json::parse_error& e) {
+ ImGui::LogText("Error loading %s: %s", filename.c_str(), e.what());
+ return false;
}
}
}
-static void GlassStorageWriteAll(ImGuiContext*, ImGuiSettingsHandler* handler,
- ImGuiTextBuffer* out_buf) {
- auto ctx = static_cast<Context*>(handler->UserData);
-
- // sort for output
- std::vector<wpi::StringMapConstIterator<std::unique_ptr<Storage>>> sorted;
- for (auto it = ctx->storage.begin(); it != ctx->storage.end(); ++it) {
- sorted.emplace_back(it);
+static bool LoadStorageRootImpl(Context* ctx, const std::string& filename,
+ std::string_view rootName) {
+ std::error_code ec;
+ wpi::raw_fd_istream is{filename, ec};
+ if (ec) {
+ ImGui::LogText("error opening %s: %s", filename.c_str(),
+ ec.message().c_str());
+ return false;
+ } else {
+ auto& storage = ctx->storageRoots[rootName];
+ bool createdStorage = false;
+ if (!storage) {
+ storage = std::make_unique<Storage>();
+ createdStorage = true;
+ }
+ try {
+ storage->FromJson(wpi::json::parse(is), filename.c_str());
+ } catch (wpi::json::parse_error& e) {
+ ImGui::LogText("Error loading %s: %s", filename.c_str(), e.what());
+ if (createdStorage) {
+ ctx->storageRoots.erase(rootName);
+ }
+ return false;
+ }
}
- std::sort(sorted.begin(), sorted.end(), [](const auto& a, const auto& b) {
- return a->getKey() < b->getKey();
- });
+ return true;
+}
- for (auto&& entryIt : sorted) {
- auto& entry = *entryIt;
- out_buf->append("[GlassStorage][");
- out_buf->append(entry.first().data(),
- entry.first().data() + entry.first().size());
- out_buf->append("]\n");
- auto& keys = entry.second->GetKeys();
- auto& values = entry.second->GetValues();
- for (size_t i = 0; i < keys.size(); ++i) {
- out_buf->append(keys[i].data(), keys[i].data() + keys[i].size());
- out_buf->append("=");
- auto& value = *values[i];
- switch (value.type) {
- case Storage::Value::kInt:
- out_buf->appendf("%d\n", value.intVal);
- break;
- case Storage::Value::kInt64:
- out_buf->appendf("%" PRId64 "\n", value.int64Val);
- break;
- case Storage::Value::kBool:
- out_buf->appendf("%d\n", value.boolVal ? 1 : 0);
- break;
- case Storage::Value::kFloat:
- out_buf->appendf("%f\n", value.floatVal);
- break;
- case Storage::Value::kDouble:
- out_buf->appendf("%f\n", value.doubleVal);
- break;
- case Storage::Value::kNone:
- case Storage::Value::kString:
- out_buf->append(value.stringVal.data(),
- value.stringVal.data() + value.stringVal.size());
- out_buf->append("\n");
- break;
+static bool LoadStorageImpl(Context* ctx, std::string_view dir,
+ std::string_view name) {
+ WorkspaceResetImpl();
+
+ bool rv = true;
+ for (auto&& root : ctx->storageRoots) {
+ std::string filename;
+ auto rootName = root.getKey();
+ if (rootName.empty()) {
+ filename = (fs::path{dir} / fmt::format("{}.json", name)).string();
+ } else {
+ filename =
+ (fs::path{dir} / fmt::format("{}-{}.json", name, rootName)).string();
+ }
+ if (!LoadStorageRootImpl(ctx, filename, rootName)) {
+ rv = false;
+ }
+ }
+
+ WorkspaceInit();
+ return rv;
+}
+
+static wpi::json WindowToJson() {
+ size_t iniLen;
+ const char* iniData = ImGui::SaveIniSettingsToMemory(&iniLen);
+ std::string_view ini{iniData, iniLen};
+
+ // parse the ini data and build JSON
+ // JSON format:
+ // {
+ // "Section": {
+ // "Subsection": {
+ // "Key": "Value" // all values are saved as strings
+ // }
+ // }
+ // }
+
+ wpi::json out = wpi::json::object();
+ wpi::json* curSection = nullptr;
+ while (!ini.empty()) {
+ std::string_view line;
+ std::tie(line, ini) = wpi::split(ini, '\n');
+ line = wpi::trim(line);
+ if (line.empty()) {
+ continue;
+ }
+ if (line[0] == '[') {
+ // new section
+ auto [section, subsection] = wpi::split(line, ']');
+ section = wpi::drop_front(section); // drop '['; ']' was dropped by split
+ subsection = wpi::drop_back(wpi::drop_front(subsection)); // drop []
+ auto& jsection = out[section];
+ if (jsection.is_null()) {
+ jsection = wpi::json::object();
+ }
+ curSection = &jsection[subsection];
+ if (curSection->is_null()) {
+ *curSection = wpi::json::object();
+ }
+ } else {
+ // value
+ if (!curSection) {
+ continue; // shouldn't happen, but just in case
+ }
+ auto [name, value] = wpi::split(line, '=');
+ (*curSection)[name] = value;
+ }
+ }
+
+ return out;
+}
+
+bool SaveWindowStorageImpl(const std::string& filename) {
+ std::error_code ec;
+ wpi::raw_fd_ostream os{filename, ec};
+ if (ec) {
+ ImGui::LogText("error opening %s: %s", filename.c_str(),
+ ec.message().c_str());
+ return false;
+ }
+ WindowToJson().dump(os, 2);
+ os << '\n';
+ return true;
+}
+
+static bool SaveStorageRootImpl(Context* ctx, const std::string& filename,
+ const Storage& storage) {
+ std::error_code ec;
+ wpi::raw_fd_ostream os{filename, ec};
+ if (ec) {
+ ImGui::LogText("error opening %s: %s", filename.c_str(),
+ ec.message().c_str());
+ return false;
+ }
+ storage.ToJson().dump(os, 2);
+ os << '\n';
+ return true;
+}
+
+static bool SaveStorageImpl(Context* ctx, std::string_view dir,
+ std::string_view name, bool exiting) {
+ fs::path dirPath{dir};
+
+ std::error_code ec;
+ fs::create_directories(dirPath, ec);
+ if (ec) {
+ return false;
+ }
+
+ // handle erasing save files on exit if requested
+ if (exiting && wpi::gui::gContext->resetOnExit) {
+ fs::remove(dirPath / fmt::format("{}-window.json", name), ec);
+ for (auto&& root : ctx->storageRoots) {
+ auto rootName = root.getKey();
+ if (rootName.empty()) {
+ fs::remove(dirPath / fmt::format("{}.json", name), ec);
+ } else {
+ fs::remove(dirPath / fmt::format("{}-{}.json", name, rootName), ec);
}
}
- out_buf->append("\n");
}
+
+ bool rv = SaveWindowStorageImpl(
+ (dirPath / fmt::format("{}-window.json", name)).string());
+
+ for (auto&& root : ctx->storageRoots) {
+ auto rootName = root.getKey();
+ std::string filename;
+ if (rootName.empty()) {
+ filename = (dirPath / fmt::format("{}.json", name)).string();
+ } else {
+ filename = (dirPath / fmt::format("{}-{}.json", name, rootName)).string();
+ }
+ if (!SaveStorageRootImpl(ctx, filename, *root.getValue())) {
+ rv = false;
+ }
+ }
+ return rv;
}
-static void Initialize(Context* ctx) {
- wpi::gui::AddInit([=] {
- ImGuiSettingsHandler ini_handler;
- ini_handler.TypeName = "GlassStorage";
- ini_handler.TypeHash = ImHashStr("GlassStorage");
- ini_handler.ReadOpenFn = GlassStorageReadOpen;
- ini_handler.ReadLineFn = GlassStorageReadLine;
- ini_handler.WriteAllFn = GlassStorageWriteAll;
- ini_handler.UserData = ctx;
- ImGui::GetCurrentContext()->SettingsHandlers.push_back(ini_handler);
+Context::Context()
+ : sourceNameStorage{storageRoots.insert({"", std::make_unique<Storage>()})
+ .first->getValue()
+ ->GetChild("sourceNames")} {
+ storageStack.emplace_back(storageRoots[""].get());
- ctx->sources.Initialize();
- });
+ // override ImGui ini saving
+ wpi::gui::ConfigureCustomSaveSettings(
+ [this] { LoadStorageImpl(this, storageLoadDir, storageName); },
+ [this] {
+ LoadWindowStorageImpl((fs::path{storageLoadDir} /
+ fmt::format("{}-window.json", storageName))
+ .string());
+ },
+ [this](bool exiting) {
+ SaveStorageImpl(this, storageAutoSaveDir, storageName, exiting);
+ });
}
-static void Shutdown(Context* ctx) {}
+Context::~Context() {
+ wpi::gui::ConfigureCustomSaveSettings(nullptr, nullptr, nullptr);
+}
Context* glass::CreateContext() {
Context* ctx = new Context;
if (!gContext) {
SetCurrentContext(ctx);
}
- Initialize(ctx);
return ctx;
}
@@ -194,7 +322,6 @@
if (!ctx) {
ctx = gContext;
}
- Shutdown(ctx);
if (gContext == ctx) {
SetCurrentContext(nullptr);
}
@@ -217,215 +344,167 @@
return gContext->zeroTime;
}
-Storage::Value& Storage::GetValue(std::string_view key) {
- auto it = std::find(m_keys.begin(), m_keys.end(), key);
- if (it == m_keys.end()) {
- m_keys.emplace_back(key);
- m_values.emplace_back(std::make_unique<Value>());
- return *m_values.back();
- } else {
- return *m_values[it - m_keys.begin()];
+void glass::WorkspaceReset() {
+ WorkspaceResetImpl();
+ WorkspaceInit();
+}
+
+void glass::AddWorkspaceInit(std::function<void()> init) {
+ if (init) {
+ gContext->workspaceInit.emplace_back(std::move(init));
}
}
-#define DEFUN(CapsName, LowerName, CType) \
- CType Storage::Get##CapsName(std::string_view key, CType defaultVal) const { \
- auto it = std::find(m_keys.begin(), m_keys.end(), key); \
- if (it == m_keys.end()) \
- return defaultVal; \
- Value& value = *m_values[it - m_keys.begin()]; \
- if (value.type != Value::k##CapsName) { \
- if (!Convert##CapsName(&value)) \
- value.LowerName##Val = defaultVal; \
- } \
- return value.LowerName##Val; \
- } \
- \
- void Storage::Set##CapsName(std::string_view key, CType val) { \
- auto it = std::find(m_keys.begin(), m_keys.end(), key); \
- if (it == m_keys.end()) { \
- m_keys.emplace_back(key); \
- m_values.emplace_back(std::make_unique<Value>()); \
- m_values.back()->type = Value::k##CapsName; \
- m_values.back()->LowerName##Val = val; \
- } else { \
- Value& value = *m_values[it - m_keys.begin()]; \
- value.type = Value::k##CapsName; \
- value.LowerName##Val = val; \
- } \
- } \
- \
- CType* Storage::Get##CapsName##Ref(std::string_view key, CType defaultVal) { \
- auto it = std::find(m_keys.begin(), m_keys.end(), key); \
- if (it == m_keys.end()) { \
- m_keys.emplace_back(key); \
- m_values.emplace_back(std::make_unique<Value>()); \
- m_values.back()->type = Value::k##CapsName; \
- m_values.back()->LowerName##Val = defaultVal; \
- return &m_values.back()->LowerName##Val; \
- } else { \
- Value& value = *m_values[it - m_keys.begin()]; \
- if (value.type != Value::k##CapsName) { \
- if (!Convert##CapsName(&value)) \
- value.LowerName##Val = defaultVal; \
- } \
- return &value.LowerName##Val; \
- } \
- }
-
-DEFUN(Int, int, int)
-DEFUN(Int64, int64, int64_t)
-DEFUN(Bool, bool, bool)
-DEFUN(Float, float, float)
-DEFUN(Double, double, double)
-
-std::string Storage::GetString(std::string_view key,
- std::string_view defaultVal) const {
- auto it = std::find(m_keys.begin(), m_keys.end(), key);
- if (it == m_keys.end()) {
- return std::string{defaultVal};
- }
- Value& value = *m_values[it - m_keys.begin()];
- value.type = Value::kString;
- return value.stringVal;
-}
-
-void Storage::SetString(std::string_view key, std::string_view val) {
- auto it = std::find(m_keys.begin(), m_keys.end(), key);
- if (it == m_keys.end()) {
- m_keys.emplace_back(key);
- m_values.emplace_back(std::make_unique<Value>(val));
- m_values.back()->type = Value::kString;
- } else {
- Value& value = *m_values[it - m_keys.begin()];
- value.type = Value::kString;
- value.stringVal = val;
+void glass::AddWorkspaceReset(std::function<void()> reset) {
+ if (reset) {
+ gContext->workspaceReset.emplace_back(std::move(reset));
}
}
-std::string* Storage::GetStringRef(std::string_view key,
- std::string_view defaultVal) {
- auto it = std::find(m_keys.begin(), m_keys.end(), key);
- if (it == m_keys.end()) {
- m_keys.emplace_back(key);
- m_values.emplace_back(std::make_unique<Value>(defaultVal));
- m_values.back()->type = Value::kString;
- return &m_values.back()->stringVal;
+void glass::SetStorageName(std::string_view name) {
+ gContext->storageName = name;
+}
+
+void glass::SetStorageDir(std::string_view dir) {
+ if (dir.empty()) {
+ gContext->storageLoadDir = ".";
+ gContext->storageAutoSaveDir = ".";
} else {
- Value& value = *m_values[it - m_keys.begin()];
- value.type = Value::kString;
- return &value.stringVal;
+ gContext->storageLoadDir = dir;
+ gContext->storageAutoSaveDir = dir;
+ gContext->isPlatformSaveDir = (dir == wpi::gui::GetPlatformSaveFileDir());
}
}
+std::string glass::GetStorageDir() {
+ return gContext->storageAutoSaveDir;
+}
+
+bool glass::LoadStorage(std::string_view dir) {
+ SaveStorage();
+ SetStorageDir(dir);
+ LoadWindowStorageImpl((fs::path{gContext->storageLoadDir} /
+ fmt::format("{}-window.json", gContext->storageName))
+ .string());
+ return LoadStorageImpl(gContext, dir, gContext->storageName);
+}
+
+bool glass::SaveStorage() {
+ return SaveStorageImpl(gContext, gContext->storageAutoSaveDir,
+ gContext->storageName, false);
+}
+
+bool glass::SaveStorage(std::string_view dir) {
+ return SaveStorageImpl(gContext, dir, gContext->storageName, false);
+}
+
+Storage& glass::GetCurStorageRoot() {
+ return *gContext->storageStack.front();
+}
+
+Storage& glass::GetStorageRoot(std::string_view rootName) {
+ auto& storage = gContext->storageRoots[rootName];
+ if (!storage) {
+ storage = std::make_unique<Storage>();
+ }
+ return *storage;
+}
+
+void glass::ResetStorageStack(std::string_view rootName) {
+ if (gContext->storageStack.size() != 1) {
+ ImGui::LogText("resetting non-empty storage stack");
+ }
+ gContext->storageStack.clear();
+ gContext->storageStack.emplace_back(&GetStorageRoot(rootName));
+}
+
Storage& glass::GetStorage() {
- auto& storage = gContext->storage[gContext->curId];
- if (!storage) {
- storage = std::make_unique<Storage>();
- }
- return *storage;
+ return *gContext->storageStack.back();
}
-Storage& glass::GetStorage(std::string_view id) {
- auto& storage = gContext->storage[id];
- if (!storage) {
- storage = std::make_unique<Storage>();
- }
- return *storage;
+void glass::PushStorageStack(std::string_view label_id) {
+ gContext->storageStack.emplace_back(
+ &gContext->storageStack.back()->GetChild(label_id));
}
-static void PushIDStack(std::string_view label_id) {
- gContext->idStack.emplace_back(gContext->curId.size());
-
- auto [label, id] = wpi::split(label_id, "###");
- // if no ###id, use label as id
- if (id.empty()) {
- id = label;
- }
- if (!gContext->curId.empty()) {
- gContext->curId += "###";
- }
- gContext->curId += id;
+void glass::PushStorageStack(Storage& storage) {
+ gContext->storageStack.emplace_back(&storage);
}
-static void PopIDStack() {
- gContext->curId.resize(gContext->idStack.back());
- gContext->idStack.pop_back();
+void glass::PopStorageStack() {
+ if (gContext->storageStack.size() <= 1) {
+ ImGui::LogText("attempted to pop empty storage stack, mismatch push/pop?");
+ return; // ignore
+ }
+ gContext->storageStack.pop_back();
}
bool glass::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) {
- PushIDStack(name);
+ PushStorageStack(name);
return ImGui::Begin(name, p_open, flags);
}
void glass::End() {
ImGui::End();
- PopIDStack();
+ PopStorageStack();
}
bool glass::BeginChild(const char* str_id, const ImVec2& size, bool border,
ImGuiWindowFlags flags) {
- PushIDStack(str_id);
+ PushStorageStack(str_id);
return ImGui::BeginChild(str_id, size, border, flags);
}
void glass::EndChild() {
ImGui::EndChild();
- PopIDStack();
+ PopStorageStack();
}
bool glass::CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags) {
- wpi::SmallString<64> openKey;
- auto [name, id] = wpi::split(label, "###");
- // if no ###id, use name as id
- if (id.empty()) {
- id = name;
- }
- openKey = id;
- openKey += "###open";
-
- bool* open = GetStorage().GetBoolRef(openKey.str());
- *open = ImGui::CollapsingHeader(
- label, flags | (*open ? ImGuiTreeNodeFlags_DefaultOpen : 0));
- return *open;
+ bool& open = GetStorage().GetChild(label).GetBool(
+ "open", (flags & ImGuiTreeNodeFlags_DefaultOpen) != 0);
+ ImGui::SetNextItemOpen(open);
+ open = ImGui::CollapsingHeader(label, flags);
+ return open;
}
bool glass::TreeNodeEx(const char* label, ImGuiTreeNodeFlags flags) {
- PushIDStack(label);
- bool* open = GetStorage().GetBoolRef("open");
- *open = ImGui::TreeNodeEx(
- label, flags | (*open ? ImGuiTreeNodeFlags_DefaultOpen : 0));
- if (!*open) {
- PopIDStack();
+ PushStorageStack(label);
+ bool& open = GetStorage().GetBool(
+ "open", (flags & ImGuiTreeNodeFlags_DefaultOpen) != 0);
+ ImGui::SetNextItemOpen(open);
+ open = ImGui::TreeNodeEx(label, flags);
+ if (!open) {
+ PopStorageStack();
}
- return *open;
+ return open;
}
void glass::TreePop() {
ImGui::TreePop();
- PopIDStack();
+ PopStorageStack();
}
void glass::PushID(const char* str_id) {
- PushIDStack(str_id);
+ PushStorageStack(str_id);
ImGui::PushID(str_id);
}
void glass::PushID(const char* str_id_begin, const char* str_id_end) {
- PushIDStack(std::string_view(str_id_begin, str_id_end - str_id_begin));
+ PushStorageStack(std::string_view(str_id_begin, str_id_end - str_id_begin));
ImGui::PushID(str_id_begin, str_id_end);
}
void glass::PushID(int int_id) {
char buf[16];
std::snprintf(buf, sizeof(buf), "%d", int_id);
- PushIDStack(buf);
+ PushStorageStack(buf);
ImGui::PushID(int_id);
}
void glass::PopID() {
ImGui::PopID();
- PopIDStack();
+ PopStorageStack();
}
bool glass::PopupEditName(const char* label, std::string* name) {