haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better cursor feedback for plot window.

This commit is contained in:
Jeff Young 2023-01-31 17:29:46 +00:00
parent 9a99106981
commit 39d35a8bec
6 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
common/widgets/mathplot.cpp
View File

@ -28,6 +28,7 @@
#include "wx/intl.h"
#include "wx/dcclient.h"
#include "wx/cursor.h"
#include "gal/cursors.h"
#endif
#include <widgets/mathplot.h>
@ -103,7 +104,8 @@ mpInfoLayer::mpInfoLayer()
}
mpInfoLayer::mpInfoLayer( wxRect rect, const wxBrush* brush ) : m_dim( rect )
mpInfoLayer::mpInfoLayer( wxRect rect, const wxBrush* brush ) :
m_dim( rect )
{
m_brush = *brush;
m_reference.x = rect.x;
@ -124,7 +126,7 @@ void mpInfoLayer::UpdateInfo( mpWindow& w, wxEvent& event )
}
bool mpInfoLayer::Inside( wxPoint& point )
bool mpInfoLayer::Inside( const wxPoint& point ) const
{
return m_dim.Contains( point );
}
@ -1812,8 +1814,12 @@ void mpWindow::OnMouseMove( wxMouseEvent& event )
return;
}
wxCursor cursor = wxCURSOR_MAGNIFIER;
if( event.m_middleDown )
{
cursor = wxCURSOR_ARROW;
// The change:
int Ax = m_mouseMClick.x - event.GetX();
int Ay = m_mouseMClick.y - event.GetY();
@ -1836,60 +1842,59 @@ void mpWindow::OnMouseMove( wxMouseEvent& event )
if( updateRequired )
UpdateAll();
}
else
else if( event.m_leftDown )
{
if( event.m_leftDown )
if( m_movingInfoLayer )
{
if( m_movingInfoLayer == NULL )
{
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;
}
else
{
wxPoint moveVector( event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y );
m_movingInfoLayer->Move( moveVector );
m_zooming = false;
}
cursor = wxCURSOR_SIZEWE;
UpdateAll();
wxPoint moveVector( event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y );
m_movingInfoLayer->Move( moveVector );
m_zooming = false;
}
else
{
#if 0
wxLayerList::iterator li;
cursor = wxCURSOR_MAGNIFIER;
for( li = m_layers.begin(); li != m_layers.end(); li++ )
{
if( (*li)->IsInfo() && (*li)->IsVisible() )
{
mpInfoLayer* tmpLyr = (mpInfoLayer*) (*li);
tmpLyr->UpdateInfo( *this, event );
// UpdateAll();
RefreshRect( tmpLyr->GetRectangle() );
}
}
#endif
/* 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);
*
* } */
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;
}
UpdateAll();
}
else
{
for( mpLayer* layer : m_layers)
{
if( layer->IsInfo() && layer->IsVisible() )
{
mpInfoLayer* infoLayer = (mpInfoLayer*) layer;
if( infoLayer->Inside( event.GetPosition() ) )
cursor = wxCURSOR_SIZEWE;
}
}
/* 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);
*
* } */
}
SetCursor( cursor );
event.Skip();
}

14
eeschema/sim/sim_plot_frame_base.cpp
View File

@ -114,11 +114,11 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
m_signalsGrid->SetMargins( 0, 0 );
// Columns
m_signalsGrid->SetColSize( 0, 196 );
m_signalsGrid->SetColSize( 1, 50 );
m_signalsGrid->SetColSize( 2, 50 );
m_signalsGrid->SetColSize( 3, 54 );
m_signalsGrid->SetColSize( 4, 54 );
m_signalsGrid->SetColSize( 0, 204 );
m_signalsGrid->SetColSize( 1, 45 );
m_signalsGrid->SetColSize( 2, 45 );
m_signalsGrid->SetColSize( 3, 55 );
m_signalsGrid->SetColSize( 4, 55 );
m_signalsGrid->EnableDragColMove( false );
m_signalsGrid->EnableDragColSize( true );
m_signalsGrid->SetColLabelValue( 0, _("Signal") );
@ -173,8 +173,8 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
// Columns
m_cursorsGrid->SetColSize( 0, 44 );
m_cursorsGrid->SetColSize( 1, 152 );
m_cursorsGrid->SetColSize( 2, 110 );
m_cursorsGrid->SetColSize( 3, 110 );
m_cursorsGrid->SetColSize( 2, 103 );
m_cursorsGrid->SetColSize( 3, 106 );
m_cursorsGrid->EnableDragColMove( false );
m_cursorsGrid->EnableDragColSize( true );
m_cursorsGrid->SetColLabelValue( 0, _("Cursor") );

4
eeschema/sim/sim_plot_frame_base.fbp
View File

@ -843,7 +843,7 @@
<property name="col_label_values">&quot;Signal&quot; &quot;Plot&quot; &quot;Color&quot; &quot;Cursor 1&quot; &quot;Cursor 2&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">5</property>
<property name="column_sizes">196,50,50,54,54</property>
<property name="column_sizes">204,45,45,55,55</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
@ -1110,7 +1110,7 @@
<property name="col_label_values">&quot;Cursor&quot; &quot;Signal&quot; &quot;Time&quot; &quot;Voltage / Current&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">4</property>
<property name="column_sizes">44,152,110,110</property>
<property name="column_sizes">44,152,103,106</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>

2
eeschema/sim/sim_plot_panel.cpp
View File

@ -353,7 +353,7 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
}
bool CURSOR::Inside( wxPoint& aPoint )
bool CURSOR::Inside( const wxPoint& aPoint ) const
{
if( !m_window )
return false;

2
eeschema/sim/sim_plot_panel.h
View File

@ -69,7 +69,7 @@ public:
m_updateRequired = true;
}
bool Inside( wxPoint& aPoint ) override;
bool Inside( const wxPoint& aPoint ) const override;
void Move( wxPoint aDelta ) override
{

2
include/widgets/mathplot.h
View File

@ -370,7 +370,7 @@ public:
/** Checks whether a point is inside the info box rectangle.
* @param point The point to be checked
* @return \a true if the point is inside the bounding box */
virtual bool Inside( wxPoint& point );
virtual bool Inside( const wxPoint& point ) const;
/** Moves the layer rectangle of given pixel deltas.
* @param delta The wxPoint container for delta coordinates along x and y. Units are in pixels. */