diff -rupN kicad_testing/pcbnew//class_module.cpp find_and_mark_items/pcbnew//class_module.cpp
--- kicad_testing/pcbnew//class_module.cpp 2013-04-29 11:43:04 +0000
+++ find_and_mark_items/pcbnew//class_module.cpp 2013-04-29 22:42:26 +0000
@@ -359,6 +359,15 @@ void MODULE::Draw( EDA_DRAW_PANEL* aPane
m_Value->Draw( aPanel, aDC, aDrawMode, aOffset );
}
+ if (m_ModuleStatus & MODULE_is_MARKED)
+ {
+ CalculateBoundingBox();
+ wxPoint centre = this->GetPosition();
+ int radius = ( GetBoundingBox().GetHeight() + GetBoundingBox().GetWidth() ) / 2;
+ GRCircle( aPanel->GetClipBox(), aDC, centre.x, centre.y, radius, WHITE );
+ aDrawMode = GR_HIGHLIGHT;
+ }
+
for( BOARD_ITEM* item = m_Drawings; item; item = item->Next() )
{
if( item->IsMoving() )
diff -rupN kicad_testing/pcbnew//class_module.h find_and_mark_items/pcbnew//class_module.h
--- kicad_testing/pcbnew//class_module.h 2013-04-29 11:43:04 +0000
+++ find_and_mark_items/pcbnew//class_module.h 2013-04-29 19:58:24 +0000
@@ -185,6 +185,7 @@ public:
#define MODULE_is_LOCKED 0x01 ///< module LOCKED: no autoplace allowed
#define MODULE_is_PLACED 0x02 ///< In autoplace: module automatically placed
#define MODULE_to_PLACE 0x04 ///< In autoplace: module waiting for autoplace
+#define MODULE_is_MARKED 0x08
bool IsLocked() const
@@ -223,6 +224,15 @@ public:
m_ModuleStatus &= ~MODULE_to_PLACE;
}
+ bool IsMarked() const { return (m_ModuleStatus & MODULE_is_MARKED); }
+ void SetIsMarked( bool isMarked )
+ {
+ if( isMarked )
+ m_ModuleStatus |= MODULE_is_MARKED;
+ else
+ m_ModuleStatus &= ~MODULE_is_MARKED;
+ }
+
void SetLastEditTime( time_t aTime ) { m_LastEditTime = aTime; }
void SetLastEditTime( ) { m_LastEditTime = time( NULL ); }
time_t GetLastEditTime() const { return m_LastEditTime; }
diff -rupN kicad_testing/pcbnew//dialogs/dialog_find.cpp find_and_mark_items/pcbnew//dialogs/dialog_find.cpp
--- kicad_testing/pcbnew//dialogs/dialog_find.cpp 2013-04-29 11:43:04 +0000
+++ find_and_mark_items/pcbnew//dialogs/dialog_find.cpp 2013-04-29 22:29:56 +0000
@@ -48,14 +48,15 @@ public:
private:
PCB_BASE_FRAME* parent;
- int itemCount, markerCount;
+ int itemCount;
static wxString prevSearchString;
static bool warpMouse;
void onButtonFindItemClick( wxCommandEvent& event );
- void onButtonFindMarkerClick( wxCommandEvent& event );
void onButtonCloseClick( wxCommandEvent& event );
void onClose( wxCloseEvent& event );
+ void onButtonRemoveAllMarkersClick( wxCommandEvent& event );
+ void onButtonMarkAllMatchesClick( wxCommandEvent& aEvent );
};
@@ -74,7 +75,7 @@ DIALOG_FIND::DIALOG_FIND( PCB_BASE_FRAME
m_SearchTextCtrl->SetSelection( -1, -1 );
m_NoMouseWarpCheckBox->SetValue( !warpMouse );
- itemCount = markerCount = 0;
+ itemCount = 0;
Center();
}
@@ -86,6 +87,32 @@ void DIALOG_FIND::onButtonCloseClick( wx
}
+void DIALOG_FIND::onButtonMarkAllMatchesClick( wxCommandEvent& aEvent )
+{
+ PCB_SCREEN* screen = (PCB_SCREEN*) ( parent->GetScreen() );
+ wxPoint pos;
+ int count = 0;
+
+ wxString searchString = m_SearchTextCtrl->GetValue();
+ parent->GetCanvas()->GetViewStart( &screen->m_StartVisu.x, &screen->m_StartVisu.y );
+
+ for( MODULE* module = parent->GetBoard()->m_Modules; module; module = module->Next() )
+ {
+ if( WildCompareString( searchString, module->GetValue().GetData(), false ) )
+ {
+ count++;
+ module->SetIsMarked(true);
+ }
+ }
+
+ wxString msg;
+ msg.Printf(_( "Found %d modules" ), count );
+ parent->SetStatusText( msg );
+ parent->Zoom_Automatique(false);
+
+}
+
+
void DIALOG_FIND::onButtonFindItemClick( wxCommandEvent& aEvent )
{
PCB_SCREEN* screen = (PCB_SCREEN*) ( parent->GetScreen() );
@@ -125,16 +152,15 @@ void DIALOG_FIND::onButtonFindItemClick(
if( count > itemCount )
{
- foundItem = module;
pos = module->GetPosition();
itemCount++;
+ foundItem = module;
break;
}
}
}
wxString msg;
-
if( foundItem )
{
parent->SetCurItem( foundItem );
@@ -153,40 +179,6 @@ void DIALOG_FIND::onButtonFindItemClick(
}
-void DIALOG_FIND::onButtonFindMarkerClick( wxCommandEvent& aEvent )
-{
- PCB_SCREEN* screen = (PCB_SCREEN*) ( parent->GetScreen() );
- wxPoint pos;
- BOARD_ITEM* foundItem = 0;
-
- parent->GetCanvas()->GetViewStart( &screen->m_StartVisu.x, &screen->m_StartVisu.y );
-
- MARKER_PCB* marker = parent->GetBoard()->GetMARKER( markerCount++ );
-
- if( marker )
- {
- foundItem = marker;
- pos = marker->GetPosition();
- }
-
- wxString msg;
- if( foundItem )
- {
- parent->SetCurItem( foundItem );
- msg = _( "Marker found" );
- parent->SetStatusText( msg );
-
- parent->CursorGoto( pos, !m_NoMouseWarpCheckBox->IsChecked() );
- }
- else
- {
- parent->SetStatusText( wxEmptyString );
- msg = _( "No marker found" );
- DisplayError( this, msg, 10 );
- markerCount = 0;
- }
-}
-
void DIALOG_FIND::onClose( wxCloseEvent& aEvent )
{
@@ -195,7 +187,16 @@ void DIALOG_FIND::onClose( wxCloseEvent&
EndModal( 1 );
}
+void DIALOG_FIND::onButtonRemoveAllMarkersClick( wxCommandEvent& event )
+{
+ for( MODULE* module = parent->GetBoard()->m_Modules; module; module = module->Next() )
+ {
+ module->SetIsMarked(false);
+ }
+
+ parent->Zoom_Automatique(false);
+}
void PCB_EDIT_FRAME::InstallFindFrame()
{
DIALOG_FIND dlg( this );
diff -rupN kicad_testing/pcbnew//dialogs/dialog_find_base.cpp find_and_mark_items/pcbnew//dialogs/dialog_find_base.cpp
--- kicad_testing/pcbnew//dialogs/dialog_find_base.cpp 2013-04-29 11:43:04 +0000
+++ find_and_mark_items/pcbnew//dialogs/dialog_find_base.cpp 2013-04-29 22:09:41 +0000
@@ -14,60 +14,64 @@ DIALOG_FIND_BASE::DIALOG_FIND_BASE( wxWi
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bSizerMain;
- bSizerMain = new wxBoxSizer( wxHORIZONTAL );
-
- wxBoxSizer* bSizer3;
- bSizer3 = new wxBoxSizer( wxVERTICAL );
+ bSizerMain = new wxBoxSizer( wxVERTICAL );
m_staticText1 = new wxStaticText( this, wxID_ANY, _("Search for:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText1->Wrap( -1 );
- bSizer3->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+ bSizerMain->Add( m_staticText1, 0, wxALL, 5 );
+
+ wxBoxSizer* bSizer5;
+ bSizer5 = new wxBoxSizer( wxHORIZONTAL );
m_SearchTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
- bSizer3->Add( m_SearchTextCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+ bSizer5->Add( m_SearchTextCtrl, 1, wxEXPAND|wxALIGN_BOTTOM|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_NoMouseWarpCheckBox = new wxCheckBox( this, wxID_ANY, _("Do not warp mouse pointer"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer3->Add( m_NoMouseWarpCheckBox, 1, wxALL|wxEXPAND, 5 );
+ bSizer5->Add( m_NoMouseWarpCheckBox, 0, wxALL|wxEXPAND, 5 );
- bSizerMain->Add( bSizer3, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+ bSizerMain->Add( bSizer5, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
- wxBoxSizer* bSizer4;
- bSizer4 = new wxBoxSizer( wxVERTICAL );
+ wxBoxSizer* bSizerRight;
+ bSizerRight = new wxBoxSizer( wxHORIZONTAL );
m_button1 = new wxButton( this, wxID_ANY, _("Find Item"), wxDefaultPosition, wxDefaultSize, 0 );
m_button1->SetDefault();
- bSizer4->Add( m_button1, 1, wxALL|wxEXPAND, 5 );
+ bSizerRight->Add( m_button1, 1, wxALL|wxEXPAND, 5 );
+
+ m_button4 = new wxButton( this, wxID_ANY, _("Mark All Matches"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerRight->Add( m_button4, 1, wxALL|wxEXPAND, 5 );
- m_button2 = new wxButton( this, wxID_ANY, _("Find Marker"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer4->Add( m_button2, 1, wxALL|wxEXPAND, 5 );
+ m_button2 = new wxButton( this, wxID_ANY, _("Remove all Markers"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerRight->Add( m_button2, 1, wxALL|wxEXPAND, 5 );
m_button3 = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer4->Add( m_button3, 1, wxALL|wxEXPAND, 5 );
+ bSizerRight->Add( m_button3, 1, wxALL|wxEXPAND, 5 );
- bSizerMain->Add( bSizer4, 0, wxALL, 5 );
+ bSizerMain->Add( bSizerRight, 0, wxALL, 5 );
this->SetSizer( bSizerMain );
this->Layout();
- bSizerMain->Fit( this );
this->Centre( wxBOTH );
// Connect Events
- this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FIND_BASE::onClose ) );
+ this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FIND_BASE::onClose ) );this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FIND_BASE::onClose ) );
m_button1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonFindItemClick ), NULL, this );
- m_button2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonFindMarkerClick ), NULL, this );
+ m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonMarkAllMatchesClick ), NULL, this );
+ m_button2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonRemoveAllMarkersClick ), NULL, this );
m_button3->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonCloseClick ), NULL, this );
}
DIALOG_FIND_BASE::~DIALOG_FIND_BASE()
{
// Disconnect Events
- this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FIND_BASE::onClose ) );
+ this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FIND_BASE::onClose ) );this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FIND_BASE::onClose ) );
m_button1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonFindItemClick ), NULL, this );
- m_button2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonFindMarkerClick ), NULL, this );
+ m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonMarkAllMatchesClick ), NULL, this );
+ m_button2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonRemoveAllMarkersClick ), NULL, this );
m_button3->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FIND_BASE::onButtonCloseClick ), NULL, this );
}
diff -rupN kicad_testing/pcbnew//dialogs/dialog_find_base.fbp find_and_mark_items/pcbnew//dialogs/dialog_find_base.fbp
--- kicad_testing/pcbnew//dialogs/dialog_find_base.fbp 2013-04-29 11:43:04 +0000
+++ find_and_mark_items/pcbnew//dialogs/dialog_find_base.fbp 2013-04-29 22:00:25 +0000
@@ -25,8 +25,6 @@
0
0