From 80375e68dee7b2c017c92a64918be79be3cf1f39 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sat, 6 Apr 2024 17:19:19 -0400 Subject: [PATCH] Replace non-standard itoa() to std::to_string() --- labo_ik/IKSolver.cpp | 1 + labo_ik/LinkUI.cpp | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/labo_ik/IKSolver.cpp b/labo_ik/IKSolver.cpp index 045faca..9db76a3 100644 --- a/labo_ik/IKSolver.cpp +++ b/labo_ik/IKSolver.cpp @@ -1,5 +1,6 @@ #pragma once +#include #include "IKSolver.h" #include "Armature.h" #include "SVD.h" diff --git a/labo_ik/LinkUI.cpp b/labo_ik/LinkUI.cpp index 691ff94..379fd3c 100644 --- a/labo_ik/LinkUI.cpp +++ b/labo_ik/LinkUI.cpp @@ -10,14 +10,13 @@ LinkUI::LinkUI(gti320::Link* _link, int _id, nanogui::Widget* _parent) : link(_l void LinkUI::init() { - static char buf[64]; static const auto rotateMinMax = std::make_pair(-1.57f, 1.57f); static const std::string baseName = "link "; // Rotate X panelRotateX = new nanogui::Widget(panel); panelRotateX->set_layout(new nanogui::BoxLayout(nanogui::Orientation::Horizontal, nanogui::Alignment::Middle, 0, 20)); - labelRotateX = new nanogui::Label(panelRotateX, baseName + itoa(id, buf, 10) + " (X): "); + labelRotateX = new nanogui::Label(panelRotateX, baseName + std::to_string(id) + " (X): "); sliderRotateX = new nanogui::Slider(panelRotateX); sliderRotateX->set_range(rotateMinMax); textboxRotateX = new nanogui::TextBox(panelRotateX); @@ -30,7 +29,7 @@ void LinkUI::init() // Rotate Y panelRotateY = new nanogui::Widget(panel); panelRotateY->set_layout(new nanogui::BoxLayout(nanogui::Orientation::Horizontal, nanogui::Alignment::Middle, 0, 20)); - labelRotateY = new nanogui::Label(panelRotateY, baseName + itoa(id, buf, 10) + " (Y): "); + labelRotateY = new nanogui::Label(panelRotateY, baseName + std::to_string(id) + " (Y): "); sliderRotateY = new nanogui::Slider(panelRotateY); sliderRotateY->set_range(rotateMinMax); textboxRotateY = new nanogui::TextBox(panelRotateY); @@ -43,7 +42,7 @@ void LinkUI::init() // Rotate Z panelRotateZ = new nanogui::Widget(panel); panelRotateZ->set_layout(new nanogui::BoxLayout(nanogui::Orientation::Horizontal, nanogui::Alignment::Middle, 0, 20)); - labelRotateZ = new nanogui::Label(panelRotateZ, baseName + itoa(id, buf, 10) + " (Z): "); + labelRotateZ = new nanogui::Label(panelRotateZ, baseName + std::to_string(id) + " (Z): "); sliderRotateZ = new nanogui::Slider(panelRotateZ); sliderRotateZ->set_range(rotateMinMax); textboxRotateZ = new nanogui::TextBox(panelRotateZ);