← Back to branch summary

~pierre-parent-k/kicad/length-tunning

« back to all changes in this revision

Viewing changes to pcbnew/onrightclick.cpp

  • Committer: Pierre Parent
  • Date: 2014-07-06 10:32:13 UTC
  • mfrom: (4798.1.179 kicad)
  • Revision ID: pierre.parent@insa-rouen.fr-20140706103213-wjsdy0hc9q6wbz5v
Merge with lp:kicad 4977

Show diffs side-by-side

added added

removed removed

Lines of Context:
pcbnew/onrightclick.cpp
401
401
                              _( "Automatically Place Next Footprints" ) );
402
402
            commands->AppendSeparator();
403
403
            AddMenuItem( commands, ID_POPUP_PCB_REORIENT_ALL_MODULES,
404
 
                         _( "Orient All Footprints" ), KiBitmap( rotate_module_pos_xpm ) );
 
404
                         _( "Orient All Footprints" ), KiBitmap( rotate_module_cw_xpm ) );
405
405
            aPopMenu->AppendSeparator();
406
406
        }
407
407
 
450
450
    menu->AppendSeparator();
451
451
    AddMenuItem( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( checked_ok_xpm ) );
452
452
    AddMenuItem( menu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), KiBitmap( copyblock_xpm ) );
453
 
    AddMenuItem( menu, ID_POPUP_FLIP_BLOCK, _( "Flip Block" ), KiBitmap( invert_module_xpm ) );
 
453
    AddMenuItem( menu, ID_POPUP_FLIP_BLOCK, _( "Flip Block" ), KiBitmap( mirror_footprint_axisX_xpm ) );
454
454
    AddMenuItem( menu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block" ), KiBitmap( rotate_ccw_xpm ) );
455
455
    AddMenuItem( menu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), KiBitmap( delete_xpm ) );
456
456
}
464
464
    wxPoint  cursorPosition = GetCrossHairPosition();
465
465
    wxString msg;
466
466
 
467
 
    GetBoard()->SetCurrentNetClass( Track->GetNetClassName() );
 
467
    GetDesignSettings().SetCurrentNetClass( Track->GetNetClassName() );
468
468
    updateTraceWidthSelectBox();
469
469
    updateViaSizeSelectBox();
470
470
 
532
532
        AddMenuItem( PopMenu, ID_POPUP_PCB_SELECT_CU_LAYER_AND_PLACE_THROUGH_VIA,
533
533
                     msg, KiBitmap( select_w_layer_xpm ) );
534
534
 
535
 
        if( GetBoard()->GetDesignSettings().m_BlindBuriedViaAllowed )
 
535
        if( GetDesignSettings().m_BlindBuriedViaAllowed )
536
536
        {
537
537
            msg = AddHotkeyName( _( "Place Blind/Buried Via" ),
538
538
                                 g_Board_Editor_Hokeys_Descr, HK_ADD_BLIND_BURIED_VIA );
661
661
                    edge_zone->GetIsKeepout() ? _("Keepout Area") : _( "Zones" ),
662
662
                    KiBitmap( add_zone_xpm ) );
663
663
 
664
 
        if( edge_zone->HitTestForCorner( RefPos( true ) ) )
 
664
        if( edge_zone->HitTestForCorner( RefPos( true ) ) >= 0 )
665
665
        {
666
666
            AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_ZONE_CORNER,
667
667
                         _( "Move Corner" ), KiBitmap( move_xpm ) );
668
668
            AddMenuItem( zones_menu, ID_POPUP_PCB_DELETE_ZONE_CORNER,
669
669
                         _( "Delete Corner" ), KiBitmap( delete_xpm ) );
670
670
        }
671
 
        else if( edge_zone->HitTestForEdge( RefPos( true ) ) )
 
671
        else if( edge_zone->HitTestForEdge( RefPos( true ) ) >= 0 )
672
672
        {
673
673
            AddMenuItem( zones_menu, ID_POPUP_PCB_ADD_ZONE_CORNER,
674
674
                         _( "Create Corner" ), KiBitmap( add_corner_xpm ) );
746
746
 
747
747
    msg = AddHotkeyName( _( "Rotate +" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
748
748
    AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_ROTATE_MODULE_COUNTERCLOCKWISE,
749
 
                 msg, KiBitmap( rotate_module_pos_xpm ) );
 
749
                 msg, KiBitmap( rotate_module_ccw_xpm ) );
750
750
    AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_ROTATE_MODULE_CLOCKWISE,
751
 
                 _( "Rotate -" ), KiBitmap( rotate_module_neg_xpm ) );
 
751
                 _( "Rotate -" ), KiBitmap( rotate_module_cw_xpm ) );
752
752
    msg = AddHotkeyName( _( "Flip" ), g_Board_Editor_Hokeys_Descr, HK_FLIP_ITEM );
753
753
    AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_CHANGE_SIDE_MODULE,
754
 
                 msg, KiBitmap( invert_module_xpm ) );
 
754
                 msg, KiBitmap( mirror_footprint_axisX_xpm ) );
755
755
 
756
756
    if( !flags )
757
757
    {
834
834
    if( flags )     // Currently in edit, no others commands possible
835
835
        return;
836
836
 
837
 
    if( GetBoard()->GetCurrentNetClassName() != Pad->GetNetClassName() )
 
837
    if( GetDesignSettings().GetCurrentNetClassName() != Pad->GetNetClassName() )
838
838
    {
839
 
        GetBoard()->SetCurrentNetClass( Pad->GetNetClassName() );
 
839
        GetDesignSettings().SetCurrentNetClass( Pad->GetNetClassName() );
840
840
        updateTraceWidthSelectBox();
841
841
        updateViaSizeSelectBox();
842
842
    }
913
913
    msg = AddHotkeyName( _( "Rotate" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
914
914
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_ROTATE_TEXTEPCB, msg, KiBitmap( rotate_ccw_xpm ) );
915
915
    msg = AddHotkeyName( _( "Flip" ), g_Board_Editor_Hokeys_Descr, HK_FLIP_ITEM );
916
 
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_FLIP_TEXTEPCB, msg, KiBitmap( invert_module_xpm ) );
 
916
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_FLIP_TEXTEPCB, msg, KiBitmap( mirror_h_xpm ) );
917
917
    msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
918
918
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_EDIT_TEXTEPCB, msg, KiBitmap( edit_text_xpm ) );
919
919
    if( !flags )
957
957
    if( aBoard->GetDesignSettings().m_UseConnectedTrackWidth )
958
958
        trackwidth_menu->Check( ID_POPUP_PCB_SELECT_AUTO_WIDTH, true );
959
959
 
960
 
    if(  aBoard->GetViaSizeIndex() != 0
961
 
      || aBoard->GetTrackWidthIndex() != 0
 
960
    if(  aBoard->GetDesignSettings().GetViaSizeIndex() != 0
 
961
      || aBoard->GetDesignSettings().GetTrackWidthIndex() != 0
962
962
      || aBoard->GetDesignSettings().m_UseConnectedTrackWidth )
963
963
        trackwidth_menu->Append( ID_POPUP_PCB_SELECT_USE_NETCLASS_VALUES,
964
964
                                 _( "Use Netclass Values" ),
965
965
                                 _( "Use track and via sizes from their Netclass values" ),
966
966
                                 true );
967
967
 
968
 
    for( unsigned ii = 0; ii < aBoard->m_TrackWidthList.size(); ii++ )
 
968
    for( unsigned ii = 0; ii < aBoard->GetDesignSettings().m_TrackWidthList.size(); ii++ )
969
969
    {
970
 
        value = StringFromValue( g_UserUnit, aBoard->m_TrackWidthList[ii], true );
 
970
        value = StringFromValue( g_UserUnit, aBoard->GetDesignSettings().m_TrackWidthList[ii], true );
971
971
        msg.Printf( _( "Track %s" ), GetChars( value ) );
972
972
 
973
973
        if( ii == 0 )
978
978
 
979
979
    trackwidth_menu->AppendSeparator();
980
980
 
981
 
    for( unsigned ii = 0; ii < aBoard->m_ViasDimensionsList.size(); ii++ )
 
981
    for( unsigned ii = 0; ii < aBoard->GetDesignSettings().m_ViasDimensionsList.size(); ii++ )
982
982
    {
983
 
        value = StringFromValue( g_UserUnit, aBoard->m_ViasDimensionsList[ii].m_Diameter,
984
 
                                       true );
 
983
        value = StringFromValue( g_UserUnit,
 
984
                                 aBoard->GetDesignSettings().m_ViasDimensionsList[ii].m_Diameter,
 
985
                                 true );
985
986
        wxString drill = StringFromValue( g_UserUnit,
986
 
                                                aBoard->m_ViasDimensionsList[ii].m_Drill,
987
 
                                                true );
 
987
                                          aBoard->GetDesignSettings().m_ViasDimensionsList[ii].m_Drill,
 
988
                                          true );
988
989
 
989
 
        if( aBoard->m_ViasDimensionsList[ii].m_Drill <= 0 )
 
990
        if( aBoard->GetDesignSettings().m_ViasDimensionsList[ii].m_Drill <= 0 )
990
991
        {
991
992
            msg.Printf( _( "Via %s" ), GetChars( value ) );
992
993
        }