This commit is contained in:
2026-02-14 14:31:01 +01:00
parent 64d39b8355
commit f376850646
3 changed files with 12 additions and 18 deletions
+3 -5
View File
@@ -1,7 +1,6 @@
#include "UI_plot.hpp" #include "UI_plot.hpp"
UI_plot::UI_plot(QObject* parent) UI_plot::UI_plot(QObject *parent) : UI_item{UI_PLOT_TYPE, parent}
: UI_item{UI_PLOT_TYPE, parent}
{ {
} }
@@ -11,12 +10,11 @@ UI_plot::UI_plot(std::string text, std::string x_label, std::string y_label, QOb
set_text(text); set_text(text);
} }
UI_plot::UI_plot(const json &j, QObject *parent) UI_plot::UI_plot(const json &j, QObject *parent) : UI_item{UI_PLOT_TYPE, parent}
: UI_item{UI_PLOT_TYPE, parent}
{ {
from_json(j); from_json(j);
} }
\
void UI_plot::set_x_label(std::string name) void UI_plot::set_x_label(std::string name)
{ {
m_x_label = name; m_x_label = name;
+3 -2
View File
@@ -4,13 +4,14 @@
#include "UI_item.hpp" #include "UI_item.hpp"
#define UI_PLOT_TYPE std::string("UI_plot") #define UI_PLOT_TYPE std::string("UI_plot")
class UI_plot : public UI_item { class UI_plot : public UI_item
{
Q_OBJECT Q_OBJECT
public: public:
explicit UI_plot(QObject *parent = nullptr); explicit UI_plot(QObject *parent = nullptr);
UI_plot(std::string text, std::string x_label, std::string y_label, QObject *parent = nullptr); UI_plot(std::string text, std::string x_label, std::string y_label, QObject *parent = nullptr);
UI_plot(const json &j, QObject *parent = nullptr); UI_plot(const json &j, QObject *parent = nullptr);
\
void set_x_label(std::string name); void set_x_label(std::string name);
std::string x_label() const; std::string x_label() const;
void set_y_label(std::string name); void set_y_label(std::string name);
+2 -7
View File
@@ -555,13 +555,8 @@ void Simulator_base::process_ui_plot(json &uiItem)
plot->setAxisTitle(QwtAxis::YLeft, y_label); plot->setAxisTitle(QwtAxis::YLeft, y_label);
} }
plot->curve()->setRawSamples( plot->curve()->setRawSamples(x_vals.data(), y_vals.data(), x_vals.capacity());
x_vals.data(), plot->setAxisScale(QwtAxis::XBottom, x_vals[x_vals.capacity() - 1], x_vals[0]);
y_vals.data(),
x_vals.capacity()
);
plot->setAxisScale( QwtAxis::XBottom,
x_vals[x_vals.capacity() - 1], x_vals[0] );
// plot_time[0], plot_time[api.get_plot_size() - 1] ); // plot_time[0], plot_time[api.get_plot_size() - 1] );
plot->replot(); plot->replot();
} }