Loading 3d-viewer/3d_draw.cpp +292 −271 Original line number Original line Diff line number Diff line ////////////////////////////////////// ////////////////////////////////////// // Name: 3d_draw.cpp // Name: 3d_draw.cpp ////////////////////////////////////// ////////////////////////////////////// Loading Loading @@ -88,12 +89,14 @@ void Pcb3D_GLCanvas::Redraw( bool finish ) /**********************************************/ /**********************************************/ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() GLuint Pcb3D_GLCanvas::CreateDrawGL_List() /**********************************************/ /**********************************************/ /* Create the draw list items /* Create the draw list items */ */ { { WinEDA_BasePcbFrame* pcbframe = m_Parent->m_Parent; WinEDA_BasePcbFrame* pcbframe = m_Parent->m_Parent; BOARD* pcb = pcbframe->m_Pcb; BOARD* pcb = pcbframe->m_Pcb; TRACK* pt_piste; TRACK* track; SEGZONE* segzone; int ii; int ii; wxBusyCursor dummy; wxBusyCursor dummy; Loading Loading @@ -138,8 +141,9 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE ); glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE ); /* draw axes */ /* draw axis */ if (g_Parm_3D_Visu.m_Draw3DAxis){ if( g_Parm_3D_Visu.m_Draw3DAxis ) { glEnable( GL_COLOR_MATERIAL ); glEnable( GL_COLOR_MATERIAL ); SetGLColor( WHITE ); SetGLColor( WHITE ); glBegin( GL_LINES ); glBegin( GL_LINES ); Loading Loading @@ -187,51 +191,52 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() glEnd(); glEnd(); #endif #endif /* Translation du trac du BOARD pour placer son centre en 0, 0 */ /* move the board in order to draw it with its centre at 0,0 3D coordinates */ glTranslatef( -g_Parm_3D_Visu.m_BoardPos.x * g_Parm_3D_Visu.m_BoardScale, glTranslatef( -g_Parm_3D_Visu.m_BoardPos.x * g_Parm_3D_Visu.m_BoardScale, -g_Parm_3D_Visu.m_BoardPos.y * g_Parm_3D_Visu.m_BoardScale, -g_Parm_3D_Visu.m_BoardPos.y * g_Parm_3D_Visu.m_BoardScale, 0.0F ); 0.0F ); glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis /* Trac des pistes : */ /* draw tracks and vias : */ for( pt_piste = pcb->m_Track; pt_piste != NULL; pt_piste = (TRACK*) pt_piste->Pnext ) for( track = pcb->m_Track; track != NULL; track = track->Next() ) { { if( pt_piste->Type() == TYPEVIA ) if( track->Type() == TYPEVIA ) Draw3D_Via( (SEGVIA*) pt_piste ); Draw3D_Via( (SEGVIA*) track ); else else Draw3D_Track( pt_piste ); Draw3D_Track( track ); } } if (g_Parm_3D_Visu.m_Draw3DZone){ for( pt_piste = pcb->m_Zone; pt_piste != NULL; pt_piste = (TRACK*) pt_piste->Pnext ) if( g_Parm_3D_Visu.m_Draw3DZone ) { for( segzone = pcb->m_Zone; segzone != NULL; segzone = segzone->Next() ) { { if( pt_piste->Type() == TYPEZONE ) if( segzone->Type() == TYPEZONE ) Draw3D_Track( pt_piste ); Draw3D_Track( segzone ); } } } } /* Trac des edges */ /* draw graphic items */ EDA_BaseStruct* PtStruct; EDA_BaseStruct* PtStruct; for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Pnext ) for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Pnext ) { { //if( PtStruct->Type() != TYPEDRAWSEGMENT ) switch( PtStruct->Type() ) // continue; if( PtStruct->Type() == TYPEDRAWSEGMENT ) { { #undef STRUCT case TYPEDRAWSEGMENT: #define STRUCT ( (DRAWSEGMENT*) PtStruct ) Draw3D_DrawSegment( (DRAWSEGMENT*) PtStruct ); Draw3D_DrawSegment( STRUCT ); break; } if( PtStruct->Type() == TYPETEXTE ) case TYPETEXTE: { Draw3D_DrawText( (TEXTE_PCB*) PtStruct ); #undef STRUCT break; #define STRUCT ( (TEXTE_PCB*) PtStruct ) Draw3D_DrawText( STRUCT ); default: break; } } } } /* trac des modules */ /* draw footprints */ MODULE* Module = (MODULE*) pcb->m_Modules; MODULE* Module = pcb->m_Modules; for( ; Module != NULL; Module = (MODULE*) Module->Pnext ) for( ; Module != NULL; Module = Module->Next() ) { { Module->Draw3D( this ); Module->Draw3D( this ); } } Loading Loading @@ -304,18 +309,22 @@ void Pcb3D_GLCanvas::Draw3D_Via( SEGVIA* via ) color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N]; color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N]; if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); // SetGLColor( LIGHTGRAY ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; Draw3D_FilledCircle( x, -y, r, hole, zpos ); Draw3D_FilledCircle( x, -y, r, hole, zpos ); if( layer >= top_layer ) if( layer >= top_layer ) break; break; } } // Drawing hole: // Drawing hole: SetGLColor( DARKGRAY ); color = g_Parm_3D_Visu.m_BoardSettings->m_ViaColor[via->m_Shape]; SetGLColor( color ); height = g_Parm_3D_Visu.m_LayerZcoord[top_layer] - g_Parm_3D_Visu.m_LayerZcoord[bottom_layer]; height = g_Parm_3D_Visu.m_LayerZcoord[top_layer] - g_Parm_3D_Visu.m_LayerZcoord[bottom_layer]; Draw3D_FilledCylinder( x, -y, hole, height, g_Parm_3D_Visu.m_LayerZcoord[bottom_layer] ); Draw3D_FilledCylinder( x, -y, hole, height, g_Parm_3D_Visu.m_LayerZcoord[bottom_layer] ); } } Loading Loading @@ -346,14 +355,17 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment ) { { glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; switch( segment->m_Shape ) switch( segment->m_Shape ) { { case S_ARC: case S_ARC: Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); break; break; case S_CIRCLE: case S_CIRCLE: Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); break; break; default: default: Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); break; break; Loading @@ -372,9 +384,11 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment ) case S_ARC: case S_ARC: Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); break; break; case S_CIRCLE: case S_CIRCLE: Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); break; break; default: default: Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); break; break; Loading @@ -383,6 +397,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment ) } } } } /*************************************************************/ /*************************************************************/ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text ) void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text ) /*************************************************************/ /*************************************************************/ Loading Loading @@ -432,6 +447,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text ) } } } } /*********************************************/ /*********************************************/ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) /*********************************************/ /*********************************************/ Loading Loading @@ -462,14 +478,7 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) /* Draw module shape: 3D shape if exists (or module edge if not exists) */ /* Draw module shape: 3D shape if exists (or module edge if not exists) */ Struct3D_Master* Struct3D = m_3D_Drawings; Struct3D_Master* Struct3D = m_3D_Drawings; bool As3dShape = FALSE; bool As3dShape = FALSE; bool Place3D; if( g_Parm_3D_Visu.m_Draw3DModule ) if ( (Struct3D->m_Shape3DName.Find(wxString(wxT("placa"))) != -1) || (Struct3D->m_Shape3DName.Find(wxString(wxT("place"))) != -1) ) Place3D = TRUE; else Place3D = FALSE; if ( (g_Parm_3D_Visu.m_Draw3DModule && !Place3D) || (g_Parm_3D_Visu.m_Draw3DPlace && Place3D) ) { { glPushMatrix(); glPushMatrix(); glTranslatef( m_Pos.x * g_Parm_3D_Visu.m_BoardScale, glTranslatef( m_Pos.x * g_Parm_3D_Visu.m_BoardScale, Loading @@ -494,10 +503,11 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) Struct3D->ReadData(); Struct3D->ReadData(); } } } } glPopMatrix(); glPopMatrix(); } } if( !As3dShape ) if( !As3dShape ) // The footprint does not have a 3D shape, draw its 2D shape instead { { EDA_BaseStruct* Struct = m_Drawings; EDA_BaseStruct* Struct = m_Drawings; glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis Loading Loading @@ -642,12 +652,14 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer]; color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer]; if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; Draw3D_FilledCircle( x, -y, r, hole, zpos ); Draw3D_FilledCircle( x, -y, r, hole, zpos ); } } Loading Loading @@ -690,11 +702,13 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; Draw3D_FilledSegmentWithHole( ox, -oy, fx, -fy, w, drillx, -drilly, hole, zpos ); Draw3D_FilledSegmentWithHole( ox, -oy, fx, -fy, w, drillx, -drilly, hole, zpos ); } } } } Loading @@ -702,7 +716,6 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) case PAD_RECT: case PAD_RECT: // case SPECIAL_PAD: case PAD_TRAPEZOID: case PAD_TRAPEZOID: { { int ddx, ddy; int ddx, ddy; Loading Loading @@ -764,11 +777,13 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; glBegin( GL_QUAD_STRIP ); glBegin( GL_QUAD_STRIP ); for( ii = 0; ii < 8; ii++ ) for( ii = 0; ii < 8; ii++ ) { { Loading Loading @@ -1003,6 +1018,7 @@ static void Draw3D_FilledSegmentWithHole( double startx, glEnd(); glEnd(); } } /********************************************************/ /********************************************************/ static void Draw3D_ArcSegment( double startx, double starty, static void Draw3D_ArcSegment( double startx, double starty, double endx, double endy, double width, double zpos ) double endx, double endy, double width, double zpos ) Loading @@ -1025,9 +1041,11 @@ int angle; RotatePoint( &x, &y, angle + (ii * 3600 / slice) ); RotatePoint( &x, &y, angle + (ii * 3600 / slice) ); glVertex3f( x + startx, y + starty, zpos ); glVertex3f( x + startx, y + starty, zpos ); } } glEnd(); glEnd(); } } /*******************************************************************/ /*******************************************************************/ static void Draw3D_CircleSegment( double startx, double starty, static void Draw3D_CircleSegment( double startx, double starty, double endx, double endy, double width, double zpos ) double endx, double endy, double width, double zpos ) Loading @@ -1049,9 +1067,11 @@ double x, y, hole, rayon; RotatePoint( &x, &y, ii * 3600 / slice ); RotatePoint( &x, &y, ii * 3600 / slice ); glVertex3f( x + startx, y + starty, zpos ); glVertex3f( x + startx, y + starty, zpos ); } } glEnd(); glEnd(); } } /******************************************/ /******************************************/ static int Get3DLayerEnable( int act_layer ) static int Get3DLayerEnable( int act_layer ) /******************************************/ /******************************************/ Loading @@ -1071,20 +1091,21 @@ static int Get3DLayerEnable(int act_layer) return enablelayer; return enablelayer; } } /******************************************/ /******************************************/ static GLfloat Get3DLayerSide( int act_layer ) static GLfloat Get3DLayerSide( int act_layer ) /******************************************/ /******************************************/ { { GLfloat nZ; GLfloat nZ; nZ = 1.0; nZ = 1.0; if( if( (act_layer <= LAST_COPPER_LAYER-1) || (act_layer <= LAST_COPPER_LAYER - 1) (act_layer == ADHESIVE_N_CU) || || (act_layer == ADHESIVE_N_CU) (act_layer == SOLDERPASTE_N_CU) || || (act_layer == SOLDERPASTE_N_CU) (act_layer == SILKSCREEN_N_CU) || || (act_layer == SILKSCREEN_N_CU) (act_layer == SOLDERMASK_N_CU) || (act_layer == SOLDERMASK_N_CU) ) ) nZ = -1.0; nZ = -1.0; return nZ; return nZ; } } 3d-viewer/3d_toolbar.cpp +19 −8 Original line number Original line Diff line number Diff line Loading @@ -103,6 +103,12 @@ void WinEDA3D_DrawFrame::ReCreateVToolbar() void WinEDA3D_DrawFrame::ReCreateMenuBar() void WinEDA3D_DrawFrame::ReCreateMenuBar() /**********************************************/ /**********************************************/ { { bool full_options = true; // If called from the display frame of cvpcb, only some options are relevant if ( m_Parent->m_FrameName == wxT( "CmpFrame" ) ) // Called from cvpcb ! full_options = false; // Do not display all options wxMenuBar* menuBar = new wxMenuBar; wxMenuBar* menuBar = new wxMenuBar; wxMenu* fileMenu = new wxMenu; wxMenu* fileMenu = new wxMenu; Loading @@ -121,28 +127,33 @@ void WinEDA3D_DrawFrame::ReCreateMenuBar() _( "Choose background color" ), palette_xpm ); _( "Choose background color" ), palette_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_AXIS_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_AXIS_ONOFF, _( "Axis On/Off" ), axis3d_front_xpm ); _( "3D Axis On/Off" ), axis3d_front_xpm ); if ( full_options ) { ADD_MENUITEM( referencesMenu, ID_MENU3D_MODULE_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_MODULE_ONOFF, _( "Module 3D On/Off" ), add_component_xpm ); _( "3D Footprints Shapes On/Off" ), add_component_xpm ); #if 0 ADD_MENUITEM( referencesMenu, ID_MENU3D_PLACE_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_PLACE_ONOFF, _( "PCB place 3D On/off" ), select_w_layer_xpm ); _( "PCB place 3D On/off" ), select_w_layer_xpm ); #endif ADD_MENUITEM( referencesMenu, ID_MENU3D_ZONE_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_ZONE_ONOFF, _( "Zone On/Off" ), add_zone_xpm ); _( "Zone Filling On/Off" ), add_zone_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_COMMENTS_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_COMMENTS_ONOFF, _( "Comments On/Off" ), edit_sheet_xpm ); _( "Comments Layer On/Off" ), edit_sheet_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_DRAWINGS_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_DRAWINGS_ONOFF, _( "Drawings On/Off" ), options_text_xpm ); _( "Drawings Layer On/Off" ), add_polygon_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO1_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO1_ONOFF, _( "Eco1 On/Off" ), options_text_xpm ); _( "Eco1 Layer On/Off" ), tools_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO2_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO2_ONOFF, _( "Eco2 On/Off" ), options_text_xpm ); _( "Eco2 Layer On/Off" ), tools_xpm ); } SetMenuBar( menuBar ); SetMenuBar( menuBar ); } } Loading common/about_kicad.cpp +6 −6 Original line number Original line Diff line number Diff line Loading @@ -44,17 +44,17 @@ void InitKiCadAbout(wxAboutDialogInfo& info) /* Add developers */ /* Add developers */ info.AddDeveloper(_T("Dick Hollenbeck <dick@softplc.com>")); info.AddDeveloper(_T("Dick Hollenbeck <dick@softplc.com>")); info.AddDeveloper(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDeveloper(_T("\nJean-Pierre Charras <jean-pierre.charras@inpg.fr>")); /* Add document writers */ /* Add document writers */ info.AddDocWriter(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDocWriter(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDocWriter(_T("Igor Plyatov <plyatov@gmail.com>")); info.AddDocWriter(_T("\nIgor Plyatov <plyatov@gmail.com>")); /* Add translators */ /* Add translators */ info.AddTranslator(_T("Czech (CZ) Milan Horák <stranger@tiscali.cz>")); info.AddTranslator(_T("Czech (CZ) Milan Horák <stranger@tiscali.cz>")); info.AddTranslator(_T("Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>")); info.AddTranslator(_T("\nDutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>")); info.AddTranslator(_T("French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddTranslator(_T("\nFrench (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddTranslator(_T("Polish (PL) Mateusz Skowroński <skowri@gmail.com>")); info.AddTranslator(_T("\nPolish (PL) Mateusz Skowroński <skowri@gmail.com>")); info.AddTranslator(_T("Russian (RU) Igor Plyatov <plyatov@gmail.com>")); info.AddTranslator(_T("\nRussian (RU) Igor Plyatov <plyatov@gmail.com>")); } } eeschema/controle.cpp +6 −0 Original line number Original line Diff line number Diff line Loading @@ -226,6 +226,8 @@ void WinEDA_SchematicFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPi wxPoint curpos, oldpos; wxPoint curpos, oldpos; int hotkey = 0; int hotkey = 0; ActiveScreen = screen; curpos = screen->m_MousePosition; curpos = screen->m_MousePosition; oldpos = screen->m_Curseur; oldpos = screen->m_Curseur; Loading Loading @@ -355,6 +357,8 @@ void WinEDA_LibeditFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPixe wxPoint curpos, oldpos; wxPoint curpos, oldpos; int hotkey = 0; int hotkey = 0; ActiveScreen = screen; curpos = screen->m_MousePosition; curpos = screen->m_MousePosition; oldpos = screen->m_Curseur; oldpos = screen->m_Curseur; Loading Loading @@ -483,6 +487,8 @@ void WinEDA_ViewlibFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPixe wxPoint curpos, oldpos; wxPoint curpos, oldpos; int hotkey = 0; int hotkey = 0; ActiveScreen = screen; curpos = screen->m_MousePosition; curpos = screen->m_MousePosition; oldpos = screen->m_Curseur; oldpos = screen->m_Curseur; Loading eeschema/libedit_onleftclick.cpp +3 −3 Original line number Original line Diff line number Diff line Loading @@ -25,7 +25,7 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) { { LibEDA_BaseStruct* DrawEntry = CurrentDrawItem; LibEDA_BaseStruct* DrawEntry = CurrentDrawItem; if( CurrentLibEntry == NULL ) if( CurrentLibEntry == NULL ) // No component loaded ! return; return; if( m_ID_current_state == 0 ) if( m_ID_current_state == 0 ) Loading Loading @@ -107,11 +107,11 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) case ID_LIBEDIT_BODY_CIRCLE_BUTT: case ID_LIBEDIT_BODY_CIRCLE_BUTT: case ID_LIBEDIT_BODY_RECT_BUTT: case ID_LIBEDIT_BODY_RECT_BUTT: case ID_LIBEDIT_BODY_TEXT_BUTT: case ID_LIBEDIT_BODY_TEXT_BUTT: if( CurrentDrawItem == NULL ) if( CurrentDrawItem == NULL || CurrentDrawItem->m_Flags == 0 ) { { CurrentDrawItem = CreateGraphicItem( DC ); CurrentDrawItem = CreateGraphicItem( DC ); } } else else if( CurrentDrawItem ) { { if( CurrentDrawItem->m_Flags & IS_NEW ) if( CurrentDrawItem->m_Flags & IS_NEW ) GraphicItemBeginDraw( DC ); GraphicItemBeginDraw( DC ); Loading Loading
3d-viewer/3d_draw.cpp +292 −271 Original line number Original line Diff line number Diff line ////////////////////////////////////// ////////////////////////////////////// // Name: 3d_draw.cpp // Name: 3d_draw.cpp ////////////////////////////////////// ////////////////////////////////////// Loading Loading @@ -88,12 +89,14 @@ void Pcb3D_GLCanvas::Redraw( bool finish ) /**********************************************/ /**********************************************/ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() GLuint Pcb3D_GLCanvas::CreateDrawGL_List() /**********************************************/ /**********************************************/ /* Create the draw list items /* Create the draw list items */ */ { { WinEDA_BasePcbFrame* pcbframe = m_Parent->m_Parent; WinEDA_BasePcbFrame* pcbframe = m_Parent->m_Parent; BOARD* pcb = pcbframe->m_Pcb; BOARD* pcb = pcbframe->m_Pcb; TRACK* pt_piste; TRACK* track; SEGZONE* segzone; int ii; int ii; wxBusyCursor dummy; wxBusyCursor dummy; Loading Loading @@ -138,8 +141,9 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE ); glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE ); /* draw axes */ /* draw axis */ if (g_Parm_3D_Visu.m_Draw3DAxis){ if( g_Parm_3D_Visu.m_Draw3DAxis ) { glEnable( GL_COLOR_MATERIAL ); glEnable( GL_COLOR_MATERIAL ); SetGLColor( WHITE ); SetGLColor( WHITE ); glBegin( GL_LINES ); glBegin( GL_LINES ); Loading Loading @@ -187,51 +191,52 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() glEnd(); glEnd(); #endif #endif /* Translation du trac du BOARD pour placer son centre en 0, 0 */ /* move the board in order to draw it with its centre at 0,0 3D coordinates */ glTranslatef( -g_Parm_3D_Visu.m_BoardPos.x * g_Parm_3D_Visu.m_BoardScale, glTranslatef( -g_Parm_3D_Visu.m_BoardPos.x * g_Parm_3D_Visu.m_BoardScale, -g_Parm_3D_Visu.m_BoardPos.y * g_Parm_3D_Visu.m_BoardScale, -g_Parm_3D_Visu.m_BoardPos.y * g_Parm_3D_Visu.m_BoardScale, 0.0F ); 0.0F ); glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis /* Trac des pistes : */ /* draw tracks and vias : */ for( pt_piste = pcb->m_Track; pt_piste != NULL; pt_piste = (TRACK*) pt_piste->Pnext ) for( track = pcb->m_Track; track != NULL; track = track->Next() ) { { if( pt_piste->Type() == TYPEVIA ) if( track->Type() == TYPEVIA ) Draw3D_Via( (SEGVIA*) pt_piste ); Draw3D_Via( (SEGVIA*) track ); else else Draw3D_Track( pt_piste ); Draw3D_Track( track ); } } if (g_Parm_3D_Visu.m_Draw3DZone){ for( pt_piste = pcb->m_Zone; pt_piste != NULL; pt_piste = (TRACK*) pt_piste->Pnext ) if( g_Parm_3D_Visu.m_Draw3DZone ) { for( segzone = pcb->m_Zone; segzone != NULL; segzone = segzone->Next() ) { { if( pt_piste->Type() == TYPEZONE ) if( segzone->Type() == TYPEZONE ) Draw3D_Track( pt_piste ); Draw3D_Track( segzone ); } } } } /* Trac des edges */ /* draw graphic items */ EDA_BaseStruct* PtStruct; EDA_BaseStruct* PtStruct; for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Pnext ) for( PtStruct = pcb->m_Drawings; PtStruct != NULL; PtStruct = PtStruct->Pnext ) { { //if( PtStruct->Type() != TYPEDRAWSEGMENT ) switch( PtStruct->Type() ) // continue; if( PtStruct->Type() == TYPEDRAWSEGMENT ) { { #undef STRUCT case TYPEDRAWSEGMENT: #define STRUCT ( (DRAWSEGMENT*) PtStruct ) Draw3D_DrawSegment( (DRAWSEGMENT*) PtStruct ); Draw3D_DrawSegment( STRUCT ); break; } if( PtStruct->Type() == TYPETEXTE ) case TYPETEXTE: { Draw3D_DrawText( (TEXTE_PCB*) PtStruct ); #undef STRUCT break; #define STRUCT ( (TEXTE_PCB*) PtStruct ) Draw3D_DrawText( STRUCT ); default: break; } } } } /* trac des modules */ /* draw footprints */ MODULE* Module = (MODULE*) pcb->m_Modules; MODULE* Module = pcb->m_Modules; for( ; Module != NULL; Module = (MODULE*) Module->Pnext ) for( ; Module != NULL; Module = Module->Next() ) { { Module->Draw3D( this ); Module->Draw3D( this ); } } Loading Loading @@ -304,18 +309,22 @@ void Pcb3D_GLCanvas::Draw3D_Via( SEGVIA* via ) color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N]; color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[CMP_N]; if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); // SetGLColor( LIGHTGRAY ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; Draw3D_FilledCircle( x, -y, r, hole, zpos ); Draw3D_FilledCircle( x, -y, r, hole, zpos ); if( layer >= top_layer ) if( layer >= top_layer ) break; break; } } // Drawing hole: // Drawing hole: SetGLColor( DARKGRAY ); color = g_Parm_3D_Visu.m_BoardSettings->m_ViaColor[via->m_Shape]; SetGLColor( color ); height = g_Parm_3D_Visu.m_LayerZcoord[top_layer] - g_Parm_3D_Visu.m_LayerZcoord[bottom_layer]; height = g_Parm_3D_Visu.m_LayerZcoord[top_layer] - g_Parm_3D_Visu.m_LayerZcoord[bottom_layer]; Draw3D_FilledCylinder( x, -y, hole, height, g_Parm_3D_Visu.m_LayerZcoord[bottom_layer] ); Draw3D_FilledCylinder( x, -y, hole, height, g_Parm_3D_Visu.m_LayerZcoord[bottom_layer] ); } } Loading Loading @@ -346,14 +355,17 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment ) { { glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; switch( segment->m_Shape ) switch( segment->m_Shape ) { { case S_ARC: case S_ARC: Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); break; break; case S_CIRCLE: case S_CIRCLE: Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); break; break; default: default: Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); break; break; Loading @@ -372,9 +384,11 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment ) case S_ARC: case S_ARC: Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos ); break; break; case S_CIRCLE: case S_CIRCLE: Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); Draw3D_CircleSegment( x, -y, xf, -yf, w, zpos ); break; break; default: default: Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); Draw3D_FilledSegment( x, -y, xf, -yf, w, zpos ); break; break; Loading @@ -383,6 +397,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawSegment( DRAWSEGMENT* segment ) } } } } /*************************************************************/ /*************************************************************/ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text ) void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text ) /*************************************************************/ /*************************************************************/ Loading Loading @@ -432,6 +447,7 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text ) } } } } /*********************************************/ /*********************************************/ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) /*********************************************/ /*********************************************/ Loading Loading @@ -462,14 +478,7 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) /* Draw module shape: 3D shape if exists (or module edge if not exists) */ /* Draw module shape: 3D shape if exists (or module edge if not exists) */ Struct3D_Master* Struct3D = m_3D_Drawings; Struct3D_Master* Struct3D = m_3D_Drawings; bool As3dShape = FALSE; bool As3dShape = FALSE; bool Place3D; if( g_Parm_3D_Visu.m_Draw3DModule ) if ( (Struct3D->m_Shape3DName.Find(wxString(wxT("placa"))) != -1) || (Struct3D->m_Shape3DName.Find(wxString(wxT("place"))) != -1) ) Place3D = TRUE; else Place3D = FALSE; if ( (g_Parm_3D_Visu.m_Draw3DModule && !Place3D) || (g_Parm_3D_Visu.m_Draw3DPlace && Place3D) ) { { glPushMatrix(); glPushMatrix(); glTranslatef( m_Pos.x * g_Parm_3D_Visu.m_BoardScale, glTranslatef( m_Pos.x * g_Parm_3D_Visu.m_BoardScale, Loading @@ -494,10 +503,11 @@ void MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas ) Struct3D->ReadData(); Struct3D->ReadData(); } } } } glPopMatrix(); glPopMatrix(); } } if( !As3dShape ) if( !As3dShape ) // The footprint does not have a 3D shape, draw its 2D shape instead { { EDA_BaseStruct* Struct = m_Drawings; EDA_BaseStruct* Struct = m_Drawings; glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis Loading Loading @@ -642,12 +652,14 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer]; color = g_Parm_3D_Visu.m_BoardSettings->m_LayerColor[layer]; if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; Draw3D_FilledCircle( x, -y, r, hole, zpos ); Draw3D_FilledCircle( x, -y, r, hole, zpos ); } } Loading Loading @@ -690,11 +702,13 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; Draw3D_FilledSegmentWithHole( ox, -oy, fx, -fy, w, drillx, -drilly, hole, zpos ); Draw3D_FilledSegmentWithHole( ox, -oy, fx, -fy, w, drillx, -drilly, hole, zpos ); } } } } Loading @@ -702,7 +716,6 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) case PAD_RECT: case PAD_RECT: // case SPECIAL_PAD: case PAD_TRAPEZOID: case PAD_TRAPEZOID: { { int ddx, ddy; int ddx, ddy; Loading Loading @@ -764,11 +777,13 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); glNormal3f( 0.0, 0.0, (layer == COPPER_LAYER_N) ? -1.0 : 1.0 ); if( color & ITEM_NOT_SHOW ) if( color & ITEM_NOT_SHOW ) continue; continue; //SetGLColor( color ); SetGLColor( LIGHTGRAY ); SetGLColor( color ); zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; zpos = g_Parm_3D_Visu.m_LayerZcoord[layer]; if (layer == COPPER_LAYER_N) zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; if( layer == COPPER_LAYER_N ) else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; zpos = zpos - 5 * g_Parm_3D_Visu.m_BoardScale; else zpos = zpos + 5 * g_Parm_3D_Visu.m_BoardScale; glBegin( GL_QUAD_STRIP ); glBegin( GL_QUAD_STRIP ); for( ii = 0; ii < 8; ii++ ) for( ii = 0; ii < 8; ii++ ) { { Loading Loading @@ -1003,6 +1018,7 @@ static void Draw3D_FilledSegmentWithHole( double startx, glEnd(); glEnd(); } } /********************************************************/ /********************************************************/ static void Draw3D_ArcSegment( double startx, double starty, static void Draw3D_ArcSegment( double startx, double starty, double endx, double endy, double width, double zpos ) double endx, double endy, double width, double zpos ) Loading @@ -1025,9 +1041,11 @@ int angle; RotatePoint( &x, &y, angle + (ii * 3600 / slice) ); RotatePoint( &x, &y, angle + (ii * 3600 / slice) ); glVertex3f( x + startx, y + starty, zpos ); glVertex3f( x + startx, y + starty, zpos ); } } glEnd(); glEnd(); } } /*******************************************************************/ /*******************************************************************/ static void Draw3D_CircleSegment( double startx, double starty, static void Draw3D_CircleSegment( double startx, double starty, double endx, double endy, double width, double zpos ) double endx, double endy, double width, double zpos ) Loading @@ -1049,9 +1067,11 @@ double x, y, hole, rayon; RotatePoint( &x, &y, ii * 3600 / slice ); RotatePoint( &x, &y, ii * 3600 / slice ); glVertex3f( x + startx, y + starty, zpos ); glVertex3f( x + startx, y + starty, zpos ); } } glEnd(); glEnd(); } } /******************************************/ /******************************************/ static int Get3DLayerEnable( int act_layer ) static int Get3DLayerEnable( int act_layer ) /******************************************/ /******************************************/ Loading @@ -1071,20 +1091,21 @@ static int Get3DLayerEnable(int act_layer) return enablelayer; return enablelayer; } } /******************************************/ /******************************************/ static GLfloat Get3DLayerSide( int act_layer ) static GLfloat Get3DLayerSide( int act_layer ) /******************************************/ /******************************************/ { { GLfloat nZ; GLfloat nZ; nZ = 1.0; nZ = 1.0; if( if( (act_layer <= LAST_COPPER_LAYER-1) || (act_layer <= LAST_COPPER_LAYER - 1) (act_layer == ADHESIVE_N_CU) || || (act_layer == ADHESIVE_N_CU) (act_layer == SOLDERPASTE_N_CU) || || (act_layer == SOLDERPASTE_N_CU) (act_layer == SILKSCREEN_N_CU) || || (act_layer == SILKSCREEN_N_CU) (act_layer == SOLDERMASK_N_CU) || (act_layer == SOLDERMASK_N_CU) ) ) nZ = -1.0; nZ = -1.0; return nZ; return nZ; } }
3d-viewer/3d_toolbar.cpp +19 −8 Original line number Original line Diff line number Diff line Loading @@ -103,6 +103,12 @@ void WinEDA3D_DrawFrame::ReCreateVToolbar() void WinEDA3D_DrawFrame::ReCreateMenuBar() void WinEDA3D_DrawFrame::ReCreateMenuBar() /**********************************************/ /**********************************************/ { { bool full_options = true; // If called from the display frame of cvpcb, only some options are relevant if ( m_Parent->m_FrameName == wxT( "CmpFrame" ) ) // Called from cvpcb ! full_options = false; // Do not display all options wxMenuBar* menuBar = new wxMenuBar; wxMenuBar* menuBar = new wxMenuBar; wxMenu* fileMenu = new wxMenu; wxMenu* fileMenu = new wxMenu; Loading @@ -121,28 +127,33 @@ void WinEDA3D_DrawFrame::ReCreateMenuBar() _( "Choose background color" ), palette_xpm ); _( "Choose background color" ), palette_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_AXIS_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_AXIS_ONOFF, _( "Axis On/Off" ), axis3d_front_xpm ); _( "3D Axis On/Off" ), axis3d_front_xpm ); if ( full_options ) { ADD_MENUITEM( referencesMenu, ID_MENU3D_MODULE_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_MODULE_ONOFF, _( "Module 3D On/Off" ), add_component_xpm ); _( "3D Footprints Shapes On/Off" ), add_component_xpm ); #if 0 ADD_MENUITEM( referencesMenu, ID_MENU3D_PLACE_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_PLACE_ONOFF, _( "PCB place 3D On/off" ), select_w_layer_xpm ); _( "PCB place 3D On/off" ), select_w_layer_xpm ); #endif ADD_MENUITEM( referencesMenu, ID_MENU3D_ZONE_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_ZONE_ONOFF, _( "Zone On/Off" ), add_zone_xpm ); _( "Zone Filling On/Off" ), add_zone_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_COMMENTS_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_COMMENTS_ONOFF, _( "Comments On/Off" ), edit_sheet_xpm ); _( "Comments Layer On/Off" ), edit_sheet_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_DRAWINGS_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_DRAWINGS_ONOFF, _( "Drawings On/Off" ), options_text_xpm ); _( "Drawings Layer On/Off" ), add_polygon_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO1_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO1_ONOFF, _( "Eco1 On/Off" ), options_text_xpm ); _( "Eco1 Layer On/Off" ), tools_xpm ); ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO2_ONOFF, ADD_MENUITEM( referencesMenu, ID_MENU3D_ECO2_ONOFF, _( "Eco2 On/Off" ), options_text_xpm ); _( "Eco2 Layer On/Off" ), tools_xpm ); } SetMenuBar( menuBar ); SetMenuBar( menuBar ); } } Loading
common/about_kicad.cpp +6 −6 Original line number Original line Diff line number Diff line Loading @@ -44,17 +44,17 @@ void InitKiCadAbout(wxAboutDialogInfo& info) /* Add developers */ /* Add developers */ info.AddDeveloper(_T("Dick Hollenbeck <dick@softplc.com>")); info.AddDeveloper(_T("Dick Hollenbeck <dick@softplc.com>")); info.AddDeveloper(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDeveloper(_T("\nJean-Pierre Charras <jean-pierre.charras@inpg.fr>")); /* Add document writers */ /* Add document writers */ info.AddDocWriter(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDocWriter(_T("Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddDocWriter(_T("Igor Plyatov <plyatov@gmail.com>")); info.AddDocWriter(_T("\nIgor Plyatov <plyatov@gmail.com>")); /* Add translators */ /* Add translators */ info.AddTranslator(_T("Czech (CZ) Milan Horák <stranger@tiscali.cz>")); info.AddTranslator(_T("Czech (CZ) Milan Horák <stranger@tiscali.cz>")); info.AddTranslator(_T("Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>")); info.AddTranslator(_T("\nDutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>")); info.AddTranslator(_T("French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddTranslator(_T("\nFrench (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>")); info.AddTranslator(_T("Polish (PL) Mateusz Skowroński <skowri@gmail.com>")); info.AddTranslator(_T("\nPolish (PL) Mateusz Skowroński <skowri@gmail.com>")); info.AddTranslator(_T("Russian (RU) Igor Plyatov <plyatov@gmail.com>")); info.AddTranslator(_T("\nRussian (RU) Igor Plyatov <plyatov@gmail.com>")); } }
eeschema/controle.cpp +6 −0 Original line number Original line Diff line number Diff line Loading @@ -226,6 +226,8 @@ void WinEDA_SchematicFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPi wxPoint curpos, oldpos; wxPoint curpos, oldpos; int hotkey = 0; int hotkey = 0; ActiveScreen = screen; curpos = screen->m_MousePosition; curpos = screen->m_MousePosition; oldpos = screen->m_Curseur; oldpos = screen->m_Curseur; Loading Loading @@ -355,6 +357,8 @@ void WinEDA_LibeditFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPixe wxPoint curpos, oldpos; wxPoint curpos, oldpos; int hotkey = 0; int hotkey = 0; ActiveScreen = screen; curpos = screen->m_MousePosition; curpos = screen->m_MousePosition; oldpos = screen->m_Curseur; oldpos = screen->m_Curseur; Loading Loading @@ -483,6 +487,8 @@ void WinEDA_ViewlibFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPixe wxPoint curpos, oldpos; wxPoint curpos, oldpos; int hotkey = 0; int hotkey = 0; ActiveScreen = screen; curpos = screen->m_MousePosition; curpos = screen->m_MousePosition; oldpos = screen->m_Curseur; oldpos = screen->m_Curseur; Loading
eeschema/libedit_onleftclick.cpp +3 −3 Original line number Original line Diff line number Diff line Loading @@ -25,7 +25,7 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) { { LibEDA_BaseStruct* DrawEntry = CurrentDrawItem; LibEDA_BaseStruct* DrawEntry = CurrentDrawItem; if( CurrentLibEntry == NULL ) if( CurrentLibEntry == NULL ) // No component loaded ! return; return; if( m_ID_current_state == 0 ) if( m_ID_current_state == 0 ) Loading Loading @@ -107,11 +107,11 @@ void WinEDA_LibeditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) case ID_LIBEDIT_BODY_CIRCLE_BUTT: case ID_LIBEDIT_BODY_CIRCLE_BUTT: case ID_LIBEDIT_BODY_RECT_BUTT: case ID_LIBEDIT_BODY_RECT_BUTT: case ID_LIBEDIT_BODY_TEXT_BUTT: case ID_LIBEDIT_BODY_TEXT_BUTT: if( CurrentDrawItem == NULL ) if( CurrentDrawItem == NULL || CurrentDrawItem->m_Flags == 0 ) { { CurrentDrawItem = CreateGraphicItem( DC ); CurrentDrawItem = CreateGraphicItem( DC ); } } else else if( CurrentDrawItem ) { { if( CurrentDrawItem->m_Flags & IS_NEW ) if( CurrentDrawItem->m_Flags & IS_NEW ) GraphicItemBeginDraw( DC ); GraphicItemBeginDraw( DC ); Loading