1
0
Fork 0
mirror of https://github.com/gwm17/implot.git synced 2024-11-23 02:38:53 -05:00

Merge branch 'master' into master

This commit is contained in:
ozlb 2020-05-11 14:33:31 +02:00 committed by GitHub
commit 825198495e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions

View File

@ -18,6 +18,7 @@ ImPlot is an immediate mode plotting widget for [Dear ImGui](https://github.com/
- mix/match multiple plot items on a single plot - mix/match multiple plot items on a single plot
- configurable axes ranges and scaling (linear/log) - configurable axes ranges and scaling (linear/log)
- reversible and lockable axes - reversible and lockable axes
- support for up to three independent y-axes
- controls for zooming, panning, box selection, and auto-fitting data - controls for zooming, panning, box selection, and auto-fitting data
- controls for creating persistent query ranges (see demo) - controls for creating persistent query ranges (see demo)
- several plot styling options: 10 marker types, adjustable marker sizes, line weights, outline colors, fill colors, etc. - several plot styling options: 10 marker types, adjustable marker sizes, line weights, outline colors, fill colors, etc.
@ -66,6 +67,10 @@ A: Yes. Plot colors, palettes, and various styling variables can be pushed/poppe
A: Yep! A: Yep!
**Q: Does ImPlot support multiple y-axes? x-axes?**
A: Yes to y-axes (up to three), "not yet" to x-axes.
**Q: Does ImPlot support [insert plot type]?** **Q: Does ImPlot support [insert plot type]?**
A: Maybe. Check the gallery and demo to see if your desired plot type is shown. If not, consider submitting an issue or better yet, a PR! A: Maybe. Check the gallery and demo to see if your desired plot type is shown. If not, consider submitting an issue or better yet, a PR!

View File

@ -50,8 +50,8 @@ You can read releases logs https://github.com/epezent/implot/releases for more d
#endif #endif
#include "implot.h" #include <implot.h>
#include "imgui_internal.h" #include <imgui_internal.h>
#define IM_NORMALIZE2F_OVER_ZERO(VX, VY) \ #define IM_NORMALIZE2F_OVER_ZERO(VX, VY) \
{ \ { \

View File

@ -23,7 +23,7 @@
// ImPlot v0.2 WIP // ImPlot v0.2 WIP
#pragma once #pragma once
#include "imgui.h" #include <imgui.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Basic types and flags // Basic types and flags

View File

@ -26,7 +26,7 @@
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen #pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#endif #endif
#include "implot.h" #include <implot.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>