haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/common/widgets/mathplot.cpp

3631 lines
102 KiB
C++
Raw Normal View History

Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
/////////////////////////////////////////////////////////////////////////////
// Name: mathplot.cpp
// Purpose: Framework for plotting in wxWindows
// Original Author: David Schalig
// Maintainer: Davide Rondini
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
// Contributors: Jose Luis Blanco, Val Greene, Maciej Suminski, Tomasz Wlostowski
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Created: 21/07/2003
Simulator: add simulator icon, and colored icons to identify more easily traces in trace list and cursor list.
2016-08-29 09:39:54 +00:00
// Last edit: 25/08/2016
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Copyright: (c) David Schalig, Davide Rondini
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include <wx/window.h>
// Comment out for release operation:
// (Added by J.L.Blanco, Aug 2007)
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
//#define MATHPLOT_DO_LOGGING
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/object.h"
#include "wx/font.h"
#include "wx/colour.h"
#include "wx/sizer.h"
#include "wx/intl.h"
#include "wx/dcclient.h"
#include "wx/cursor.h"
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
#include "gal/cursors.h"
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
#endif
#include <widgets/mathplot.h>
Set interpolation/anti-alias in plots This doesn't do much for Linux, but the interpolation modes for MSW and Mac should clean up lines a bit in plotting Fixes https://gitlab.com/kicad/code/kicad/issues/10239
2022-12-21 20:02:35 +00:00
#include <wx/graphics.h>
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
#include <wx/image.h>
#include <cmath>
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
#include <cstdio> // used only for debug
#include <ctime> // used for representation of x axes involving date
Spice plot widget: more accurate rendering Patch modifies the way graphs are displayed: instead of drawing one point for each X coordinate, there is a line segment joining min and max values for continuous graphs and all unique points are displayed for discrete graphs. Fixes: lp:1674143 * https://bugs.launchpad.net/kicad/+bug/1674143
2018-10-04 20:45:22 +00:00
#include <set>
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Memory leak debugging
#ifdef _DEBUG
#define new DEBUG_NEW
#endif
// Legend margins
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
#define mpLEGEND_MARGIN 5
#define mpLEGEND_LINEWIDTH 10
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Number of pixels to scroll when scrolling by a line
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
#define mpSCROLL_NUM_PIXELS_PER_LINE 10
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// See doxygen comments.
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
double mpWindow::zoomIncrementalFactor = 1.1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpLayer
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_ABSTRACT_CLASS( mpLayer, wxObject )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpLayer::mpLayer() :
m_type( mpLAYER_UNDEF )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetPen( (wxPen&) *wxBLACK_PEN );
SetFont( (wxFont&) *wxNORMAL_FONT );
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
m_continuous = false; // Default
m_showName = true; // Default
m_drawOutsideMargins = false;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_visible = true;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
wxBitmap mpLayer::GetColourSquare( int side ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
wxBitmap square( side, side, -1 );
wxColour filler = m_pen.GetColour();
wxBrush brush( filler, wxBRUSHSTYLE_SOLID );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxMemoryDC dc;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SelectObject( square );
dc.SetBackground( brush );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
dc.Clear();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SelectObject( wxNullBitmap );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return square;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpInfoLayer
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( mpInfoLayer, mpLayer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
mpInfoLayer::mpInfoLayer()
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_dim = wxRect( 0, 0, 1, 1 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_brush = *wxTRANSPARENT_BRUSH;
m_reference.x = 0; m_reference.y = 0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_winX = 1; // parent->GetScrX();
m_winY = 1; // parent->GetScrY();
m_type = mpLAYER_INFO;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
mpInfoLayer::mpInfoLayer( wxRect rect, const wxBrush* brush ) :
m_dim( rect )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
m_brush = *brush;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_reference.x = rect.x;
m_reference.y = rect.y;
m_winX = 1; // parent->GetScrX();
m_winY = 1; // parent->GetScrY();
m_type = mpLAYER_INFO;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
mpInfoLayer::~mpInfoLayer()
{
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpInfoLayer::UpdateInfo( mpWindow& w, wxEvent& event )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
bool mpInfoLayer::Inside( const wxPoint& point ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
return m_dim.Contains( point );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpInfoLayer::Move( wxPoint delta )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_dim.SetX( m_reference.x + delta.x );
m_dim.SetY( m_reference.y + delta.y );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
void mpInfoLayer::UpdateReference()
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_reference.x = m_dim.x;
m_reference.y = m_dim.y;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpInfoLayer::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Adjust relative position inside the window
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int scrx = w.GetScrX();
int scry = w.GetScrY();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Avoid dividing by 0
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( scrx == 0 )
scrx = 1;
if( scry == 0 )
scry = 1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (m_winX != scrx) || (m_winY != scry) )
{
if( m_winX > 1 )
m_dim.x = (int) floor( (double) (m_dim.x * scrx / m_winX) );
if( m_winY > 1 )
{
m_dim.y = (int) floor( (double) (m_dim.y * scry / m_winY) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateReference();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Finally update window size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_winX = scrx;
m_winY = scry;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SetPen( m_pen );
// wxImage image0(wxT("pixel.png"), wxBITMAP_TYPE_PNG);
// wxBitmap image1(image0);
// wxBrush semiWhite(image1);
dc.SetBrush( m_brush );
dc.DrawRectangle( m_dim.x, m_dim.y, m_dim.width, m_dim.height );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
wxPoint mpInfoLayer::GetPosition() const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
return m_dim.GetPosition();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
wxSize mpInfoLayer::GetSize() const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
return m_dim.GetSize();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpInfoCoords::mpInfoCoords() :
mpInfoLayer()
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
}
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpInfoCoords::mpInfoCoords( wxRect rect, const wxBrush* brush ) :
mpInfoLayer( rect, brush )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
mpInfoCoords::~mpInfoCoords()
{
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpInfoCoords::UpdateInfo( mpWindow& w, wxEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( event.GetEventType() == wxEVT_MOTION )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
/* It seems that Windows port of wxWidgets don't support multi-line test to be drawn in a wxDC.
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
* wxGTK instead works perfectly with it.
* Info on wxForum: http://wxforum.shadonet.com/viewtopic.php?t=3451&highlight=drawtext+eol */
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
#ifdef _WINDOWS
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
// FIXME m_content.Printf(wxT("x = %f y = %f"), XScale().P2x(w, mouseX), YScale().P2x(w, mouseY));
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
#else
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// FIXME m_content.Printf(wxT("x = %f\ny = %f"), XScale().P2x(w, mouseX), YScale().P2x(w, mouseY));
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
#endif
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpInfoCoords::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Adjust relative position inside the window
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int scrx = w.GetScrX();
int scry = w.GetScrY();
if( (m_winX != scrx) || (m_winY != scry) )
{
if( m_winX > 1 )
m_dim.x = (int) floor( (double) (m_dim.x * scrx / m_winX) );
if( m_winY > 1 )
{
m_dim.y = (int) floor( (double) (m_dim.y * scry / m_winY) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateReference();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Finally update window size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_winX = scrx;
m_winY = scry;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SetPen( m_pen );
// wxImage image0(wxT("pixel.png"), wxBITMAP_TYPE_PNG);
// wxBitmap image1(image0);
// wxBrush semiWhite(image1);
dc.SetBrush( m_brush );
dc.SetFont( m_font );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
int textX, textY;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_content, &textX, &textY );
if( m_dim.width < textX + 10 )
m_dim.width = textX + 10;
if( m_dim.height < textY + 10 )
m_dim.height = textY + 10;
dc.DrawRectangle( m_dim.x, m_dim.y, m_dim.width, m_dim.height );
dc.DrawText( m_content, m_dim.x + 5, m_dim.y + 5 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpInfoLegend::mpInfoLegend() :
mpInfoLayer()
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
}
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpInfoLegend::mpInfoLegend( wxRect rect, const wxBrush* brush ) :
mpInfoLayer( rect, brush )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
mpInfoLegend::~mpInfoLegend()
{
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpInfoLegend::UpdateInfo( mpWindow& w, wxEvent& event )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpInfoLegend::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Adjust relative position inside the window
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int scrx = w.GetScrX();
int scry = w.GetScrY();
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
if( m_winX != scrx || m_winY != scry )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
if( m_winX > 1 )
m_dim.x = (int) floor( (double) (m_dim.x * scrx / m_winX) );
if( m_winY > 1 )
{
m_dim.y = (int) floor( (double) (m_dim.y * scry / m_winY) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateReference();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Finally update window size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_winX = scrx;
m_winY = scry;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// wxImage image0(wxT("pixel.png"), wxBITMAP_TYPE_PNG);
// wxBitmap image1(image0);
// wxBrush semiWhite(image1);
dc.SetBrush( m_brush );
dc.SetFont( m_font );
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
const int baseWidth = mpLEGEND_MARGIN * 2 + mpLEGEND_LINEWIDTH;
int textX = baseWidth, textY = mpLEGEND_MARGIN;
int plotCount = 0;
int posY = 0;
int tmpX = 0;
int tmpY = 0;
mpLayer* layer = nullptr;
wxPen lpen;
wxString label;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( unsigned int p = 0; p < w.CountAllLayers(); p++ )
{
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
layer = w.GetLayer( p );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
if( layer->GetLayerType() == mpLAYER_PLOT && layer->IsVisible() )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Make sure legend reflects gain/phase for AC small signal analyses. Fixes https://gitlab.com/kicad/code/kicad/issues/14301
2023-03-19 23:02:23 +00:00
label = layer->GetDisplayName();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( label, &tmpX, &tmpY );
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
textX = ( textX > tmpX + baseWidth ) ? textX : tmpX + baseWidth + mpLEGEND_MARGIN;
textY += tmpY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SetPen( m_pen );
dc.SetBrush( m_brush );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_dim.width = textX;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( textY != mpLEGEND_MARGIN ) // Don't draw any thing if there are no visible layers
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
textY += mpLEGEND_MARGIN;
m_dim.height = textY;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawRectangle( m_dim.x, m_dim.y, m_dim.width, m_dim.height );
for( unsigned int p2 = 0; p2 < w.CountAllLayers(); p2++ )
{
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
layer = w.GetLayer( p2 );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
if( layer->GetLayerType() == mpLAYER_PLOT && layer->IsVisible() )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Make sure legend reflects gain/phase for AC small signal analyses. Fixes https://gitlab.com/kicad/code/kicad/issues/14301
2023-03-19 23:02:23 +00:00
label = layer->GetDisplayName();
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
lpen = layer->GetPen();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( label, &tmpX, &tmpY );
dc.SetPen( lpen );
// textX = (textX > (tmpX + baseWidth)) ? textX : (tmpX + baseWidth);
// textY += (tmpY + mpLEGEND_MARGIN);
posY = m_dim.y + mpLEGEND_MARGIN + plotCount * tmpY + (tmpY >> 1);
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
dc.DrawLine( m_dim.x + mpLEGEND_MARGIN, // X start coord
posY, // Y start coord
m_dim.x + mpLEGEND_LINEWIDTH + mpLEGEND_MARGIN, // X end coord
posY );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// dc.DrawRectangle(m_dim.x + 5, m_dim.y + 5 + plotCount*tmpY, 5, 5);
dc.DrawText( label,
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
m_dim.x + baseWidth,
m_dim.y + mpLEGEND_MARGIN + plotCount * tmpY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
plotCount++;
}
}
}
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpLayer implementations - functions
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_ABSTRACT_CLASS( mpFX, mpLayer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpFX::mpFX( const wxString& name, int flags )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetName( name );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_flags = flags;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_type = mpLAYER_PLOT;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpFX::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
dc.SetPen( m_pen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
wxCoord endPx = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
wxCoord minYpx = m_drawOutsideMargins ? 0 : w.GetMarginTop();
wxCoord maxYpx = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
wxCoord iy = 0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_pen.GetWidth() <= 1 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( wxCoord i = startPx; i < endPx; ++i )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
iy = w.y2p( GetY( w.p2x( i ) ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw the point only if you can draw outside margins or if the point is inside margins
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_drawOutsideMargins || ( (iy >= minYpx) && (iy <= maxYpx) ) )
dc.DrawPoint( i, iy ); // (wxCoord) ((w.GetPosY() - GetY( (double)i / w.GetScaleX() + w.GetPosX()) ) * w.GetScaleY()));
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( wxCoord i = startPx; i < endPx; ++i )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
iy = w.y2p( GetY( w.p2x( i ) ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw the point only if you can draw outside margins or if the point is inside margins
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_drawOutsideMargins || ( (iy >= minYpx) && (iy <= maxYpx) ) )
dc.DrawLine( i, iy, i, iy );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// wxCoord c = YScale().X2p( GetY(XScale().P2x(i)) );
//(wxCoord) ((w.GetPosY() - GetY( (double)i / w.GetScaleX() + w.GetPosX()) ) * w.GetScaleY());
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_name.IsEmpty() && m_showName )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SetFont( m_font );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord tx, ty;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_name, &tx, &ty );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
/*if ((m_flags & mpALIGNMASK) == mpALIGN_RIGHT)
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
* tx = (w.GetScrX()>>1) - tx - 8;
* else if ((m_flags & mpALIGNMASK) == mpALIGN_CENTER)
* tx = -tx/2;
* else
* tx = -(w.GetScrX()>>1) + 8;
*/
if( (m_flags & mpALIGNMASK) == mpALIGN_RIGHT )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
tx = (w.GetScrX() - tx) - w.GetMarginRight() - 8;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else if( (m_flags & mpALIGNMASK) == mpALIGN_CENTER )
tx = ( (w.GetScrX() - w.GetMarginRight() - w.GetMarginLeft() - tx) / 2 ) +
w.GetMarginLeft();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
else
tx = w.GetMarginLeft() + 8;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawText( m_name, tx, w.y2p( GetY( w.p2x( tx ) ) ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_ABSTRACT_CLASS( mpFY, mpLayer )
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpFY::mpFY( const wxString& name, int flags )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetName( name );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_flags = flags;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_type = mpLAYER_PLOT;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpFY::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
dc.SetPen( m_pen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord i, ix;
wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
wxCoord endPx = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
wxCoord minYpx = m_drawOutsideMargins ? 0 : w.GetMarginTop();
wxCoord maxYpx = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_pen.GetWidth() <= 1 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( i = minYpx; i < maxYpx; ++i )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
ix = w.x2p( GetX( w.p2y( i ) ) );
if( m_drawOutsideMargins || ( (ix >= startPx) && (ix <= endPx) ) )
dc.DrawPoint( ix, i );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( i = 0; i< w.GetScrY(); ++i )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
ix = w.x2p( GetX( w.p2y( i ) ) );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_drawOutsideMargins || ( (ix >= startPx) && (ix <= endPx) ) )
dc.DrawLine( ix, i, ix, i );
// wxCoord c = XScale().X2p(GetX(YScale().P2x(i)));
//(wxCoord) ((GetX( (double)i / w.GetScaleY() + w.GetPosY()) - w.GetPosX()) * w.GetScaleX());
// dc.DrawLine(c, i, c, i);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_name.IsEmpty() && m_showName )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SetFont( m_font );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord tx, ty;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_name, &tx, &ty );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (m_flags & mpALIGNMASK) == mpALIGN_TOP )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
ty = w.GetMarginTop() + 8;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else if( (m_flags & mpALIGNMASK) == mpALIGN_CENTER )
ty = ( (w.GetScrY() - w.GetMarginTop() - w.GetMarginBottom() - ty) / 2 ) +
w.GetMarginTop();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
else
ty = w.GetScrY() - 8 - ty - w.GetMarginBottom();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawText( m_name, w.x2p( GetX( w.p2y( ty ) ) ), ty ); // (wxCoord) ((GetX( (double)i / w.GetScaleY() + w.GetPosY()) - w.GetPosX()) * w.GetScaleX()), -ty);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_ABSTRACT_CLASS( mpFXY, mpLayer )
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpFXY::mpFXY( const wxString& name, int flags )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetName( name );
m_flags = flags;
m_type = mpLAYER_PLOT;
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
m_scaleX = nullptr;
m_scaleY = nullptr;
More Coverity warnings fixes.
2016-12-30 13:36:23 +00:00
// Avoid not initialized members:
maxDrawX = minDrawX = maxDrawY = minDrawY = 0;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpFXY::UpdateViewBoundary( wxCoord xnew, wxCoord ynew )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Improve spelling. The groundwork here is thanks to kunda1. Fixes: lp:1831510 * https://bugs.launchpad.net/kicad/+bug/1831510
2019-08-20 17:22:30 +00:00
// Keep track of how many points have been drawn and the bounding box
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
maxDrawX = (xnew > maxDrawX) ? xnew : maxDrawX;
minDrawX = (xnew < minDrawX) ? xnew : minDrawX;
maxDrawY = (maxDrawY > ynew) ? maxDrawY : ynew;
minDrawY = (minDrawY < ynew) ? minDrawY : ynew;
// drawnPoints++;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpFXY::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Adjust AC-small-signal plot names when saving placeholders. Fixes https://gitlab.com/kicad/code/kicad/issues/14016
2023-02-25 11:38:27 +00:00
// If trace doesn't have any data yet then it won't have any scale set. In any case, there's
// nothing to plot.
if( !GetCount() )
return;
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
wxCHECK_RET( m_scaleX, wxS( "X scale was not set" ) );
wxCHECK_RET( m_scaleY, wxS( "Y scale was not set" ) );
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
if( !m_visible )
return;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
wxCoord endPx = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
wxCoord minYpx = m_drawOutsideMargins ? 0 : w.GetMarginTop();
wxCoord maxYpx = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
// Check for a collapsed window before we try to allocate a negative number of points
if( endPx <= startPx || minYpx >= maxYpx )
return;
dc.SetPen( m_pen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
double x, y;
// Do this to reset the counters to evaluate bounding box for label positioning
Rewind();
GetNextXY( x, y );
maxDrawX = x;
minDrawX = x;
maxDrawY = y;
minDrawY = y;
// drawnPoints = 0;
Rewind();
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
dc.SetClippingRegion( startPx, minYpx, endPx - startPx + 1, maxYpx - minYpx + 1 );
if( !m_continuous )
{
bool first = true;
wxCoord ix = 0;
std::set<wxCoord> ys;
while( GetNextXY( x, y ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
double px = m_scaleX->TransformToPlot( x );
double py = m_scaleY->TransformToPlot( y );
wxCoord newX = w.x2p( px );
Spice simulator: faster graph rendering Graph rendering takes a lot of time, especially when there is a high number of points to be drawn. The initial implementation drew all points/lines even if the the coordinates were duplicates, in the new version duplicated coordinates are skipped. Fixes: lp:1674143 * https://bugs.launchpad.net/kicad/+bug/1674143
2018-10-04 20:33:32 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
if( first )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
ix = newX;
first = false;
}
Spice simulator: faster graph rendering Graph rendering takes a lot of time, especially when there is a high number of points to be drawn. The initial implementation drew all points/lines even if the the coordinates were duplicates, in the new version duplicated coordinates are skipped. Fixes: lp:1674143 * https://bugs.launchpad.net/kicad/+bug/1674143
2018-10-04 20:33:32 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
if( newX == ix ) // continue until a new X coordinate is reached
{
// collect all unique points
ys.insert( w.y2p( py ) );
continue;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
for( auto& iy: ys )
{
if( m_drawOutsideMargins
|| ( (ix >= startPx) && (ix <= endPx) && (iy >= minYpx) && (iy <= maxYpx) ) )
Spice plot widget: more accurate rendering Patch modifies the way graphs are displayed: instead of drawing one point for each X coordinate, there is a line segment joining min and max values for continuous graphs and all unique points are displayed for discrete graphs. Fixes: lp:1674143 * https://bugs.launchpad.net/kicad/+bug/1674143
2018-10-04 20:45:22 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
// for some reason DrawPoint does not use the current pen, so we use
// DrawLine for fat pens
if( m_pen.GetWidth() <= 1 )
dc.DrawPoint( ix, iy );
else
dc.DrawLine( ix, iy, ix, iy );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
UpdateViewBoundary( ix, iy );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
ys.clear();
ix = newX;
ys.insert( w.y2p( py ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
}
else
{
int count = 0;
int x0=0; // X position of merged current vertical line
int ymin0=0; // y min coord of merged current vertical line
int ymax0=0; // y max coord of merged current vertical line
int dupx0 = 0; // count of currently merged vertical lines
wxPoint line_start; // starting point of the current line to draw
// A buffer to store coordinates of lines to draw
std::vector<wxPoint>pointList;
pointList.reserve( endPx - startPx + 1 );
// Note: we can use dc.DrawLines() only for a reasonable number or points (<10000),
// because at least on Windows dc.DrawLines() can hang for a lot of points.
// (> 10000 points) (can happens when a lot of points is calculated)
// To avoid long draw time (and perhaps hanging) one plot only not redundant lines.
// To avoid artifacts when skipping points to the same x coordinate, for each group of
// points at a give, x coordinate we also draw a vertical line at this coord, from the
// ymin to the ymax vertical coordinates of skipped points
while( GetNextXY( x, y ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
double px = m_scaleX->TransformToPlot( x );
double py = m_scaleY->TransformToPlot( y );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
wxCoord x1 = w.x2p( px );
wxCoord y1 = w.y2p( py );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
// Store only points on the drawing area, to speed up the drawing time
// Note: x1 is a value truncated from px by w.x2p(). So to be sure the first point
// is drawn, the x1 low limit is startPx-1 in plot coordinates
if( x1 >= startPx-1 && x1 <= endPx )
{
if( !count || line_start.x != x1 )
Simulator: optimize a plot function, to support large amount of points. Redundant points are not plotted. Fixes #4737 https://gitlab.com/kicad/code/kicad/issues/4737
2020-07-27 08:47:52 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
if( count && dupx0 > 1 && ymin0 != ymax0 )
Simulator: optimize a plot function, to support large amount of points. Redundant points are not plotted. Fixes #4737 https://gitlab.com/kicad/code/kicad/issues/4737
2020-07-27 08:47:52 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
// Vertical points are merged, draw the pending vertical line
// However, if the line is one pixel length, it is not drawn, because
// the main trace show this point
dc.DrawLine( x0, ymin0, x0, ymax0 );
Simulator: optimize a plot function, to support large amount of points. Redundant points are not plotted. Fixes #4737 https://gitlab.com/kicad/code/kicad/issues/4737
2020-07-27 08:47:52 +00:00
}
mathplot.cpp: optimize a plot function to have a better look for dashed lines, and less lines to plot when they can be merged.
2020-08-24 16:40:38 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
x0 = x1;
ymin0 = ymax0 = y1;
dupx0 = 0;
mathplot.cpp: optimize a plot function to have a better look for dashed lines, and less lines to plot when they can be merged.
2020-08-24 16:40:38 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
pointList.emplace_back( wxPoint( x1, y1 ) );
mathplot.cpp: optimize a plot function to have a better look for dashed lines, and less lines to plot when they can be merged.
2020-08-24 16:40:38 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
line_start.x = x1;
line_start.y = y1;
count++;
}
else
mathplot.cpp: optimize a plot function to have a better look for dashed lines, and less lines to plot when they can be merged.
2020-08-24 16:40:38 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
ymin0 = std::min( ymin0, y1 );
ymax0 = std::max( ymax0, y1 );
x0 = x1;
dupx0++;
mathplot.cpp: optimize a plot function to have a better look for dashed lines, and less lines to plot when they can be merged.
2020-08-24 16:40:38 +00:00
}
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
if( pointList.size() > 1 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
// For a better look (when using dashed lines) and more optimization, try to merge
// horizontal segments, in order to plot longer lines
// We are merging horizontal segments because this is easy, and horizontal segments
// are a frequent cases
std::vector<wxPoint> drawPoints;
drawPoints.reserve( endPx - startPx + 1 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
drawPoints.push_back( pointList[0] ); // push the first point in list
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
for( size_t ii = 1; ii < pointList.size()-1; ii++ )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
// Skip intermediate points between the first point and the last point of the
// segment candidate
if( drawPoints.back().y == pointList[ii].y &&
drawPoints.back().y == pointList[ii+1].y )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
continue;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
drawPoints.push_back( pointList[ii] );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
// push the last point to draw in list
if( drawPoints.back() != pointList.back() )
drawPoints.push_back( pointList.back() );
dc.DrawLines( drawPoints.size(), &drawPoints[0] );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
Don't allocate all of memory when the coord system turns inside out. Fixes https://gitlab.com/kicad/code/kicad/issues/14088
2023-02-26 21:50:43 +00:00
if( !m_name.IsEmpty() && m_showName )
{
dc.SetFont( m_font );
wxCoord tx, ty;
dc.GetTextExtent( m_name, &tx, &ty );
// xxx implement else ... if (!HasBBox())
{
// const int sx = w.GetScrX();
// const int sy = w.GetScrY();
if( (m_flags & mpALIGNMASK) == mpALIGN_NW )
{
tx = minDrawX + 8;
ty = maxDrawY + 8;
}
else if( (m_flags & mpALIGNMASK) == mpALIGN_NE )
{
tx = maxDrawX - tx - 8;
ty = maxDrawY + 8;
}
else if( (m_flags & mpALIGNMASK) == mpALIGN_SE )
{
tx = maxDrawX - tx - 8;
ty = minDrawY - ty - 8;
}
else
{
// mpALIGN_SW
tx = minDrawX + 8;
ty = minDrawY - ty - 8;
}
}
dc.DrawText( m_name, tx, ty );
}
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
dc.DestroyClippingRegion();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpProfile implementation
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_ABSTRACT_CLASS( mpProfile, mpLayer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpProfile::mpProfile( const wxString& name, int flags )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetName( name );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_flags = flags;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_type = mpLAYER_PLOT;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpProfile::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
dc.SetPen( m_pen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
wxCoord endPx = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
wxCoord minYpx = m_drawOutsideMargins ? 0 : w.GetMarginTop();
wxCoord maxYpx = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
// Plot profile linking subsequent point of the profile, instead of mpFY, which plots simple points.
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( wxCoord i = startPx; i < endPx; ++i )
{
wxCoord c0 = w.y2p( GetY( w.p2x( i ) ) ); // (wxCoord) ((w.GetYpos() - GetY( (double)i / w.GetXscl() + w.GetXpos()) ) * w.GetYscl());
wxCoord c1 = w.y2p( GetY( w.p2x( i + 1 ) ) ); // (wxCoord) ((w.GetYpos() - GetY( (double)(i+1) / w.GetXscl() + (w.GetXpos() ) ) ) * w.GetYscl());
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// c0 = (c0 <= maxYpx) ? ((c0 >= minYpx) ? c0 : minYpx) : maxYpx;
// c1 = (c1 <= maxYpx) ? ((c1 >= minYpx) ? c1 : minYpx) : maxYpx;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_drawOutsideMargins )
{
c0 = (c0 <= maxYpx) ? ( (c0 >= minYpx) ? c0 : minYpx ) : maxYpx;
c1 = (c1 <= maxYpx) ? ( (c1 >= minYpx) ? c1 : minYpx ) : maxYpx;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawLine( i, c0, i + 1, c1 );
}
;
if( !m_name.IsEmpty() )
{
dc.SetFont( m_font );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord tx, ty;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_name, &tx, &ty );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (m_flags & mpALIGNMASK) == mpALIGN_RIGHT )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
tx = (w.GetScrX() - tx) - w.GetMarginRight() - 8;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else if( (m_flags & mpALIGNMASK) == mpALIGN_CENTER )
tx = ( (w.GetScrX() - w.GetMarginRight() - w.GetMarginLeft() - tx) / 2 ) +
w.GetMarginLeft();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
else
tx = w.GetMarginLeft() + 8;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawText( m_name, tx, w.y2p( GetY( w.p2x( tx ) ) ) ); // (wxCoord) ((w.GetPosY() - GetY( (double)tx / w.GetScaleX() + w.GetPosX())) * w.GetScaleY()) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpLayer implementations - furniture (scales, ...)
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
#define mpLN10 2.3025850929940456840179914546844
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleX::recalculateTicks( wxDC& dc, mpWindow& w )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
double minV, maxV, minVvis, maxVvis;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetDataRange( minV, maxV );
getVisibleDataRange( w, minVvis, maxVvis );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_absVisibleMaxV = std::max( std::abs( minVvis ), std::abs( maxVvis ) );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
m_tickValues.clear();
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
m_tickLabels.clear();
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double minErr = 1000000000000.0;
Initialize bestStep (wxMathPlot)
2016-08-15 08:53:36 +00:00
double bestStep = 1.0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( int i = 10; i <= 20; i += 2 )
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
{
Simulator: add simulator icon, and colored icons to identify more easily traces in trace list and cursor list.
2016-08-29 09:39:54 +00:00
double curr_step = fabs( maxVvis - minVvis ) / (double) i;
double base = pow( 10, floor( log10( curr_step ) ) );
double stepInt = floor( curr_step / base ) * base;
double err = fabs( curr_step - stepInt );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
Initialize bestStep (wxMathPlot)
2016-08-15 08:53:36 +00:00
if( err < minErr )
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
{
minErr = err;
bestStep = stepInt;
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
}
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
}
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double v = floor( minVvis / bestStep ) * bestStep;
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
double zeroOffset = 100000000.0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
while( v < maxVvis )
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_tickValues.push_back( v );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( fabs( v ) < zeroOffset )
zeroOffset = fabs( v );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
v += bestStep;
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( zeroOffset <= bestStep )
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( double& t : m_tickValues )
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
t -= zeroOffset;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( double t : m_tickValues )
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
{
Cleanup: Replace push_back with emplace_back In cases where we create a new item and immediately push into a container, the emplace idiom is faster and more efficient.
2019-12-05 15:41:21 +00:00
m_tickLabels.emplace_back( t );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
}
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
updateTickLabels( dc, w );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
Fix a few Coverity warnings. A bit of clean code in export_vrml.cpp.
2016-12-30 11:39:41 +00:00
mpScaleBase::mpScaleBase()
{
m_rangeSet = false;
m_nameFlags = mpALIGN_BORDER_BOTTOM;
// initialize these members mainly to avoid not initialized values
m_offset = 0.0;
m_scale = 1.0;
m_absVisibleMaxV = 0.0;
m_flags = 0; // Flag for axis alignment
m_ticks = true; // Flag to toggle between ticks or grid
m_minV = 0.0;
m_maxV = 0.0;
m_maxLabelHeight = 1;
m_maxLabelWidth = 1;
}
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleBase::computeLabelExtents( wxDC& dc, mpWindow& w )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_maxLabelHeight = 0;
m_maxLabelWidth = 0;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( int n = 0; n < labelCount(); n++ )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
int tx, ty;
const wxString s = getLabel( n );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( s, &tx, &ty );
m_maxLabelHeight = std::max( ty, m_maxLabelHeight );
m_maxLabelWidth = std::max( tx, m_maxLabelWidth );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
}
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleBase::updateTickLabels( wxDC& dc, mpWindow& w )
{
sim: hopefully final version of plot axis unit/suffix handling.
2016-08-11 12:42:10 +00:00
formatLabels();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
computeLabelExtents( dc, w );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// int gap = IsHorizontal() ? m_maxLabelWidth + 10 : m_maxLabelHeight + 5;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// if ( m_tickLabels.size() <= 2)
// return;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
/*
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
* fixme!
*
* for ( auto &l : m_tickLabels )
* {
* double p = TransformToPlot ( l.pos );
*
* if ( !IsHorizontal() )
* l.pixelPos = (int)(( w.GetPosY() - p ) * w.GetScaleY());
* else
* l.pixelPos = (int)(( p - w.GetPosX()) * w.GetScaleX());
* }
*
*
* for (int i = 1; i < m_tickLabels.size() - 1; i++)
* {
* int dist_prev;
*
* for(int j = i-1; j >= 1; j--)
* {
* if( m_tickLabels[j].visible)
* {
* dist_prev = abs( m_tickLabels[j].pixelPos - m_tickLabels[i].pixelPos );
* break;
* }
* }
*
* if (dist_prev < gap)
* m_tickLabels[i].visible = false;
* }
*/
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleY::getVisibleDataRange( mpWindow& w, double& minV, double& maxV )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
wxCoord minYpx = m_drawOutsideMargins ? 0 : w.GetMarginTop();
wxCoord maxYpx = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double pymin = w.p2y( minYpx );
double pymax = w.p2y( maxYpx );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
minV = TransformFromPlot( pymax );
maxV = TransformFromPlot( pymin );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
void mpScaleY::computeSlaveTicks( mpWindow& w )
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_masterScale->m_tickValues.size() == 0 )
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
return;
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
m_tickValues.clear();
m_tickLabels.clear();
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double p0 = m_masterScale->TransformToPlot( m_masterScale->m_tickValues[0] );
double p1 = m_masterScale->TransformToPlot( m_masterScale->m_tickValues[1] );
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_scale = 1.0 / ( m_maxV - m_minV );
m_offset = -m_minV;
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double y_slave0 = p0 / m_scale;
double y_slave1 = p1 / m_scale;
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double dy_slave = (y_slave1 - y_slave0);
double exponent = floor( log10( dy_slave ) );
double base = dy_slave / pow( 10.0, exponent );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double dy_scaled = ceil( 2.0 * base ) / 2.0 * pow( 10.0, exponent );
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
double minvv, maxvv;
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
getVisibleDataRange( w, minvv, maxvv );
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
minvv = floor( minvv / dy_scaled ) * dy_scaled;
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
m_scale = 1.0 / ( m_maxV - m_minV );
m_scale *= dy_slave / dy_scaled;
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
m_offset = p0 / m_scale - minvv;
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
m_tickValues.clear();
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
double m;
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
m_absVisibleMaxV = 0;
sim: hopefully final version of plot axis unit/suffix handling.
2016-08-11 12:42:10 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( unsigned int i = 0; i < m_masterScale->m_tickValues.size(); i++ )
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m = TransformFromPlot( m_masterScale->TransformToPlot( m_masterScale->m_tickValues[i] ) );
m_tickValues.push_back( m );
Cleanup: Replace push_back with emplace_back In cases where we create a new item and immediately push into a container, the emplace idiom is faster and more efficient.
2019-12-05 15:41:21 +00:00
m_tickLabels.emplace_back( m );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_absVisibleMaxV = std::max( m_absVisibleMaxV, fabs( m ) );
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
}
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleY::recalculateTicks( wxDC& dc, mpWindow& w )
{
if( m_masterScale )
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
{
computeSlaveTicks( w );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
updateTickLabels( dc, w );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
return;
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
double minV, maxV, minVvis, maxVvis;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetDataRange( minV, maxV );
getVisibleDataRange( w, minVvis, maxVvis );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_absVisibleMaxV = std::max( std::abs( minVvis ), std::abs( maxVvis ) );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
m_tickValues.clear();
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
m_tickLabels.clear();
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double minErr = 1000000000000.0;
Initialize bestStep (wxMathPlot)
2016-08-15 08:53:36 +00:00
double bestStep = 1.0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( int i = 10; i <= 20; i += 2 )
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
{
Simulator: add simulator icon, and colored icons to identify more easily traces in trace list and cursor list.
2016-08-29 09:39:54 +00:00
double curr_step = fabs( maxVvis - minVvis ) / (double) i;
double base = pow( 10, floor( log10( curr_step ) ) );
double stepInt = floor( curr_step / base ) * base;
double err = fabs( curr_step - stepInt );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( err< minErr )
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
{
minErr = err;
bestStep = stepInt;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double v = floor( minVvis / bestStep ) * bestStep;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
double zeroOffset = 100000000.0;
mathplot: fix freeze in scale ticks calculation
2016-08-11 12:42:02 +00:00
const int iterLimit = 1000;
int i = 0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
while( v < maxVvis && i < iterLimit )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_tickValues.push_back( v );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( fabs( v ) < zeroOffset )
zeroOffset = fabs( v );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
v += bestStep;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
i++;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
mathplot: fix freeze in scale ticks calculation
2016-08-11 12:42:02 +00:00
// something weird happened...
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( i == iterLimit )
mathplot: fix freeze in scale ticks calculation
2016-08-11 12:42:02 +00:00
{
m_tickValues.clear();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( zeroOffset <= bestStep )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( double& t : m_tickValues )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
t -= zeroOffset;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( double t : m_tickValues )
Cleanup: Replace push_back with emplace_back In cases where we create a new item and immediately push into a container, the emplace idiom is faster and more efficient.
2019-12-05 15:41:21 +00:00
m_tickLabels.emplace_back( t );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// n0 = floor(minVvis / bestStep) * bestStep;
// end = n0 +
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// n0 = floor( (w.GetPosX() ) / step ) * step ;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
updateTickLabels( dc, w );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleXBase::getVisibleDataRange( mpWindow& w, double& minV, double& maxV )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord endPx = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
double pxmin = w.p2x( startPx );
double pxmax = w.p2x( endPx );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
minV = TransformFromPlot( pxmin );
maxV = TransformFromPlot( pxmax );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleXLog::recalculateTicks( wxDC& dc, mpWindow& w )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
double minV, maxV, minVvis, maxVvis;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetDataRange( minV, maxV );
getVisibleDataRange( w, minVvis, maxVvis );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// double decades = log( maxV / minV ) / log(10);
double minDecade = pow( 10, floor( log10( minV ) ) );
double maxDecade = pow( 10, ceil( log10( maxV ) ) );
double visibleDecades = log( maxVvis / minVvis ) / log( 10 );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
double d;
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
m_tickValues.clear();
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
m_tickLabels.clear();
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( minDecade == 0.0 )
simulator: working on magnitude/phase plots
2016-08-11 12:41:49 +00:00
return;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( d = minDecade; d<=maxDecade; d *= 10.0 )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
Cleanup: Replace push_back with emplace_back In cases where we create a new item and immediately push into a container, the emplace idiom is faster and more efficient.
2019-12-05 15:41:21 +00:00
m_tickLabels.emplace_back( d );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( double dd = d; dd < d * 10; dd += d )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( visibleDecades < 2 )
Cleanup: Replace push_back with emplace_back In cases where we create a new item and immediately push into a container, the emplace idiom is faster and more efficient.
2019-12-05 15:41:21 +00:00
m_tickLabels.emplace_back( dd );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_tickValues.push_back( dd );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
}
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
updateTickLabels( dc, w );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_ABSTRACT_CLASS( mpScaleXBase, mpLayer )
IMPLEMENT_DYNAMIC_CLASS( mpScaleX, mpScaleXBase )
IMPLEMENT_DYNAMIC_CLASS( mpScaleXLog, mpScaleXBase )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpScaleXBase::mpScaleXBase( const wxString& name, int flags, bool ticks, unsigned int type )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetName( name );
SetFont( (wxFont&) *wxSMALL_FONT );
SetPen( (wxPen&) *wxGREY_PEN );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_flags = flags;
m_ticks = ticks;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// m_labelType = type;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_type = mpLAYER_AXIS;
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpScaleX::mpScaleX( const wxString& name, int flags, bool ticks, unsigned int type ) :
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpScaleXBase( name, flags, ticks, type )
{
Remove some extra semicolons
2017-11-02 20:41:29 +00:00
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpScaleXLog::mpScaleXLog( const wxString& name, int flags, bool ticks, unsigned int type ) :
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpScaleXBase( name, flags, ticks, type )
{
Remove some extra semicolons
2017-11-02 20:41:29 +00:00
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleXBase::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
int tx, ty;
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_offset = -m_minV;
m_scale = 1.0 / ( m_maxV - m_minV );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
recalculateTicks( dc, w );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
dc.SetPen( m_pen );
dc.SetFont( m_font );
int orgy = 0;
const int extend = w.GetScrX(); ///2;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_flags == mpALIGN_CENTER )
orgy = w.y2p( 0 ); // (int)(w.GetPosY() * w.GetScaleY());
if( m_flags == mpALIGN_TOP )
{
if( m_drawOutsideMargins )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
orgy = X_BORDER_SEPARATION;
else
orgy = w.GetMarginTop();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_flags == mpALIGN_BOTTOM )
{
if( m_drawOutsideMargins )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
orgy = X_BORDER_SEPARATION;
else
orgy = w.GetScrY() - w.GetMarginBottom();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_flags == mpALIGN_BORDER_BOTTOM )
orgy = w.GetScrY() - 1; // dc.LogicalToDeviceY(0) - 1;
if( m_flags == mpALIGN_BORDER_TOP )
orgy = 1; // -dc.LogicalToDeviceY(0);
// dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
wxCoord endPx = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
wxCoord minYpx = m_drawOutsideMargins ? 0 : w.GetMarginTop();
wxCoord maxYpx = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// int tmp=-65535;
Fix source comment / documentation typos
2021-06-09 19:32:58 +00:00
int labelH = m_maxLabelHeight; // Control labels height to decide where to put axis name (below labels or on top of axis)
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// int maxExtent = tc.MaxLabelWidth();
for( int n = 0; n < tickCount(); n++ )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double tp = getTickPos( n );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// double xlogmin = log10 ( m_minV );
// double xlogmax = log10 ( m_maxV );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double px = TransformToPlot( tp ); // ( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const int p = (int) ( ( px - w.GetPosX() ) * w.GetScaleX() );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (p >= startPx) && (p <= endPx) )
{
if( m_ticks ) // draw axis ticks
{
if( m_flags == mpALIGN_BORDER_BOTTOM )
dc.DrawLine( p, orgy, p, orgy - 4 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
else
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawLine( p, orgy, p, orgy + 4 );
}
else // draw grid dotted lines
{
m_pen.SetStyle( wxPENSTYLE_DOT );
dc.SetPen( m_pen );
if( (m_flags == mpALIGN_BOTTOM) && !m_drawOutsideMargins )
{
m_pen.SetStyle( wxPENSTYLE_DOT );
dc.SetPen( m_pen );
dc.DrawLine( p, orgy + 4, p, minYpx );
m_pen.SetStyle( wxPENSTYLE_SOLID );
dc.SetPen( m_pen );
dc.DrawLine( p, orgy + 4, p, orgy - 4 );
}
else
{
if( (m_flags == mpALIGN_TOP) && !m_drawOutsideMargins )
{
dc.DrawLine( p, orgy - 4, p, maxYpx );
}
else
{
dc.DrawLine( p, minYpx, p, maxYpx ); // 0/*-w.GetScrY()*/, p, w.GetScrY() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_pen.SetStyle( wxPENSTYLE_SOLID );
dc.SetPen( m_pen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_pen.SetStyle( wxPENSTYLE_SOLID );
dc.SetPen( m_pen );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
dc.DrawLine( startPx, minYpx, endPx, minYpx );
dc.DrawLine( startPx, maxYpx, endPx, maxYpx );
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
// Actually draw labels, taking care of not overlapping them, and distributing them
// regularly
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( int n = 0; n < labelCount(); n++ )
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double tp = getLabelPos( n );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_tickLabels[n].visible )
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
continue;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// double xlogmin = log10 ( m_minV );
// double xlogmax = log10 ( m_maxV );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
double px = TransformToPlot( tp ); // ( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const int p = (int) ( ( px - w.GetPosX() ) * w.GetScaleX() );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (p >= startPx) && (p <= endPx) )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Write ticks labels in s string
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
wxString s = m_tickLabels[n].label;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( s, &tx, &ty );
if( (m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP) )
{
dc.DrawText( s, p - tx / 2, orgy - 4 - ty );
}
else
{
dc.DrawText( s, p - tx / 2, orgy + 4 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
// Draw axis name
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_name, &tx, &ty );
switch( m_nameFlags )
{
case mpALIGN_BORDER_BOTTOM:
dc.DrawText( m_name, extend - tx - 4, orgy - 8 - ty - labelH );
break;
case mpALIGN_BOTTOM:
{
dc.DrawText( m_name, (endPx + startPx) / 2 - tx / 2, orgy + 6 + labelH );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
break;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
case mpALIGN_CENTER:
dc.DrawText( m_name, extend - tx - 4, orgy - 4 - ty );
break;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
case mpALIGN_TOP:
{
if( (!m_drawOutsideMargins) && ( w.GetMarginTop() > (ty + labelH + 8) ) )
{
dc.DrawText( m_name, (endPx - startPx - tx) >> 1, orgy - 6 - ty - labelH );
}
else
{
dc.DrawText( m_name, extend - tx - 4, orgy + 4 );
}
}
break;
case mpALIGN_BORDER_TOP:
dc.DrawText( m_name, extend - tx - 4, orgy + 6 + labelH );
break;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
default:
break;
}
}
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_DYNAMIC_CLASS( mpScaleY, mpLayer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpScaleY::mpScaleY( const wxString& name, int flags, bool ticks )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetName( name );
SetFont( (wxFont&) *wxSMALL_FONT );
SetPen( (wxPen&) *wxGREY_PEN );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_flags = flags;
m_ticks = ticks;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_type = mpLAYER_AXIS;
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
m_masterScale = nullptr;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
m_nameFlags = mpALIGN_BORDER_LEFT;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpScaleY::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_offset = -m_minV;
m_scale = 1.0 / ( m_maxV - m_minV );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
recalculateTicks( dc, w );
if( m_visible )
{
dc.SetPen( m_pen );
dc.SetFont( m_font );
int orgx = 0;
// const int extend = w.GetScrY(); // /2;
if( m_flags == mpALIGN_CENTER )
orgx = w.x2p( 0 ); // (int)(w.GetPosX() * w.GetScaleX());
if( m_flags == mpALIGN_LEFT )
{
if( m_drawOutsideMargins )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
orgx = Y_BORDER_SEPARATION;
else
orgx = w.GetMarginLeft();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_flags == mpALIGN_RIGHT )
{
if( m_drawOutsideMargins )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
orgx = w.GetScrX() - Y_BORDER_SEPARATION;
else
orgx = w.GetScrX() - w.GetMarginRight();
}
ADDED power dissipation plotting and cursors. Also fixes a bug so that voltages, currents and power dissipations are only probed if the flag is set -- this keeps ngspice from throwing an error if you probe something twice (for instance, if you have .probe commands in text and turn off the auto-probing).
2023-02-10 20:52:52 +00:00
if( m_flags == mpALIGN_FAR_RIGHT )
orgx = w.GetScrX() - ( w.GetMarginRight() / 2 );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_flags == mpALIGN_BORDER_RIGHT )
orgx = w.GetScrX() - 1; // dc.LogicalToDeviceX(0) - 1;
if( m_flags == mpALIGN_BORDER_LEFT )
orgx = 1; // -dc.LogicalToDeviceX(0);
wxCoord endPx = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
wxCoord minYpx = m_drawOutsideMargins ? 0 : w.GetMarginTop();
wxCoord maxYpx = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw line
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawLine( orgx, minYpx, orgx, maxYpx );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord tx, ty;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxString s;
wxString fmt;
int n = 0;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
int labelW = 0;
// Before staring cycle, calculate label height
Fix typos in source code
2021-06-10 01:24:15 +00:00
int labelHeight = 0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
s.Printf( fmt, n );
Fix typos in source code
2021-06-10 01:24:15 +00:00
dc.GetTextExtent( s, &tx, &labelHeight );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( n = 0; n < tickCount(); n++ )
{
double tp = getTickPos( n );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
double py = TransformToPlot( tp ); // ( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const int p = (int) ( ( w.GetPosY() - py ) * w.GetScaleY() );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (p >= minYpx) && (p <= maxYpx) )
{
if( m_ticks ) // Draw axis ticks
{
if( m_flags == mpALIGN_BORDER_LEFT )
{
dc.DrawLine( orgx, p, orgx + 4, p );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else
{
dc.DrawLine( orgx - 4, p, orgx, p ); // ( orgx, p, orgx+4, p);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else
{
dc.DrawLine( orgx - 4, p, orgx + 4, p );
m_pen.SetStyle( wxPENSTYLE_DOT );
dc.SetPen( m_pen );
Tidy up some Coverity issues.
2020-04-07 10:24:39 +00:00
dc.DrawLine( orgx - 4, p, endPx, p );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_pen.SetStyle( wxPENSTYLE_SOLID );
dc.SetPen( m_pen );
}
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// Print ticks labels
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( n = 0; n < labelCount(); n++ )
{
double tp = getLabelPos( n );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
double py = TransformToPlot( tp ); // ( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const int p = (int) ( ( w.GetPosY() - py ) * w.GetScaleY() );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_tickLabels[n].visible )
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
continue;
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (p >= minYpx) && (p <= maxYpx) )
{
s = getLabel( n );
dc.GetTextExtent( s, &tx, &ty );
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
ADDED power dissipation plotting and cursors. Also fixes a bug so that voltages, currents and power dissipations are only probed if the flag is set -- this keeps ngspice from throwing an error if you probe something twice (for instance, if you have .probe commands in text and turn off the auto-probing).
2023-02-10 20:52:52 +00:00
if( m_flags == mpALIGN_BORDER_LEFT || m_flags == mpALIGN_RIGHT || m_flags == mpALIGN_FAR_RIGHT )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawText( s, orgx + 4, p - ty / 2 );
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
else
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawText( s, orgx - 4 - tx, p - ty / 2 ); // ( s, orgx+4, p-ty/2);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxMathPlot basic code formatting
2016-08-11 12:42:18 +00:00
// Draw axis name
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw axis name
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_name, &tx, &ty );
switch( m_nameFlags )
{
case mpALIGN_BORDER_LEFT:
dc.DrawText( m_name, labelW + 8, 4 );
break;
case mpALIGN_LEFT:
{
// if ((!m_drawOutsideMargins) && (w.GetMarginLeft() > (ty + labelW + 8))) {
// dc.DrawRotatedText( m_name, orgx - 6 - labelW - ty, (maxYpx + minYpx) / 2 + tx / 2, 90);
// } else {
ADDED power dissipation plotting and cursors. Also fixes a bug so that voltages, currents and power dissipations are only probed if the flag is set -- this keeps ngspice from throwing an error if you probe something twice (for instance, if you have .probe commands in text and turn off the auto-probing).
2023-02-10 20:52:52 +00:00
dc.DrawText( m_name, orgx - ( tx / 2 ), minYpx - ty - 4 );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// }
}
break;
case mpALIGN_CENTER:
dc.DrawText( m_name, orgx + 4, 4 );
break;
case mpALIGN_RIGHT:
ADDED power dissipation plotting and cursors. Also fixes a bug so that voltages, currents and power dissipations are only probed if the flag is set -- this keeps ngspice from throwing an error if you probe something twice (for instance, if you have .probe commands in text and turn off the auto-probing).
2023-02-10 20:52:52 +00:00
case mpALIGN_FAR_RIGHT:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
// dc.DrawRotatedText( m_name, orgx + 6, (maxYpx + minYpx) / 2 + tx / 2, 90);
/*if ((!m_drawOutsideMargins) && (w.GetMarginRight() > (ty + labelW + 8))) {
* dc.DrawRotatedText( m_name, orgx + 6 + labelW, (maxYpx - minYpx + tx)>>1, 90);
* } else {*/
ADDED power dissipation plotting and cursors. Also fixes a bug so that voltages, currents and power dissipations are only probed if the flag is set -- this keeps ngspice from throwing an error if you probe something twice (for instance, if you have .probe commands in text and turn off the auto-probing).
2023-02-10 20:52:52 +00:00
dc.DrawText( m_name, orgx - ( tx / 2 ), minYpx - ty - 4 );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// }
}
break;
case mpALIGN_BORDER_RIGHT:
dc.DrawText( m_name, orgx - 6 - tx - labelW, 4 );
break;
default:
break;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
mathplot: removed some warnings, fixes to labelling code
2016-08-11 12:42:04 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpWindow
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( mpWindow, wxWindow )
BEGIN_EVENT_TABLE( mpWindow, wxWindow )
EVT_PAINT( mpWindow::OnPaint )
EVT_SIZE( mpWindow::OnSize )
EVT_SCROLLWIN_THUMBTRACK( mpWindow::OnScrollThumbTrack )
EVT_SCROLLWIN_PAGEUP( mpWindow::OnScrollPageUp )
EVT_SCROLLWIN_PAGEDOWN( mpWindow::OnScrollPageDown )
EVT_SCROLLWIN_LINEUP( mpWindow::OnScrollLineUp )
EVT_SCROLLWIN_LINEDOWN( mpWindow::OnScrollLineDown )
EVT_SCROLLWIN_TOP( mpWindow::OnScrollTop )
EVT_SCROLLWIN_BOTTOM( mpWindow::OnScrollBottom )
EVT_MIDDLE_DOWN( mpWindow::OnMouseMiddleDown ) // JLB
EVT_RIGHT_UP( mpWindow::OnShowPopupMenu )
EVT_MOUSEWHEEL( mpWindow::OnMouseWheel ) // JLB
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
EVT_MAGNIFY( mpWindow::OnMagnify )
#endif
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
EVT_MOTION( mpWindow::OnMouseMove ) // JLB
EVT_LEFT_DOWN( mpWindow::OnMouseLeftDown )
EVT_LEFT_UP( mpWindow::OnMouseLeftRelease )
EVT_MENU( mpID_CENTER, mpWindow::OnCenter )
EVT_MENU( mpID_FIT, mpWindow::OnFit )
EVT_MENU( mpID_ZOOM_IN, mpWindow::OnZoomIn )
EVT_MENU( mpID_ZOOM_OUT, mpWindow::OnZoomOut )
EVT_MENU( mpID_LOCKASPECT, mpWindow::OnLockAspect )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
END_EVENT_TABLE()
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpWindow::mpWindow() :
wxWindow(),
Initialize more variables
2020-09-22 11:29:13 +00:00
m_lockaspect( false ),
m_minX( 0.0 ),
m_maxX( 0.0 ),
m_minY( 0.0 ),
m_maxY( 0.0 ),
m_scaleX( 1.0 ),
m_scaleY( 1.0 ),
m_posX( 0.0 ),
m_posY( 0.0 ),
m_scrX( 64 ),
m_scrY( 64 ),
m_clickedX( 0 ),
m_clickedY( 0 ),
m_desiredXmin( 0.0 ),
m_desiredXmax( 1.0 ),
m_desiredYmin( 0.0 ),
m_desiredYmax( 1.0 ),
m_marginTop( 0 ),
m_marginRight( 0 ),
m_marginBottom( 0 ),
m_marginLeft( 0 ),
m_last_lx( 0 ),
m_last_ly( 0 ),
m_buff_bmp( nullptr ),
m_enableDoubleBuffer( false ),
m_enableMouseNavigation( true ),
m_enableMouseWheelPan( false ),
m_enableLimitedView( false ),
m_enableScrollBars( false ),
m_movingInfoLayer( nullptr ),
m_zooming( false )
{
Set interpolation/anti-alias in plots This doesn't do much for Linux, but the interpolation modes for MSW and Mac should clean up lines a bit in plotting Fixes https://gitlab.com/kicad/code/kicad/issues/10239
2022-12-21 20:02:35 +00:00
if( wxGraphicsContext *ctx = m_buff_dc.GetGraphicsContext() )
{
if( !ctx->SetInterpolationQuality( wxINTERPOLATION_BEST )
|| !ctx->SetInterpolationQuality( wxINTERPOLATION_GOOD ) )
{
ctx->SetInterpolationQuality( wxINTERPOLATION_FAST );
}
ctx->SetAntialiasMode( wxANTIALIAS_DEFAULT );
}
Initialize more variables
2020-09-22 11:29:13 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpWindow::mpWindow( wxWindow* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long flag )
: wxWindow( parent, id, pos, size, flag, wxT( "mathplot" ) )
{
m_zooming = false;
m_scaleX = m_scaleY = 1.0;
m_posX = m_posY = 0;
m_desiredXmin = m_desiredYmin = 0;
m_desiredXmax = m_desiredYmax = 1;
m_scrX = m_scrY = 64; // Fixed from m_scrX = m_scrX = 64;
m_minX = m_minY = 0;
m_maxX = m_maxY = 0;
m_last_lx = m_last_ly = 0;
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
m_buff_bmp = nullptr;
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
m_enableDoubleBuffer = false;
m_enableMouseNavigation = true;
m_enableLimitedView = false;
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
m_movingInfoLayer = nullptr;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Set margins to 0
m_marginTop = 0; m_marginRight = 0; m_marginBottom = 0; m_marginLeft = 0;
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
m_lockaspect = false;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Clarify various uses of "Center" Distinguish between the english verb "Center" and the noun "Center", which may be translated differently Fixes https://gitlab.com/kicad/code/kicad/issues/11109
2022-10-03 19:47:45 +00:00
m_popmenu.Append( mpID_CENTER, _( "Center on Cursor" ), _( "Center plot view to this position" ) );
Simulator: add simulator icon, and colored icons to identify more easily traces in trace list and cursor list.
2016-08-29 09:39:54 +00:00
m_popmenu.Append( mpID_FIT, _( "Fit on Screen" ), _( "Set plot view to show all items" ) );
m_popmenu.Append( mpID_ZOOM_IN, _( "Zoom In" ), _( "Zoom in plot view." ) );
m_popmenu.Append( mpID_ZOOM_OUT, _( "Zoom Out" ), _( "Zoom out plot view." ) );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// m_popmenu.AppendCheckItem( mpID_LOCKASPECT, _("Lock aspect"), _("Lock horizontal and vertical zoom aspect."));
// m_popmenu.Append( mpID_HELP_MOUSE, _("Show mouse commands..."), _("Show help about the mouse commands."));
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_layers.clear();
SetBackgroundColour( *wxWHITE );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_bgColour = *wxWHITE;
m_fgColour = *wxBLACK;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_enableScrollBars = false;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetSizeHints( 128, 128 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// J.L.Blanco: Eliminates the "flick" with the double buffer.
SetBackgroundStyle( wxBG_STYLE_CUSTOM );
Set interpolation/anti-alias in plots This doesn't do much for Linux, but the interpolation modes for MSW and Mac should clean up lines a bit in plotting Fixes https://gitlab.com/kicad/code/kicad/issues/10239
2022-12-21 20:02:35 +00:00
if( wxGraphicsContext* ctx = m_buff_dc.GetGraphicsContext() )
{
if( !ctx->SetInterpolationQuality( wxINTERPOLATION_BEST )
|| !ctx->SetInterpolationQuality( wxINTERPOLATION_GOOD ) )
{
ctx->SetInterpolationQuality( wxINTERPOLATION_FAST );
}
ctx->SetAntialiasMode( wxANTIALIAS_DEFAULT );
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
mpWindow::~mpWindow()
{
// Free all the layers:
DelAllLayers( true, false );
Save cursor positions in sim workbook.
2023-02-12 19:54:28 +00:00
delete m_buff_bmp;
m_buff_bmp = nullptr;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Mouse handler, for detecting when the user drag with the right button or just "clicks" for the menu
// JLB
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnMouseMiddleDown( wxMouseEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
m_mouseMClick.x = event.GetX();
m_mouseMClick.y = event.GetY();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
void mpWindow::OnMagnify( wxMouseEvent& event )
{
if( !m_enableMouseNavigation )
{
event.Skip();
return;
}
float zoom = event.GetMagnification() + 1.0f;
wxPoint pos( event.GetX(), event.GetY() );
if( zoom > 1.0f )
ZoomIn( pos, zoom );
else if( zoom < 1.0f )
ZoomOut( pos, 1.0f / zoom );
}
#endif
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Process mouse wheel events
// JLB
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnMouseWheel( wxMouseEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_enableMouseNavigation )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
event.Skip();
return;
}
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
int change = event.GetWheelRotation();
const int axis = event.GetWheelAxis();
double changeUnitsX = change / m_scaleX;
double changeUnitsY = change / m_scaleY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
if( ( !m_enableMouseWheelPan && ( event.ControlDown() || event.ShiftDown() ) )
|| ( m_enableMouseWheelPan && !event.ControlDown() ) )
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
{
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
// Scrolling
if( m_enableMouseWheelPan )
{
if( axis == wxMOUSE_WHEEL_HORIZONTAL || event.ShiftDown() )
SetXView( m_posX + changeUnitsX, m_desiredXmax + changeUnitsX,
m_desiredXmin + changeUnitsX );
else
SetYView( m_posY + changeUnitsY, m_desiredYmax + changeUnitsY,
m_desiredYmin + changeUnitsY );
}
else
{
if( event.ControlDown() )
SetXView( m_posX + changeUnitsX, m_desiredXmax + changeUnitsX,
m_desiredXmin + changeUnitsX );
else
SetYView( m_posY + changeUnitsY, m_desiredYmax + changeUnitsY,
m_desiredYmin + changeUnitsY );
}
UpdateAll();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
{
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
// zoom in/out
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxPoint clickPt( event.GetX(), event.GetY() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( event.GetWheelRotation() > 0 )
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
ZoomIn( clickPt );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
else
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
ZoomOut( clickPt );
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
return;
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Fix source comment / documentation typos
2021-06-09 19:32:58 +00:00
// If the user "drags" with the right button pressed, do "pan"
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// JLB
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnMouseMove( wxMouseEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_enableMouseNavigation )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
event.Skip();
return;
}
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
wxCursor cursor = wxCURSOR_MAGNIFIER;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( event.m_middleDown )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
cursor = wxCURSOR_ARROW;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// The change:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int Ax = m_mouseMClick.x - event.GetX();
int Ay = m_mouseMClick.y - event.GetY();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// For the next event, use relative to this coordinates.
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
m_mouseMClick.x = event.GetX();
m_mouseMClick.y = event.GetY();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double Ax_units = Ax / m_scaleX;
double Ay_units = -Ay / m_scaleY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
bool updateRequired = false;
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
updateRequired |= SetXView( m_posX + Ax_units,
m_desiredXmax + Ax_units,
m_desiredXmin + Ax_units );
updateRequired |= SetYView( m_posY + Ay_units,
m_desiredYmax + Ay_units,
m_desiredYmin + Ay_units );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( updateRequired )
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
UpdateAll();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
}
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
else if( event.m_leftDown )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
if( m_movingInfoLayer )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Save location of legend in worksheet. Also provides a different cursor when over a legend (to make it clearer that you can drag it).
2023-03-20 09:43:16 +00:00
if( dynamic_cast<mpInfoLegend*>( m_movingInfoLayer ) )
cursor = wxCURSOR_SIZING;
else
cursor = wxCURSOR_SIZEWE;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
wxPoint moveVector( event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y );
m_movingInfoLayer->Move( moveVector );
m_zooming = false;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
}
else
{
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
cursor = wxCURSOR_MAGNIFIER;
wxClientDC dc( this );
wxPen pen( m_fgColour, 1, wxPENSTYLE_DOT );
dc.SetPen( pen );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
dc.DrawRectangle( m_mouseLClick.x, m_mouseLClick.y,
event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y );
m_zooming = true;
m_zoomRect.x = m_mouseLClick.x;
m_zoomRect.y = m_mouseLClick.y;
m_zoomRect.width = event.GetX() - m_mouseLClick.x;
m_zoomRect.height = event.GetY() - m_mouseLClick.y;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
UpdateAll();
}
else
{
for( mpLayer* layer : m_layers)
{
if( layer->IsInfo() && layer->IsVisible() )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
mpInfoLayer* infoLayer = (mpInfoLayer*) layer;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
if( infoLayer->Inside( event.GetPosition() ) )
Save location of legend in worksheet. Also provides a different cursor when over a legend (to make it clearer that you can drag it).
2023-03-20 09:43:16 +00:00
{
if( dynamic_cast<mpInfoLegend*>( infoLayer ) )
cursor = wxCURSOR_SIZING;
else
cursor = wxCURSOR_SIZEWE;
}
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
/* if (m_coordTooltip) {
* wxString toolTipContent;
* toolTipContent.Printf( "X = %f\nY = %f", p2x(event.GetX()), p2y(event.GetY()));
* wxTipWindow** ptr = NULL;
* wxRect rectBounds(event.GetX(), event.GetY(), 5, 5);
* wxTipWindow* tip = new wxTipWindow(this, toolTipContent, 100, ptr, &rectBounds);
*
* } */
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Better cursor feedback for plot window.
2023-01-31 17:29:46 +00:00
SetCursor( cursor );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
event.Skip();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnMouseLeftDown( wxMouseEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
m_mouseLClick.x = event.GetX();
m_mouseLClick.y = event.GetY();
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
m_zooming = true;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxPoint pointClicked = event.GetPosition();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_movingInfoLayer = IsInsideInfoLayer( pointClicked );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
event.Skip();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnMouseLeftRelease( wxMouseEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxPoint release( event.GetX(), event.GetY() );
wxPoint press( m_mouseLClick.x, m_mouseLClick.y );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
m_zooming = false;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
if( m_movingInfoLayer != nullptr )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_movingInfoLayer->UpdateReference();
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
m_movingInfoLayer = nullptr;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else
{
if( release != press )
ZoomRect( press, release );
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
event.Skip();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
void mpWindow::Fit()
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( UpdateBBox() )
Fit( m_minX, m_maxX, m_minY, m_maxY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
// JL
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
void mpWindow::Fit( double xMin, double xMax, double yMin, double yMax,
wxCoord* printSizeX, wxCoord* printSizeY )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
// Save desired borders:
m_desiredXmin = xMin; m_desiredXmax = xMax;
m_desiredYmin = yMin; m_desiredYmax = yMax;
// Give a small margin to plot area
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double xExtra = fabs( xMax - xMin ) * 0.00;
double yExtra = fabs( yMax - yMin ) * 0.03;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
xMin -= xExtra;
xMax += xExtra;
yMin -= yExtra;
yMax += yExtra;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
if( printSizeX != nullptr && printSizeY != nullptr )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Printer:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_scrX = *printSizeX;
m_scrY = *printSizeY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
{
// Normal case (screen):
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetClientSize( &m_scrX, &m_scrY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double Ax, Ay;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Ax = xMax - xMin;
Ay = yMax - yMin;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
m_scaleX = (Ax != 0) ? (m_scrX - m_marginLeft - m_marginRight) / Ax : 1; // m_scaleX = (Ax != 0) ? m_scrX / Ax : 1;
m_scaleY = (Ay != 0) ? (m_scrY - m_marginTop - m_marginBottom) / Ay : 1; // m_scaleY = (Ay != 0) ? m_scrY / Ay : 1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_lockaspect )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
// Keep the lowest "scale" to fit the whole range required by that axis (to actually
// "fit"!):
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
double s = m_scaleX < m_scaleY ? m_scaleX : m_scaleY;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_scaleX = s;
m_scaleY = s;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
// Adjusts corner coordinates: This should be simply:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// m_posX = m_minX;
// m_posY = m_maxY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// But account for centering if we have lock aspect:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_posX = (xMin + xMax) / 2 - ( (m_scrX - m_marginLeft - m_marginRight) / 2 + m_marginLeft ) /
m_scaleX; // m_posX = (xMin+xMax)/2 - (m_scrX/2)/m_scaleX;
// m_posY = (yMin+yMax)/2 + ((m_scrY - m_marginTop - m_marginBottom)/2 - m_marginTop)/m_scaleY; // m_posY = (yMin+yMax)/2 + (m_scrY/2)/m_scaleY;
m_posY = (yMin + yMax) / 2 + ( (m_scrY - m_marginTop - m_marginBottom) / 2 + m_marginTop ) /
m_scaleY; // m_posY = (yMin+yMax)/2 + (m_scrY/2)/m_scaleY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// It is VERY IMPORTANT to DO NOT call Refresh if we are drawing to the printer!!
// Otherwise, the DC dimensions will be those of the window instead of the printer device
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
if( printSizeX == nullptr || printSizeY == nullptr )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Patch ngpaton
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::DoZoomInXCalc( const int staticXpixel )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Preserve the position of the clicked point:
double staticX = p2x( staticXpixel );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Zoom in:
m_scaleX = m_scaleX * zoomIncrementalFactor;
// Adjust the new m_posx
m_posX = staticX - (staticXpixel / m_scaleX);
// Adjust desired
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredXmin = m_posX;
m_desiredXmax = m_posX + ( m_scrX - (m_marginLeft + m_marginRight) ) / m_scaleX;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
void mpWindow::AdjustLimitedView()
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_enableLimitedView )
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
return;
simulator: plot curves: fix incorrect draw area limits calculation when zooming. Fixes: lp:1674132 https://bugs.launchpad.net/kicad/+bug/1674132
2019-09-26 14:29:52 +00:00
// m_min and m_max are plot limits for curves
// xMin, xMax, yMin, yMax are the full limits (plot limit + margin)
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const double xMin = m_minX - m_marginLeft / m_scaleX;
simulator: plot curves: fix incorrect draw area limits calculation when zooming. Fixes: lp:1674132 https://bugs.launchpad.net/kicad/+bug/1674132
2019-09-26 14:29:52 +00:00
const double xMax = m_maxX + m_marginRight / m_scaleX;
const double yMin = m_minY - m_marginTop / m_scaleY;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const double yMax = m_maxY + m_marginBottom / m_scaleY;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_desiredXmin < xMin )
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
{
double diff = xMin - m_desiredXmin;
m_posX += diff;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredXmax += diff;
m_desiredXmin = xMin;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_desiredXmax > xMax )
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
{
double diff = m_desiredXmax - xMax;
m_posX -= diff;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredXmin -= diff;
m_desiredXmax = xMax;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_desiredYmin < yMin )
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
{
double diff = yMin - m_desiredYmin;
m_posY += diff;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredYmax += diff;
m_desiredYmin = yMin;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_desiredYmax > yMax )
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
{
double diff = m_desiredYmax - yMax;
m_posY -= diff;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredYmin -= diff;
m_desiredYmax = yMax;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
bool mpWindow::SetXView( double pos, double desiredMax, double desiredMin )
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// if(!CheckXLimits(desiredMax, desiredMin))
// return false;
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
m_posX = pos;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredXmax = desiredMax;
m_desiredXmin = desiredMin;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
AdjustLimitedView();
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
return true;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
bool mpWindow::SetYView( double pos, double desiredMax, double desiredMin )
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// if(!CheckYLimits(desiredMax, desiredMin))
// return false;
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
m_posY = pos;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredYmax = desiredMax;
m_desiredYmin = desiredMin;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
AdjustLimitedView();
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
return true;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::ZoomIn( const wxPoint& centerPoint )
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
{
ZoomIn( centerPoint, zoomIncrementalFactor );
}
void mpWindow::ZoomIn( const wxPoint& centerPoint, double zoomFactor )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxPoint c( centerPoint );
if( c == wxDefaultPosition )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetClientSize( &m_scrX, &m_scrY );
c.x = (m_scrX - m_marginLeft - m_marginRight) / 2 + m_marginLeft; // c.x = m_scrX/2;
c.y = (m_scrY - m_marginTop - m_marginBottom) / 2 - m_marginTop; // c.y = m_scrY/2;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
c.x = std::max( c.x, m_marginLeft );
c.x = std::min( c.x, m_scrX - m_marginRight );
c.y = std::max( c.y, m_marginTop );
c.y = std::min( c.y, m_scrY - m_marginBottom );
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Preserve the position of the clicked point:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double prior_layer_x = p2x( c.x );
double prior_layer_y = p2y( c.y );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Zoom in:
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
const double MAX_SCALE = 1e6;
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
double newScaleX = m_scaleX * zoomFactor;
double newScaleY = m_scaleY * zoomFactor;
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
// Baaaaad things happen when you zoom in too much..
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( newScaleX <= MAX_SCALE && newScaleY <= MAX_SCALE )
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_scaleX = newScaleX;
m_scaleY = newScaleY;
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
}
else
{
return;
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Adjust the new m_posx/y:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_posX = prior_layer_x - c.x / m_scaleX;
m_posY = prior_layer_y + c.y / m_scaleY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredXmin = m_posX;
m_desiredXmax = m_posX + (m_scrX - m_marginLeft - m_marginRight) / m_scaleX; // m_desiredXmax = m_posX + m_scrX / m_scaleX;
m_desiredYmax = m_posY;
m_desiredYmin = m_posY - (m_scrY - m_marginTop - m_marginBottom) / m_scaleY; // m_desiredYmin = m_posY - m_scrY / m_scaleY;
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
AdjustLimitedView();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::ZoomOut( const wxPoint& centerPoint )
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
{
ZoomOut( centerPoint, zoomIncrementalFactor );
}
void mpWindow::ZoomOut( const wxPoint& centerPoint, double zoomFactor )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxPoint c( centerPoint );
if( c == wxDefaultPosition )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetClientSize( &m_scrX, &m_scrY );
c.x = (m_scrX - m_marginLeft - m_marginRight) / 2 + m_marginLeft; // c.x = m_scrX/2;
c.y = (m_scrY - m_marginTop - m_marginBottom) / 2 - m_marginTop; // c.y = m_scrY/2;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
// Preserve the position of the clicked point:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double prior_layer_x = p2x( c.x );
double prior_layer_y = p2y( c.y );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Zoom out:
Eeschema: simulator plot: allow standard mac pan and pinch to zoom
2019-11-19 14:58:32 +00:00
m_scaleX = m_scaleX / zoomFactor;
m_scaleY = m_scaleY / zoomFactor;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Adjust the new m_posx/y:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_posX = prior_layer_x - c.x / m_scaleX;
m_posY = prior_layer_y + c.y / m_scaleY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_desiredXmin = m_posX;
m_desiredXmax = m_posX + (m_scrX - m_marginLeft - m_marginRight) / m_scaleX; // m_desiredXmax = m_posX + m_scrX / m_scaleX;
m_desiredYmax = m_posY;
m_desiredYmin = m_posY - (m_scrY - m_marginTop - m_marginBottom) / m_scaleY; // m_desiredYmin = m_posY - m_scrY / m_scaleY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Save cursor positions in sim workbook.
2023-02-12 19:54:28 +00:00
if( !CheckXLimits( m_desiredXmax, m_desiredXmin )
|| !CheckYLimits( m_desiredYmax, m_desiredYmin ) )
wxMathPlot: Limited zooming and panning
2016-08-11 12:41:37 +00:00
{
Fit();
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
void mpWindow::ZoomInX()
{
m_scaleX = m_scaleX * zoomIncrementalFactor;
UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::ZoomRect( wxPoint p0, wxPoint p1 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Compute the 2 corners in graph coordinates:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double p0x = p2x( p0.x );
double p0y = p2y( p0.y );
double p1x = p2x( p1.x );
double p1y = p2y( p1.y );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Order them:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double zoom_x_min = p0x<p1x ? p0x : p1x;
double zoom_x_max = p0x>p1x ? p0x : p1x;
double zoom_y_min = p0y<p1y ? p0y : p1y;
double zoom_y_max = p0y>p1y ? p0y : p1y;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Fit( zoom_x_min, zoom_x_max, zoom_y_min, zoom_y_max );
Fixes for limited view panning
2016-08-11 12:42:08 +00:00
AdjustLimitedView();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::LockAspect( bool enable )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
m_lockaspect = enable;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_popmenu.Check( mpID_LOCKASPECT, enable );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Try to fit again with the new config:
Fit( m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax );
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnShowPopupMenu( wxMouseEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_clickedX = event.GetX();
m_clickedY = event.GetY();
PopupMenu( &m_popmenu, event.GetX(), event.GetY() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnLockAspect( wxCommandEvent& WXUNUSED( event ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
LockAspect( !m_lockaspect );
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnFit( wxCommandEvent& WXUNUSED( event ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Fit();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnCenter( wxCommandEvent& WXUNUSED( event ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetClientSize( &m_scrX, &m_scrY );
int centerX = (m_scrX - m_marginLeft - m_marginRight) / 2; // + m_marginLeft; // c.x = m_scrX/2;
int centerY = (m_scrY - m_marginTop - m_marginBottom) / 2; // - m_marginTop; // c.y = m_scrY/2;
SetPos( p2x( m_clickedX - centerX ), p2y( m_clickedY - centerY ) );
// SetPos( p2x(m_clickedX-m_scrX/2), p2y(m_clickedY-m_scrY/2) ); //SetPos( (double)(m_clickedX-m_scrX/2) / m_scaleX + m_posX, (double)(m_scrY/2-m_clickedY) / m_scaleY + m_posY);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnZoomIn( wxCommandEvent& WXUNUSED( event ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
ZoomIn( wxPoint( m_mouseMClick.x, m_mouseMClick.y ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnZoomOut( wxCommandEvent& WXUNUSED( event ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
ZoomOut();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnSize( wxSizeEvent& WXUNUSED( event ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Try to fit again with the new window size:
Fit( m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax );
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
bool mpWindow::AddLayer( mpLayer* layer, bool refreshDisplay )
{
Save cursor positions in sim workbook.
2023-02-12 19:54:28 +00:00
if( layer )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_layers.push_back( layer );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( refreshDisplay )
UpdateAll();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return true;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return false;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Save cursor positions in sim workbook.
2023-02-12 19:54:28 +00:00
bool mpWindow::DelLayer( mpLayer* layer, bool alsoDeleteObject, bool refreshDisplay )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
wxLayerList::iterator layIt;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( layIt = m_layers.begin(); layIt != m_layers.end(); layIt++ )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( *layIt == layer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Also delete the object?
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( alsoDeleteObject )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
delete *layIt;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_layers.erase( layIt ); // this deleted the reference only
if( refreshDisplay )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return true;
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return false;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::DelAllLayers( bool alsoDeleteObject, bool refreshDisplay )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
while( m_layers.size()>0 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Also delete the object?
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( alsoDeleteObject )
delete m_layers[0];
m_layers.erase( m_layers.begin() ); // this deleted the reference only
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( refreshDisplay )
UpdateAll();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnPaint( wxPaintEvent& WXUNUSED( event ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxPaintDC dc( this );
dc.GetSize( &m_scrX, &m_scrY ); // This is the size of the visible area only!
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Selects direct or buffered draw:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxDC* trgDc;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// J.L.Blanco @ Aug 2007: Added double buffer support
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_enableDoubleBuffer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( m_last_lx != m_scrX || m_last_ly != m_scrY )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Save cursor positions in sim workbook.
2023-02-12 19:54:28 +00:00
delete m_buff_bmp;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_buff_bmp = new wxBitmap( m_scrX, m_scrY );
m_buff_dc.SelectObject( *m_buff_bmp );
m_last_lx = m_scrX;
m_last_ly = m_scrY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
trgDc = &m_buff_dc;
}
else
{
trgDc = &dc;
}
// Draw background:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// trgDc->SetDeviceOrigin(0,0);
Set interpolation/anti-alias in plots This doesn't do much for Linux, but the interpolation modes for MSW and Mac should clean up lines a bit in plotting Fixes https://gitlab.com/kicad/code/kicad/issues/10239
2022-12-21 20:02:35 +00:00
if( wxGraphicsContext* ctx = trgDc->GetGraphicsContext() )
{
if( !ctx->SetInterpolationQuality( wxINTERPOLATION_BEST )
|| !ctx->SetInterpolationQuality( wxINTERPOLATION_GOOD ) )
{
ctx->SetInterpolationQuality( wxINTERPOLATION_FAST );
}
ctx->SetAntialiasMode( wxANTIALIAS_DEFAULT );
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
trgDc->SetPen( *wxTRANSPARENT_PEN );
wxBrush brush( GetBackgroundColour() );
trgDc->SetBrush( brush );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
trgDc->SetTextForeground( m_fgColour );
trgDc->DrawRectangle( 0, 0, m_scrX, m_scrY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw all the layers:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// trgDc->SetDeviceOrigin( m_scrX>>1, m_scrY>>1); // Origin at the center
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxLayerList::iterator li;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( li = m_layers.begin(); li != m_layers.end(); li++ )
(*li)->Plot( *trgDc, *this );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_zooming )
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxPen pen( m_fgColour, 1, wxPENSTYLE_DOT );
trgDc->SetPen( pen );
trgDc->SetBrush( *wxTRANSPARENT_BRUSH );
trgDc->DrawRectangle( m_zoomRect );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// If doublebuffer, draw now to the window:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_enableDoubleBuffer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// trgDc->SetDeviceOrigin(0,0);
// dc.SetDeviceOrigin(0,0); // Origin at the center
dc.Blit( 0, 0, m_scrX, m_scrY, trgDc, 0, 0 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
// If scrollbars are enabled, refresh them
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_enableScrollBars )
{
Mouse controls in simulation plot made coherent with the rest of KiCad
2016-08-11 12:41:27 +00:00
/* m_scroll.x = (int) floor((m_posX - m_minX)*m_scaleX);
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
* m_scroll.y = (int) floor((m_maxY - m_posY )*m_scaleY);
* Scroll(m_scroll.x, m_scroll.y);*/
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Scroll(x2p(m_posX), y2p(m_posY));
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// SetVirtualSize((int) ((m_maxX - m_minX)*m_scaleX), (int) ((m_maxY - m_minY)*m_scaleY));
// int centerX = (m_scrX - m_marginLeft - m_marginRight)/2; // + m_marginLeft; // c.x = m_scrX/2;
// int centerY = (m_scrY - m_marginTop - m_marginBottom)/2; // - m_marginTop; // c.y = m_scrY/2;
/*SetScrollbars(1, 1, (int) ((m_maxX - m_minX)*m_scaleX), (int) ((m_maxY - m_minY)*m_scaleY));*/ // , x2p(m_posX + centerX/m_scaleX), y2p(m_posY - centerY/m_scaleY), true);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
bool mpWindow::UpdateBBox()
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_minX = 0.0;
m_maxX = 1.0;
m_minY = 0.0;
m_maxY = 1.0;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
return true;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
void mpWindow::UpdateAll()
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( UpdateBBox() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_enableScrollBars )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
int cx, cy;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
GetClientSize( &cx, &cy );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Do x scroll bar
{
// Convert margin sizes from pixels to coordinates
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double leftMargin = m_marginLeft / m_scaleX;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Calculate the range in coords that we want to scroll over
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double maxX = (m_desiredXmax > m_maxX) ? m_desiredXmax : m_maxX;
double minX = (m_desiredXmin < m_minX) ? m_desiredXmin : m_minX;
if( (m_posX + leftMargin) < minX )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
minX = m_posX + leftMargin;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Calculate scroll bar size and thumb position
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int sizeX = (int) ( (maxX - minX) * m_scaleX );
int thumbX = (int) ( ( (m_posX + leftMargin) - minX ) * m_scaleX );
SetScrollbar( wxHORIZONTAL, thumbX, cx - (m_marginRight + m_marginLeft), sizeX );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
// Do y scroll bar
{
// Convert margin sizes from pixels to coordinates
double topMargin = m_marginTop / m_scaleY;
// Calculate the range in coords that we want to scroll over
double maxY = (m_desiredYmax > m_maxY) ? m_desiredYmax : m_maxY;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (m_posY - topMargin) > maxY )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
maxY = m_posY - topMargin;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
double minY = (m_desiredYmin < m_minY) ? m_desiredYmin : m_minY;
// Calculate scroll bar size and thumb position
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int sizeY = (int) ( (maxY - minY) * m_scaleY );
int thumbY = (int) ( ( maxY - (m_posY - topMargin) ) * m_scaleY );
SetScrollbar( wxVERTICAL, thumbY, cy - (m_marginTop + m_marginBottom), sizeY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
Refresh( false );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::DoScrollCalc( const int position, const int orientation )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( orientation == wxVERTICAL )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Y axis
// Get top margin in coord units
double topMargin = m_marginTop / m_scaleY;
// Calculate maximum Y coord to be shown in the graph
double maxY = m_desiredYmax > m_maxY ? m_desiredYmax : m_maxY;
// Set new position
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetPosY( ( maxY - (position / m_scaleY) ) + topMargin );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
{
// X Axis
// Get left margin in coord units
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double leftMargin = m_marginLeft / m_scaleX;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Calculate minimum X coord to be shown in the graph
double minX = (m_desiredXmin < m_minX) ? m_desiredXmin : m_minX;
// Set new position
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetPosX( ( minX + (position / m_scaleX) ) - leftMargin );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnScrollThumbTrack( wxScrollWinEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
DoScrollCalc( event.GetPosition(), event.GetOrientation() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnScrollPageUp( wxScrollWinEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
int scrollOrientation = event.GetOrientation();
// Get position before page up
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int position = GetScrollPos( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Get thumb size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int thumbSize = GetScrollThumb( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Need to adjust position by a page
position -= thumbSize;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( position < 0 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
position = 0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
DoScrollCalc( position, scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnScrollPageDown( wxScrollWinEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
int scrollOrientation = event.GetOrientation();
// Get position before page up
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int position = GetScrollPos( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Get thumb size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int thumbSize = GetScrollThumb( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Get scroll range
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int scrollRange = GetScrollRange( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Need to adjust position by a page
position += thumbSize;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( position > (scrollRange - thumbSize) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
position = scrollRange - thumbSize;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
DoScrollCalc( position, scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnScrollLineUp( wxScrollWinEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
int scrollOrientation = event.GetOrientation();
// Get position before page up
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int position = GetScrollPos( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Need to adjust position by a line
position -= mpSCROLL_NUM_PIXELS_PER_LINE;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( position < 0 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
position = 0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
DoScrollCalc( position, scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnScrollLineDown( wxScrollWinEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
int scrollOrientation = event.GetOrientation();
// Get position before page up
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int position = GetScrollPos( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Get thumb size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int thumbSize = GetScrollThumb( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Get scroll range
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int scrollRange = GetScrollRange( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Need to adjust position by a page
position += mpSCROLL_NUM_PIXELS_PER_LINE;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( position > (scrollRange - thumbSize) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
position = scrollRange - thumbSize;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
DoScrollCalc( position, scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnScrollTop( wxScrollWinEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
DoScrollCalc( 0, event.GetOrientation() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::OnScrollBottom( wxScrollWinEvent& event )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
int scrollOrientation = event.GetOrientation();
// Get thumb size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int thumbSize = GetScrollThumb( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Get scroll range
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
int scrollRange = GetScrollRange( scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
DoScrollCalc( scrollRange - thumbSize, scrollOrientation );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// End patch ngpaton
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::SetScaleX( double scaleX )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( scaleX != 0 )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_scaleX = scaleX;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// New methods implemented by Davide Rondini
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
unsigned int mpWindow::CountLayers() const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
unsigned int layerNo = 0;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
for( const mpLayer* layer : m_layers )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( layer->HasBBox() )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
layerNo++;
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return layerNo;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
mpLayer* mpWindow::GetLayer( int position ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( ( position >= (int) m_layers.size() ) || position < 0 )
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
return nullptr;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return m_layers[position];
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
const mpLayer* mpWindow::GetLayerByName( const wxString& name ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
for( const mpLayer* layer : m_layers )
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( !layer->GetName().Cmp( name ) )
return layer;
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
return nullptr; // Not found
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
void mpWindow::GetBoundingBox( double* bbox ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
bbox[0] = m_minX;
bbox[1] = m_maxX;
bbox[2] = m_minY;
bbox[3] = m_maxY;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
bool mpWindow::SaveScreenshot( const wxString& filename, wxBitmapType type, wxSize imageSize,
bool fit )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
int sizeX, sizeY;
int bk_scrX, bk_scrY;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( imageSize == wxDefaultSize )
{
sizeX = m_scrX;
sizeY = m_scrY;
}
else
{
sizeX = imageSize.x;
sizeY = imageSize.y;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
bk_scrX = m_scrX;
bk_scrY = m_scrY;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetScr( sizeX, sizeY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxBitmap screenBuffer( sizeX, sizeY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxMemoryDC screenDC;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
screenDC.SelectObject( screenBuffer );
Mathplot: properly set foreground color when saving screenshots Fixes: lp:1810914 * https://bugs.launchpad.net/kicad/+bug/1810914
2019-06-06 02:43:41 +00:00
screenDC.SetPen( *wxWHITE_PEN );
screenDC.SetTextForeground( m_fgColour );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxBrush brush( GetBackgroundColour() );
screenDC.SetBrush( brush );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
screenDC.DrawRectangle( 0, 0, sizeX, sizeY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( fit )
Fit( m_minX, m_maxX, m_minY, m_maxY, &sizeX, &sizeY );
else
Fit( m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax, &sizeX, &sizeY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw all the layers:
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
for( mpLayer* layer : m_layers )
layer->Plot( screenDC, *this );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( imageSize != wxDefaultSize )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Restore dimensions
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetScr( bk_scrX, bk_scrY );
Fit( m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax, &bk_scrX, &bk_scrY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Once drawing is complete, actually save screen shot
wxImage screenImage = screenBuffer.ConvertToImage();
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
return screenImage.SaveFile( filename, type );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::SetMargins( int top, int right, int bottom, int left )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
m_marginTop = top;
m_marginRight = right;
m_marginBottom = bottom;
m_marginLeft = left;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpInfoLayer* mpWindow::IsInsideInfoLayer( wxPoint& point )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
for( mpLayer* layer : m_layers )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( layer->IsInfo() )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
mpInfoLayer* tmpLyr = static_cast<mpInfoLayer*>( layer );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( tmpLyr->Inside( point ) )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return tmpLyr;
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
return nullptr;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::SetLayerVisible( const wxString& name, bool viewable )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpLayer* lx = GetLayerByName( name );
if( lx )
{
lx->SetVisible( viewable );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
bool mpWindow::IsLayerVisible( const wxString& name ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
const mpLayer* lx = GetLayerByName( name );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
return lx ? lx->IsVisible() : false;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpWindow::SetLayerVisible( const unsigned int position, bool viewable )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpLayer* lx = GetLayer( position );
if( lx )
{
lx->SetVisible( viewable );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
UpdateAll();
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
bool mpWindow::IsLayerVisible( unsigned int position ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpLayer* lx = GetLayer( position );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return (lx) ? lx->IsVisible() : false;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Cleanup (includes and formatting).
2021-08-03 16:53:30 +00:00
void mpWindow::SetColourTheme( const wxColour& bgColour, const wxColour& drawColour,
const wxColour& axesColour )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetBackgroundColour( bgColour );
SetForegroundColour( drawColour );
m_bgColour = bgColour;
m_fgColour = drawColour;
m_axColour = axesColour;
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
// Cycle between layers to set colours and properties to them
for( mpLayer* layer : m_layers )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( layer->GetLayerType() == mpLAYER_AXIS )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
wxPen axisPen = layer->GetPen(); // Get the old pen to modify only colour, not style or width
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
axisPen.SetColour( axesColour );
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
layer->SetPen( axisPen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( layer->GetLayerType() == mpLAYER_INFO )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
wxPen infoPen = layer->GetPen(); // Get the old pen to modify only colour, not style or width
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
infoPen.SetColour( drawColour );
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
layer->SetPen( infoPen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpFXYVector implementation - by Jose Luis Blanco (AGO-2007)
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_DYNAMIC_CLASS( mpFXYVector, mpFXY )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// Constructor
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpFXYVector::mpFXYVector( const wxString& name, int flags ) :
mpFXY( name, flags )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
m_index = 0;
m_minX = -1;
m_maxX = 1;
m_minY = -1;
m_maxY = 1;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_type = mpLAYER_PLOT;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
double mpScaleX::TransformToPlot( double x ) const
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
return (x + m_offset) * m_scale;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
double mpScaleX::TransformFromPlot( double xplot ) const
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
return xplot / m_scale - m_offset;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
double mpScaleY::TransformToPlot( double x ) const
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
mathplot: slave scale locking [wip]
2016-08-11 12:41:48 +00:00
return (x + m_offset) * m_scale;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
double mpScaleY::TransformFromPlot( double xplot ) const
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
return xplot / m_scale - m_offset;
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
double mpScaleXLog::TransformToPlot( double x ) const
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double xlogmin = log10( m_minV );
double xlogmax = log10( m_maxV );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
return ( log10( x ) - xlogmin) / (xlogmax - xlogmin);
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
double mpScaleXLog::TransformFromPlot( double xplot ) const
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double xlogmin = log10( m_minV );
double xlogmax = log10( m_maxV );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
return pow( 10.0, xplot * (xlogmax - xlogmin) + xlogmin );
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
simulator: working on magnitude/phase plots
2016-08-11 12:41:49 +00:00
#if 0
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
mpFSemiLogXVector::mpFSemiLogXVector( wxString name, int flags ) :
mpFXYVector( name, flags )
{
}
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_DYNAMIC_CLASS( mpFSemiLogXVector, mpFXYVector )
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
#endif // 0
mathplot: various improvements, added log scale [wip]
2016-08-11 12:41:48 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
void mpFXYVector::Rewind()
{
m_index = 0;
}
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
size_t mpFXYVector::GetCount() const
Eeschema: simulator: allow dotted traces for current and phase. ADD: Allow drawing of current and phase traces with dotted style for easier differentiation from voltage and magnitude. The option is available in the View menu of the simulator.
2019-11-19 16:17:37 +00:00
{
return m_xs.size();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
bool mpFXYVector::GetNextXY( double& x, double& y )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Spice simulator: faster graph rendering Graph rendering takes a lot of time, especially when there is a high number of points to be drawn. The initial implementation drew all points/lines even if the the coordinates were duplicates, in the new version duplicated coordinates are skipped. Fixes: lp:1674143 * https://bugs.launchpad.net/kicad/+bug/1674143
2018-10-04 20:33:32 +00:00
if( m_index >= m_xs.size() )
{
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
return false;
Spice simulator: faster graph rendering Graph rendering takes a lot of time, especially when there is a high number of points to be drawn. The initial implementation drew all points/lines even if the the coordinates were duplicates, in the new version duplicated coordinates are skipped. Fixes: lp:1674143 * https://bugs.launchpad.net/kicad/+bug/1674143
2018-10-04 20:33:32 +00:00
}
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
else
{
Spice simulator: faster graph rendering Graph rendering takes a lot of time, especially when there is a high number of points to be drawn. The initial implementation drew all points/lines even if the the coordinates were duplicates, in the new version duplicated coordinates are skipped. Fixes: lp:1674143 * https://bugs.launchpad.net/kicad/+bug/1674143
2018-10-04 20:33:32 +00:00
x = m_xs[m_index];
y = m_ys[m_index++];
return m_index <= m_xs.size();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
void mpFXYVector::Clear()
{
m_xs.clear();
m_ys.clear();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpFXYVector::SetData( const std::vector<double>& xs, const std::vector<double>& ys )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Fix some typos across the codebase
2021-04-05 13:24:57 +00:00
// Check if the data vectors are of the same size
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( xs.size() != ys.size() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Copy the data:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_xs = xs;
m_ys = ys;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Update internal variables for the bounding box.
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( xs.size() > 0 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
m_minX = xs[0];
m_maxX = xs[0];
m_minY = ys[0];
m_maxY = ys[0];
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
for( const double x : xs )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( x < m_minX )
m_minX = x;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( x > m_maxX )
m_maxX = x;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
for( const double y : ys )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( y < m_minY )
m_minY = y;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( y > m_maxY )
m_maxY = y;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
else
{
m_minX = -1;
m_maxX = 1;
m_minY = -1;
m_maxY = 1;
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpText - provided by Val Greene
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
IMPLEMENT_DYNAMIC_CLASS( mpText, mpLayer )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
/** @param name text to be displayed
* @param offsetx x position in percentage (0-100)
* @param offsetx y position in percentage (0-100)
*/
Fix unnecessary value parameter detected by clang-tidy. - Replace value parameter by const reference parameter or move-assignement in some cases
2017-09-23 09:20:10 +00:00
mpText::mpText( const wxString& name, int offsetx, int offsety )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
SetName( name );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( offsetx >= 0 && offsetx <= 100 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_offsetx = offsetx;
else
m_offsetx = 5;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( offsety >= 0 && offsety <= 100 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_offsety = offsety;
else
mathplot: fix a bug and remove unused variables ( it fixes a few compil warnings) from Coverity analysis. Uncrustify mathplot.h and fix a few coding style issues.
2016-11-28 13:18:22 +00:00
m_offsety = 50;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_type = mpLAYER_INFO;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
/** mpText Layer plot handler.
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
* This implementation will plot the text adjusted to the visible area.
*/
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpText::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
dc.SetPen( m_pen );
dc.SetFont( m_font );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord tw = 0, th = 0;
dc.GetTextExtent( GetName(), &tw, &th );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// int left = -dc.LogicalToDeviceX(0);
// int width = dc.LogicalToDeviceX(0) - left;
// int bottom = dc.LogicalToDeviceY(0);
// int height = bottom - -dc.LogicalToDeviceY(0);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
/* dc.DrawText( GetName(),
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
* (int)((((float)width/100.0) * m_offsety) + left - (tw/2)),
* (int)((((float)height/100.0) * m_offsetx) - bottom) );*/
int px = m_offsetx * ( w.GetScrX() - w.GetMarginLeft() - w.GetMarginRight() ) / 100;
int py = m_offsety * ( w.GetScrY() - w.GetMarginTop() - w.GetMarginBottom() ) / 100;
dc.DrawText( GetName(), px, py );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpPrintout - provided by Davide Rondini
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Formatting. (No functional changes.)
2023-03-19 22:01:47 +00:00
mpPrintout::mpPrintout( mpWindow* drawWindow, const wxChar* title ) :
wxPrintout( title )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
drawn = false;
plotWindow = drawWindow;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
bool mpPrintout::OnPrintPage( int page )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxDC* trgDc = GetDC();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (trgDc) && (page == 1) )
{
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord m_prnX, m_prnY;
int marginX = 50;
int marginY = 50;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
trgDc->GetSize( &m_prnX, &m_prnY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_prnX -= (2 * marginX);
m_prnY -= (2 * marginY);
trgDc->SetDeviceOrigin( marginX, marginY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Set the scale according to the page:
plotWindow->Fit(
plotWindow->GetDesiredXmin(),
plotWindow->GetDesiredXmax(),
plotWindow->GetDesiredYmin(),
plotWindow->GetDesiredYmax(),
&m_prnX,
&m_prnY );
// Get the colours of the plotWindow to restore them ath the end
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxColour oldBgColour = plotWindow->GetBackgroundColour();
wxColour oldFgColour = plotWindow->GetForegroundColour();
wxColour oldAxColour = plotWindow->GetAxesColour();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw background, ensuring to use white background for printing.
trgDc->SetPen( *wxTRANSPARENT_PEN );
// wxBrush brush( plotWindow->GetBackgroundColour() );
wxBrush brush = *wxWHITE_BRUSH;
trgDc->SetBrush( brush );
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
trgDc->DrawRectangle( 0, 0, m_prnX, m_prnY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Draw all the layers:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// trgDc->SetDeviceOrigin( m_prnX>>1, m_prnY>>1); // Origin at the center
mpLayer* layer;
for( unsigned int li = 0; li < plotWindow->CountAllLayers(); li++ )
{
layer = plotWindow->GetLayer( li );
layer->Plot( *trgDc, *plotWindow );
}
;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Restore device origin
// trgDc->SetDeviceOrigin(0, 0);
// Restore colours
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
plotWindow->SetColourTheme( oldBgColour, oldFgColour, oldAxColour );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Restore drawing
Try to prevent a crash in mpFXY::Plot Fixes sentry kicad-c0
2023-02-19 05:38:42 +00:00
plotWindow->Fit( plotWindow->GetDesiredXmin(), plotWindow->GetDesiredXmax(),
plotWindow->GetDesiredYmin(), plotWindow->GetDesiredYmax(), nullptr,
nullptr );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
plotWindow->UpdateAll();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
return true;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
bool mpPrintout::HasPage( int page )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
return page == 1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpMovableObject - provided by Jose Luis Blanco
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
void mpMovableObject::TranslatePoint( double x, double y, double& out_x, double& out_y )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double ccos = cos( m_reference_phi ); // Avoid computing cos/sin twice.
double csin = sin( m_reference_phi );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
out_x = m_reference_x + ccos * x - csin * y;
out_y = m_reference_y + csin * x + ccos * y;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// This method updates the buffers m_trans_shape_xs/ys, and the precomputed bounding box.
void mpMovableObject::ShapeUpdated()
{
// Just in case...
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( m_shape_xs.size() != m_shape_ys.size() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double ccos = cos( m_reference_phi ); // Avoid computing cos/sin twice.
double csin = sin( m_reference_phi );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_trans_shape_xs.resize( m_shape_xs.size() );
m_trans_shape_ys.resize( m_shape_xs.size() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
std::vector<double>::iterator itXi, itXo;
std::vector<double>::iterator itYi, itYo;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_bbox_min_x = 1e300;
m_bbox_max_x = -1e300;
m_bbox_min_y = 1e300;
m_bbox_max_y = -1e300;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
for( itXo = m_trans_shape_xs.begin(),
itYo = m_trans_shape_ys.begin(), itXi = m_shape_xs.begin(), itYi = m_shape_ys.begin();
itXo!=m_trans_shape_xs.end(); itXo++, itYo++, itXi++, itYi++ )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
*itXo = m_reference_x + ccos * (*itXi) - csin * (*itYi);
*itYo = m_reference_y + csin * (*itXi) + ccos * (*itYi);
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Keep BBox:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( *itXo < m_bbox_min_x )
m_bbox_min_x = *itXo;
if( *itXo > m_bbox_max_x )
m_bbox_max_x = *itXo;
if( *itYo < m_bbox_min_y )
m_bbox_min_y = *itYo;
if( *itYo > m_bbox_max_y )
m_bbox_max_y = *itYo;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpMovableObject::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible )
{
dc.SetPen( m_pen );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
std::vector<double>::iterator itX = m_trans_shape_xs.begin();
std::vector<double>::iterator itY = m_trans_shape_ys.begin();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_continuous )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// for some reason DrawPoint does not use the current pen,
// so we use DrawLine for fat pens
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_pen.GetWidth() <= 1 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
while( itX!=m_trans_shape_xs.end() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawPoint( w.x2p( *(itX++) ), w.y2p( *(itY++) ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
while( itX!=m_trans_shape_xs.end() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord cx = w.x2p( *(itX++) );
wxCoord cy = w.y2p( *(itY++) );
dc.DrawLine( cx, cy, cx, cy );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord cx0 = 0, cy0 = 0;
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
bool first = true;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
while( itX != m_trans_shape_xs.end() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord cx = w.x2p( *(itX++) );
wxCoord cy = w.y2p( *(itY++) );
if( first )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Simulator, plot panel: fix incorrect calculation of the vertical size of the traces when resizing the simulator frame
2016-11-28 14:37:00 +00:00
first = false;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
cx0 = cx; cy0 = cy;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawLine( cx0, cy0, cx, cy );
cx0 = cx; cy0 = cy;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_name.IsEmpty() && m_showName )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SetFont( m_font );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord tx, ty;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_name, &tx, &ty );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( HasBBox() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord sx = (wxCoord) ( ( m_bbox_max_x - w.GetPosX() ) * w.GetScaleX() );
wxCoord sy = (wxCoord) ( (w.GetPosY() - m_bbox_max_y ) * w.GetScaleY() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = sx - tx - 8;
ty = sy - 8 - ty;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const int sx = w.GetScrX() >> 1;
const int sy = w.GetScrY() >> 1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (m_flags & mpALIGNMASK) == mpALIGN_NE )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = sx - tx - 8;
ty = -sy + 8;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else if( (m_flags & mpALIGNMASK) == mpALIGN_NW )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = -sx + 8;
ty = -sy + 8;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else if( (m_flags & mpALIGNMASK) == mpALIGN_SW )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = -sx + 8;
ty = sy - 8 - ty;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = sx - tx - 8;
ty = sy - 8 - ty;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawText( m_name, tx, ty );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpCovarianceEllipse - provided by Jose Luis Blanco
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Called to update the m_shape_xs, m_shape_ys vectors, whenever a parameter changes.
void mpCovarianceEllipse::RecalculateShape()
{
m_shape_xs.clear();
m_shape_ys.clear();
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
// Preliminary checks:
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( m_quantiles < 0 )
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
return;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( m_cov_00 < 0 )
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
return;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( m_cov_11 < 0 )
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
return;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_shape_xs.resize( m_segments, 0 );
m_shape_ys.resize( m_segments, 0 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Compute the two eigenvalues of the covariance:
// -------------------------------------------------
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double b = -m_cov_00 - m_cov_11;
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
double c = m_cov_00 * m_cov_11 - m_cov_01 * m_cov_01;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double D = b * b - 4 * c;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( D < 0 )
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
return;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double eigenVal0 = 0.5 * ( -b + sqrt( D ) );
double eigenVal1 = 0.5 * ( -b - sqrt( D ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Compute the two corresponding eigenvectors:
// -------------------------------------------------
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double eigenVec0_x, eigenVec0_y;
double eigenVec1_x, eigenVec1_y;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( fabs( eigenVal0 - m_cov_00 ) > 1e-6 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
double k1x = m_cov_01 / ( eigenVal0 - m_cov_00 );
eigenVec0_y = 1;
eigenVec0_x = eigenVec0_y * k1x;
}
else
{
double k1y = m_cov_01 / ( eigenVal0 - m_cov_11 );
eigenVec0_x = 1;
eigenVec0_y = eigenVec0_x * k1y;
}
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( fabs( eigenVal1 - m_cov_00 ) > 1e-6 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
double k2x = m_cov_01 / ( eigenVal1 - m_cov_00 );
eigenVec1_y = 1;
eigenVec1_x = eigenVec1_y * k2x;
}
else
{
double k2y = m_cov_01 / ( eigenVal1 - m_cov_11 );
eigenVec1_x = 1;
eigenVec1_y = eigenVec1_x * k2y;
}
// Normalize the eigenvectors:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double len = sqrt( eigenVec0_x * eigenVec0_x + eigenVec0_y * eigenVec0_y );
eigenVec0_x /= len; // It *CANNOT* be zero
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
eigenVec0_y /= len;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
len = sqrt( eigenVec1_x * eigenVec1_x + eigenVec1_y * eigenVec1_y );
eigenVec1_x /= len; // It *CANNOT* be zero
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
eigenVec1_y /= len;
// Take the sqrt of the eigenvalues (required for the ellipse scale):
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
eigenVal0 = sqrt( eigenVal0 );
eigenVal1 = sqrt( eigenVal1 );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Compute the 2x2 matrix M = diag(eigVal) * (~eigVec) (each eigen vector is a row):
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double M_00 = eigenVec0_x * eigenVal0;
double M_01 = eigenVec0_y * eigenVal0;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double M_10 = eigenVec1_x * eigenVal1;
double M_11 = eigenVec1_y * eigenVal1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// The points of the 2D ellipse:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double ang;
double Aang = 6.283185308 / (m_segments - 1);
int i;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
for( i = 0, ang = 0; i < m_segments; i++, ang += Aang )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
{
double ccos = cos( ang );
double csin = sin( ang );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_shape_xs[i] = m_quantiles * (ccos * M_00 + csin * M_10 );
m_shape_ys[i] = m_quantiles * (ccos * M_01 + csin * M_11 );
} // end for points on ellipse
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
ShapeUpdated();
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpPolygon - provided by Jose Luis Blanco
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
void mpPolygon::setPoints( const std::vector<double>& points_xs,
const std::vector<double>& points_ys,
bool closedShape )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( points_xs.size() == points_ys.size() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_shape_xs = points_xs;
m_shape_ys = points_ys;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( closedShape && !points_xs.empty() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
m_shape_xs.push_back( points_xs[0] );
m_shape_ys.push_back( points_ys[0] );
}
ShapeUpdated();
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// mpBitmapLayer - provided by Jose Luis Blanco
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
// -----------------------------------------------------------------------------
void mpBitmapLayer::GetBitmapCopy( wxImage& outBmp ) const
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_validImg )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
outBmp = m_bitmap;
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpBitmapLayer::SetBitmap( const wxImage& inBmp, double x, double y, double lx, double ly )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
if( inBmp.Ok() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_bitmap = inBmp; // .GetSubBitmap( wxRect(0, 0, inBmp.GetWidth(), inBmp.GetHeight()));
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_min_x = x;
m_min_y = y;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_max_x = x + lx;
m_max_y = y + ly;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_validImg = true;
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpBitmapLayer::Plot( wxDC& dc, mpWindow& w )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_visible && m_validImg )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
/* 1st: We compute (x0,y0)-(x1,y1), the pixel coordinates of the real outer limits
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
* of the image rectangle within the (screen) mpWindow. Note that these coordinates
* might fall well far away from the real view limits when the user zoom in.
*
* 2nd: We compute (dx0,dy0)-(dx1,dy1), the pixel coordinates the rectangle that will
* be actually drawn into the mpWindow, i.e. the clipped real rectangle that
* avoids the non-visible parts. (offset_x,offset_y) are the pixel coordinates
* that correspond to the window point (dx0,dy0) within the image "m_bitmap", and
* (b_width,b_height) is the size of the bitmap patch that will be drawn.
*
* (x0,y0) ................. (x1,y0)
* . .
* . .
* (x0,y1) ................ (x1,y1)
* (In pixels!!)
*/
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// 1st step -------------------------------
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord x0 = w.x2p( m_min_x );
wxCoord y0 = w.y2p( m_max_y );
wxCoord x1 = w.x2p( m_max_x );
wxCoord y1 = w.y2p( m_min_y );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// 2nd step -------------------------------
// Precompute the size of the actual bitmap pixel on the screen (e.g. will be >1 if zoomed in)
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double screenPixelX = ( x1 - x0 ) / (double) m_bitmap.GetWidth();
double screenPixelY = ( y1 - y0 ) / (double) m_bitmap.GetHeight();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
Fix some typos across the codebase
2021-04-05 13:24:57 +00:00
// The minimum number of pixels that the stretched image will overpass the actual mpWindow borders:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord borderMarginX = (wxCoord) (screenPixelX + 1); // ceil
wxCoord borderMarginY = (wxCoord) (screenPixelY + 1); // ceil
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// The actual drawn rectangle (dx0,dy0)-(dx1,dy1) is (x0,y0)-(x1,y1) clipped:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord dx0 = x0, dx1 = x1, dy0 = y0, dy1 = y1;
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( dx0 < 0 )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dx0 = -borderMarginX;
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( dy0 < 0 )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dy0 = -borderMarginY;
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( dx1 > w.GetScrX() )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dx1 = w.GetScrX() + borderMarginX;
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( dy1 > w.GetScrY() )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dy1 = w.GetScrY() + borderMarginY;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// For convenience, compute the width/height of the rectangle to be actually drawn:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord d_width = dx1 - dx0 + 1;
wxCoord d_height = dy1 - dy0 + 1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Compute the pixel offsets in the internally stored bitmap:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord offset_x = (wxCoord) ( (dx0 - x0) / screenPixelX );
wxCoord offset_y = (wxCoord) ( (dy0 - y0) / screenPixelY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// and the size in pixel of the area to be actually drawn from the internally stored bitmap:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord b_width = (wxCoord) ( (dx1 - dx0 + 1) / screenPixelX );
wxCoord b_height = (wxCoord) ( (dy1 - dy0 + 1) / screenPixelY );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Is there any visible region?
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( d_width>0 && d_height>0 )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
// Build the scaled bitmap from the image, only if it has changed:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_scaledBitmap.GetWidth()!=d_width
|| m_scaledBitmap.GetHeight()!=d_height
|| m_scaledBitmap_offset_x != offset_x
|| m_scaledBitmap_offset_y != offset_y )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxRect r( wxRect( offset_x, offset_y, b_width, b_height ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
// Just for the case....
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( r.x < 0 )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
r.x = 0;
Added a lot of consts and refactored a few lines
2021-03-06 09:27:41 +00:00
if( r.y < 0 )
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
r.y = 0;
if( r.width>m_bitmap.GetWidth() )
r.width = m_bitmap.GetWidth();
if( r.height>m_bitmap.GetHeight() )
r.height = m_bitmap.GetHeight();
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_scaledBitmap = wxBitmap(
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxBitmap( m_bitmap ).GetSubBitmap( r ).ConvertToImage()
.Scale( d_width, d_height ) );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
m_scaledBitmap_offset_x = offset_x;
m_scaledBitmap_offset_y = offset_y;
}
// Draw it:
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawBitmap( m_scaledBitmap, dx0, dy0, true );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
// Draw the name label
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( !m_name.IsEmpty() && m_showName )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.SetFont( m_font );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
wxCoord tx, ty;
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.GetTextExtent( m_name, &tx, &ty );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( HasBBox() )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
wxCoord sx = (wxCoord) ( ( m_max_x - w.GetPosX() ) * w.GetScaleX() );
wxCoord sy = (wxCoord) ( (w.GetPosY() - m_max_y ) * w.GetScaleY() );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = sx - tx - 8;
ty = sy - 8 - ty;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
const int sx = w.GetScrX() >> 1;
const int sy = w.GetScrY() >> 1;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( (m_flags & mpALIGNMASK) == mpALIGN_NE )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = sx - tx - 8;
ty = -sy + 8;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else if( (m_flags & mpALIGNMASK) == mpALIGN_NW )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = -sx + 8;
ty = -sy + 8;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
else if( (m_flags & mpALIGNMASK) == mpALIGN_SW )
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = -sx + 8;
ty = sy - 8 - ty;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
else
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
tx = sx - tx - 8;
ty = sy - 8 - ty;
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
dc.DrawText( m_name, tx, ty );
Replaced sim plotting widget with wxMathPlot
2016-08-11 12:41:21 +00:00
}
}
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
void mpFXY::SetScale( mpScaleBase* scaleX, mpScaleBase* scaleY )
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
m_scaleX = scaleX;
m_scaleY = scaleY;
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
Reset scales when a plot is removed
2016-08-11 12:42:03 +00:00
UpdateScales();
}
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
Reset scales when a plot is removed
2016-08-11 12:42:03 +00:00
void mpFXY::UpdateScales()
{
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_scaleX )
m_scaleX->ExtendDataRange( GetMinX(), GetMaxX() );
Reset scales when a plot is removed
2016-08-11 12:42:03 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
if( m_scaleY )
m_scaleY->ExtendDataRange( GetMinY(), GetMaxY() );
mathplot: further improvements for simulator [wip]
2016-08-11 12:41:49 +00:00
}
Fixed cursors
2016-08-11 12:41:55 +00:00
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double mpFXY::s2x( double plotCoordX ) const
Fixed cursors
2016-08-11 12:41:55 +00:00
{
Nullptr safety.
2023-02-20 14:02:08 +00:00
return m_scaleX ? m_scaleX->TransformFromPlot( plotCoordX ) : plotCoordX;
Fixed cursors
2016-08-11 12:41:55 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double mpFXY::s2y( double plotCoordY ) const
Fixed cursors
2016-08-11 12:41:55 +00:00
{
Nullptr safety.
2023-02-20 14:02:08 +00:00
return m_scaleY ? m_scaleY->TransformFromPlot( plotCoordY ) : plotCoordY;
Fixed cursors
2016-08-11 12:41:55 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double mpFXY::x2s( double x ) const
Fixed cursors
2016-08-11 12:41:55 +00:00
{
Nullptr safety.
2023-02-20 14:02:08 +00:00
return m_scaleX ? m_scaleX->TransformToPlot( x ) : x;
Fixed cursors
2016-08-11 12:41:55 +00:00
}
uncrustify mathplot.cpp, make debug strings not translatable, and remove not compilable debug lines (due to changes in internal code). No actual change in code.
2016-08-12 08:10:33 +00:00
double mpFXY::y2s( double y ) const
Fixed cursors
2016-08-11 12:41:55 +00:00
{
Nullptr safety.
2023-02-20 14:02:08 +00:00
return m_scaleY ? m_scaleY->TransformToPlot( y ) : y;
Fixed cursors
2016-08-11 12:41:55 +00:00
}