Commit b2f9d5bd authored by stambaughw's avatar stambaughw
Browse files

Comment translations and other minor updates. 

* Complete comment translation for all EESchema source files.
* Complete comment translation for all 3D viewer source files.
* Rename class class_hierarchical_PIN_sheet to SCH_SHEET_PIN.
* Rename class DrawSheetStruct to SCH_SHEET.
* Tool tip capitalization fixes.
* Uncrustify and spell check comments and strings in all modified source
  files.
parent a3f48bf2

3d-viewer/3d_aux.cpp

+57 −85
Original line number Diff line number Diff line 
/////////////////////////////////////////////////////////////////////////////



// Name:        3d_aux.cpp

/////////////////////////////////////////////////////////////////////////////
@@ -23,9 +22,8 @@ 
#include "3d_viewer.h"

#include "trackball.h"



/**************************************************************************/



void S3D_MASTER::Set_Object_Coords( S3D_Vertex* coord, int nbcoord )

/**************************************************************************/

{

    int ii;
@@ -55,9 +53,7 @@ void S3D_MASTER::Set_Object_Coords( S3D_Vertex* coord, int nbcoord ) 
}





/************************************************************/

void Set_Object_Data( const S3D_Vertex* coord, int nbcoord )

/************************************************************/

{

    int     ii;

    GLfloat ax, ay, az, bx, by, bz, nx, ny, nz, r;
@@ -114,9 +110,7 @@ void Set_Object_Data( const S3D_Vertex* coord, int nbcoord ) 
}





/**********************************************/

GLuint Pcb3D_GLCanvas::DisplayCubeforTest()

/**********************************************/

{

    GLuint gllist = glGenLists( 1 );
@@ -158,7 +152,6 @@ GLuint Pcb3D_GLCanvas::DisplayCubeforTest() 
/* class Info_3D_Visu */

/**********************/



/* Constructor */

Info_3D_Visu::Info_3D_Visu()

{

    int ii;
@@ -186,11 +179,8 @@ Info_3D_Visu::~Info_3D_Visu() 
}





/*****************************************************************/

/* Classe pour afficher et editer un Vertex (triplet de valeurs),*/

/* en INCHES ou MM ou sans unites								 */

/*****************************************************************/



/* Display and edit a Vertex (triplet of values) in INCHES or MM or without

 * units */

WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title,

                                      wxBoxSizer* BoxSizer,

                                      int units, int internal_unit )
@@ -207,11 +197,13 @@ WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title, 
        text = title;

    text += ReturnUnitSymbol( units );



    msgtitle = new                      wxStaticText( parent, -1, text, wxDefaultPosition, wxSize(

            -1,

            -1 ), 0 );

    msgtitle = new wxStaticText( parent, -1, text, wxDefaultPosition,

                                 wxSize( -1, -1 ), 0 );



    BoxSizer->Add( msgtitle, wxGROW | wxLEFT | wxRIGHT | wxTOP | wxBOTTOM | wxADJUST_MINSIZE );

    BoxSizer->Add(

        msgtitle,

        wxGROW | wxLEFT | wxRIGHT | wxTOP | wxBOTTOM |

        wxADJUST_MINSIZE );



    wxFlexGridSizer* GridSizer = new wxFlexGridSizer( 3, 2, 0, 0 );
@@ -219,60 +211,48 @@ WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title, 


    msgtitle = new wxStaticText( parent, -1, wxT( "X:" ) );



    GridSizer->Add( msgtitle,

        0,

        wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxADJUST_MINSIZE,

    GridSizer->Add( msgtitle, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT | wxADJUST_MINSIZE,

                    5 );

    m_XValueCtrl = new                  wxTextCtrl( parent,

        -1,

        wxEmptyString,

        wxDefaultPosition,

        wxSize( -1, -1 ),

        0 );

    m_XValueCtrl = new wxTextCtrl( parent, -1, wxEmptyString,

                                   wxDefaultPosition, wxSize( -1, -1 ), 0 );



    GridSizer->Add( m_XValueCtrl,

                    0,

        wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT,

                    5 );



    msgtitle = new                      wxStaticText( parent, -1, wxT(

            "Y:" ), wxDefaultPosition, wxSize( -1,

            -1 ), 0 );

    msgtitle = new wxStaticText( parent, -1, wxT( "Y:" ), wxDefaultPosition,

                                 wxSize( -1, -1 ), 0 );



    GridSizer->Add( msgtitle,

                    0,

        wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxADJUST_MINSIZE,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT | wxADJUST_MINSIZE,

                    5 );

    m_YValueCtrl = new                  wxTextCtrl( parent,

        -1,

        wxEmptyString,

        wxDefaultPosition,

        wxSize( -1, -1 ),

        0 );



    GridSizer->Add( m_YValueCtrl,

        0,

        wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT,

    m_YValueCtrl = new wxTextCtrl( parent, -1, wxEmptyString,

                                   wxDefaultPosition, wxSize( -1, -1 ), 0 );



    GridSizer->Add( m_YValueCtrl, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT,

                    5 );



    msgtitle = new                      wxStaticText( parent, -1, wxT(

            "Z:" ), wxDefaultPosition, wxSize( -1,

            -1 ), 0 );

    msgtitle = new wxStaticText( parent, -1, wxT( "Z:" ), wxDefaultPosition,

                                 wxSize( -1, -1 ), 0 );



    GridSizer->Add( msgtitle,

        0,

        wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxADJUST_MINSIZE,

    GridSizer->Add( msgtitle, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT | wxADJUST_MINSIZE,

                    5 );

    m_ZValueCtrl = new                  wxTextCtrl( parent,

        -1,

        wxEmptyString,

        wxDefaultPosition,

        wxSize( -1, -1 ),

        0 );



    GridSizer->Add( m_ZValueCtrl,

        0,

        wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT,

    m_ZValueCtrl = new wxTextCtrl( parent, -1, wxEmptyString,

                                   wxDefaultPosition, wxSize( -1, -1 ), 0 );



    GridSizer->Add( m_ZValueCtrl, 0,

                    wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL |

                    wxLEFT | wxRIGHT,

                    5 );

}
@@ -282,12 +262,8 @@ WinEDA_VertexCtrl::~WinEDA_VertexCtrl() 
}





/*******************************************/

/* Returns (in internal units) to coordinate between (in user units) */

S3D_Vertex WinEDA_VertexCtrl::GetValue()

/*******************************************/



/* Retourne (en unites internes) les coordonnes entrees (en unites utilisateur)

 */

{

    S3D_Vertex value;

    double     dtmp;
@@ -302,9 +278,7 @@ S3D_Vertex WinEDA_VertexCtrl::GetValue() 
}





/**************************************************/

void WinEDA_VertexCtrl::SetValue( S3D_Vertex vertex )

/**************************************************/

{

    wxString text;
@@ -322,9 +296,7 @@ void WinEDA_VertexCtrl::SetValue( S3D_Vertex vertex ) 
}





/*****************************************/

void WinEDA_VertexCtrl::Enable( bool onoff )

/*****************************************/

{

    m_XValueCtrl->Enable( onoff );

    m_YValueCtrl->Enable( onoff );

3d-viewer/3d_canvas.cpp

+49 −80
Original line number Diff line number Diff line 
/////////////////////////////////////////////////////////////////////////////



// Name:        3d_canvas.cpp

/////////////////////////////////////////////////////////////////////////////
@@ -43,20 +42,21 @@ EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END, 
                    Pcb3D_GLCanvas::OnPopUpMenu )

END_EVENT_TABLE()



/*************************************************************************/

Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) :

#if wxCHECK_VERSION( 2, 9, 0 )

    wxGLCanvas( parent, -1, NULL, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE )

    wxGLCanvas( parent, -1, NULL, wxDefaultPosition, wxDefaultSize,

                wxFULL_REPAINT_ON_RESIZE )

#else

    wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE )

    wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize,

                wxFULL_REPAINT_ON_RESIZE )

#endif

/*************************************************************************/

{

    m_init   = FALSE;

    m_gllist = 0;

    m_Parent = parent;



#if wxCHECK_VERSION( 2, 9, 0 )



    // Explicitly create a new rendering context instance for this canvas.

    m_glRC = new wxGLContext( this );

#endif
@@ -65,9 +65,7 @@ Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) : 
}





/*************************************/

Pcb3D_GLCanvas::~Pcb3D_GLCanvas()

/*************************************/

{

    ClearLists();

    m_init = FALSE;
@@ -77,9 +75,7 @@ Pcb3D_GLCanvas::~Pcb3D_GLCanvas() 
}





/*************************************/

void Pcb3D_GLCanvas::ClearLists()

/*************************************/

{

    if( m_gllist > 0 )

        glDeleteLists( m_gllist, 1 );
@@ -87,18 +83,14 @@ void Pcb3D_GLCanvas::ClearLists() 
}





/*********************************************/

void Pcb3D_GLCanvas::OnChar( wxKeyEvent& event )

/*********************************************/

{

    SetView3D( event.GetKeyCode() );

    event.Skip();

}





/*********************************************/

void Pcb3D_GLCanvas::SetView3D( int keycode )

/*********************************************/

{

    int    ii;

    double delta_move = 0.7 * g_Parm_3D_Visu.m_Zoom;
@@ -214,9 +206,7 @@ void Pcb3D_GLCanvas::SetView3D( int keycode ) 
}





/********************************************************/

void Pcb3D_GLCanvas::OnMouseEvent( wxMouseEvent& event )

/********************************************************/

{

    wxSize size( GetClientSize() );

    double spin_quat[4];
@@ -286,10 +276,14 @@ void Pcb3D_GLCanvas::OnMouseEvent( wxMouseEvent& event ) 
        else if( event.MiddleIsDown() )

        {

            /* middle button drag -> pan */

            /* Current zoom and an additional factor are taken into account for the amount of panning. */



            /* Current zoom and an additional factor are taken into account

             * for the amount of panning. */

            const double PAN_FACTOR = 8.0 * g_Parm_3D_Visu.m_Zoom;

            g_Draw3d_dx -= PAN_FACTOR * ( g_Parm_3D_Visu.m_Beginx - event.GetX() ) / size.x;

            g_Draw3d_dy -= PAN_FACTOR * (event.GetY() - g_Parm_3D_Visu.m_Beginy) / size.y;

            g_Draw3d_dx -= PAN_FACTOR *

                           ( g_Parm_3D_Visu.m_Beginx - event.GetX() ) / size.x;

            g_Draw3d_dy -= PAN_FACTOR *

                           (event.GetY() - g_Parm_3D_Visu.m_Beginy) / size.y;

        }



        /* orientation has changed, redraw mesh */
@@ -302,13 +296,9 @@ void Pcb3D_GLCanvas::OnMouseEvent( wxMouseEvent& event ) 
}





/*******************************************************/

void Pcb3D_GLCanvas::OnRightClick( wxMouseEvent& event )

/*******************************************************/



/* Construit et affiche un menu Popup lorsque on actionne le bouton droit

 *  de la souris

/* Construct and display a popup menu when the right button is clicked.

 */

void Pcb3D_GLCanvas::OnRightClick( wxMouseEvent& event )

{

    wxPoint     pos;

    wxMenu      PopUpMenu;
@@ -383,9 +373,7 @@ void Pcb3D_GLCanvas::OnRightClick( wxMouseEvent& event ) 
}





/*******************************************************/

void Pcb3D_GLCanvas::OnPopUpMenu( wxCommandEvent& event )

/*******************************************************/

{

    int key = 0;
@@ -447,9 +435,7 @@ void Pcb3D_GLCanvas::OnPopUpMenu( wxCommandEvent& event ) 
}





/***************************************/

void Pcb3D_GLCanvas::DisplayStatus()

/***************************************/

{

    wxString msg;
@@ -464,30 +450,23 @@ void Pcb3D_GLCanvas::DisplayStatus() 
}





/*************************************************/

void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event )

/*************************************************/

{

    wxPaintDC dc( this );



    Redraw();

    event.Skip();

}





/***********************************************************/

void Pcb3D_GLCanvas::OnEraseBackground( wxEraseEvent& event )

/***********************************************************/

{

    // Do nothing, to avoid flashing.

}





/****************************/

/* Initialize broad parameters for OpenGL */

void Pcb3D_GLCanvas::InitGL()

/****************************/



/* Int parametres generaux pour OPENGL

 */

{

    wxSize size = GetClientSize();
@@ -517,7 +496,9 @@ void Pcb3D_GLCanvas::InitGL() 
    }



    /* set viewing projection */

    double ratio_HV = (double) size.x / size.y; // Ratio largeur /hauteur de la fenetre d'affichage



    // Ratio width / height of the window display

    double ratio_HV = (double) size.x / size.y;

    glMatrixMode( GL_PROJECTION );

    glLoadIdentity();
@@ -541,17 +522,11 @@ void Pcb3D_GLCanvas::InitGL() 


    /* Setup light souces: */

    SetLights();





}





/***********************************/

/* Initialize OpenGL light sources. */

void Pcb3D_GLCanvas::SetLights()

/***********************************/



/* Init sources lumineuses pour OPENGL

 */

{

    double  light;

    GLfloat light_color[4];
@@ -576,13 +551,10 @@ void Pcb3D_GLCanvas::SetLights() 
}





/**********************************************************/

void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event )

/**********************************************************/



/* Create a Screenshot of the current 3D view.

 *  Output file format is png or jpeg, or image is copied on clipboard

 */

void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event )

{

    wxFileName fn( m_Parent->m_Parent->GetScreen()->m_FileName );

    wxString   FullFileName;
@@ -599,15 +571,10 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) 
        fn.SetExt( file_ext );



        FullFileName =

            EDA_FileSelector( _( "3D Image filename:" ),

                              wxEmptyString,    /* Chemin par defaut */

                              fn.GetFullName(), /* nom fichier par defaut */

                              file_ext,         /* extension par defaut */

                              mask,             /* Masque d'affichage */

                              this,

                              wxFD_SAVE,

                              TRUE

                              );

            EDA_FileSelector( _( "3D Image filename:" ), wxEmptyString,

                              fn.GetFullName(), file_ext, mask, this,

                              wxFD_SAVE, TRUE );



        if( FullFileName.IsEmpty() )

            return;

    }
@@ -630,8 +597,9 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) 
        {

            if( !wxTheClipboard->SetData( dobjBmp ) )

                wxLogError( _T( "Failed to copy image to clipboard" ) );

            wxTheClipboard->Flush();    /* the data on clipboard

                                         *  will stay available after the application exits */

            wxTheClipboard->Flush();    /* the data in clipboard will stay

                                         * available after the

                                         * application exits */

            wxTheClipboard->Close();

        }

    }
@@ -640,7 +608,8 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) 
        wxImage image = bitmap.ConvertToImage();



        if( !image.SaveFile( FullFileName,

                             fmt_is_jpeg ? wxBITMAP_TYPE_JPEG : wxBITMAP_TYPE_PNG ) )

                             fmt_is_jpeg ? wxBITMAP_TYPE_JPEG :

                             wxBITMAP_TYPE_PNG ) )

            wxLogError( wxT( "Can't save file" ) );



        image.Destroy();

3d-viewer/3d_class.cpp

+7 −24
Original line number Diff line number Diff line 
/////////////////////////////////////////////////////////////////////////////



// Name:        3d_class.cpp

/////////////////////////////////////////////////////////////////////////////
@@ -14,18 +13,14 @@ 
#include "3d_viewer.h"





/****************************/

S3D_Vertex::S3D_Vertex()

/****************************/

{

    x = y = z = 0.0;

}





/**************************************************************************/

S3D_MATERIAL::S3D_MATERIAL( S3D_MASTER* father, const wxString& name ) :

    EDA_BaseStruct( father, NOT_USED )

/**************************************************************************/

{

    m_DiffuseColor.x   = m_DiffuseColor.y = m_DiffuseColor.z = 1.0;

    m_SpecularColor.x  = m_SpecularColor.y = m_SpecularColor.z = 1.0;
@@ -36,9 +31,7 @@ S3D_MATERIAL::S3D_MATERIAL( S3D_MASTER* father, const wxString& name ) : 
}





/***********************************/

void S3D_MATERIAL::SetMaterial()

/***********************************/

{

    glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );

    glColor4f( m_DiffuseColor.x * m_AmbientIntensity,
@@ -53,9 +46,7 @@ void S3D_MATERIAL::SetMaterial() 
}





/****************************************************/

void S3D_MASTER::Copy( S3D_MASTER* pattern )

/****************************************************/

{

    m_Shape3DName = pattern->m_Shape3DName;

    m_MatScale    = pattern->m_MatScale;
@@ -66,10 +57,8 @@ void S3D_MASTER::Copy( S3D_MASTER* pattern ) 
}





/***************************************************************/

S3D_MASTER::S3D_MASTER( EDA_BaseStruct* aParent ) :

    EDA_BaseStruct( aParent, NOT_USED )

/***************************************************************/

{

    m_MatScale.x  = m_MatScale.y = m_MatScale.z = 1.0;

    m_3D_Drawings = NULL;
@@ -77,9 +66,7 @@ S3D_MASTER::S3D_MASTER( EDA_BaseStruct* aParent ) : 
}





/***************************************/

S3D_MASTER:: ~S3D_MASTER()

/***************************************/

{

    Struct3D_Shape* next;

    S3D_MATERIAL*   nextmat;
@@ -98,10 +85,8 @@ S3D_MASTER:: ~S3D_MASTER() 
}





/***************************************************************/

Struct3D_Shape::Struct3D_Shape( EDA_BaseStruct* aParent ) :

    EDA_BaseStruct( aParent, NOT_USED )

/***************************************************************/

{

    m_3D_Coord = NULL;

    m_3D_CoordIndex = NULL;
@@ -109,9 +94,7 @@ Struct3D_Shape::Struct3D_Shape( EDA_BaseStruct* aParent ) : 
}





/***************************************/

Struct3D_Shape:: ~Struct3D_Shape()

/***************************************/

{

    delete m_3D_Coord;

    delete m_3D_CoordIndex;

3d-viewer/3d_draw.cpp

+139 −170

File changed.

Preview size limit exceeded, changes collapsed.

3d-viewer/3d_frame.cpp

+40 −79
Original line number Diff line number Diff line 
/////////////////////////////////////////////////////////////////////////////



// Name:        3d_frame.cpp

/////////////////////////////////////////////////////////////////////////////
@@ -30,7 +29,7 @@ double g_Draw3d_dx; 
double       g_Draw3d_dy;

double       ZBottom;

double       ZTop;

double DataScale3D;  // coeff de conversion unites utilsateut -> unites 3D

double       DataScale3D; // 3D conversion units.





BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )
@@ -45,20 +44,18 @@ BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame ) 
    EVT_CLOSE( WinEDA3D_DrawFrame::OnCloseWindow )

END_EVENT_TABLE()



/*******************************************************************/

WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent,

                                        const wxString&      title,

                                        long                 style ) :

    wxFrame( parent, DISPLAY3D_FRAME, title,

             wxPoint( -1, -1 ), wxSize( -1, -1 ), style )

/*******************************************************************/

    wxFrame( parent, DISPLAY3D_FRAME, title, wxPoint( -1, -1 ),

             wxSize( -1, -1 ), style )

{

    m_FrameName     = wxT( "Frame3D" );

    m_Canvas        = NULL;

    m_Parent        = parent;

    m_HToolBar      = NULL;

    m_VToolBar      = NULL;

    m_InternalUnits = 10000;    // Unites internes = 1/10000 inch

    m_InternalUnits = 10000;    // Internal units = 1/10000 inch



    // Give it an icon

    SetIcon( wxICON( icon_w3d ) );
@@ -80,6 +77,7 @@ WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent, 


    // Make a Pcb3D_GLCanvas

    m_Canvas = new Pcb3D_GLCanvas( this );



#if KICAD_AUIMANAGER

    m_auimgr.SetManagedWindow( this );
@@ -107,17 +105,13 @@ WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent, 
}





/***********************************************************/

void WinEDA3D_DrawFrame::Exit3DFrame( wxCommandEvent& event )

/***********************************************************/

{

    Close( TRUE );

}





/***********************************************************/

void WinEDA3D_DrawFrame::OnCloseWindow( wxCloseEvent& Event )

/***********************************************************/

{

    SaveSettings();

    if( m_Parent )
@@ -128,12 +122,11 @@ void WinEDA3D_DrawFrame::OnCloseWindow( wxCloseEvent& Event ) 
}





/******************************************/

void WinEDA3D_DrawFrame::GetSettings()

/******************************************/

{

    wxString  text;

    wxConfig* config = wxGetApp().m_EDA_Config;  //  Current config used by application

    wxConfig* config = wxGetApp().m_EDA_Config;  // Current config used by

                                                 // application



    if( config )

    {
@@ -161,12 +154,11 @@ void WinEDA3D_DrawFrame::GetSettings() 
}





/*******************************************/

void WinEDA3D_DrawFrame::SaveSettings()

/*******************************************/

{

    wxString  text;

    wxConfig* Config = wxGetApp().m_EDA_Config;  //  Current config used by application

    wxConfig* Config = wxGetApp().m_EDA_Config;  //  Current config used by

                                                 // application



    if( !Config )

        return;
@@ -192,9 +184,7 @@ void WinEDA3D_DrawFrame::SaveSettings() 
}





/***********************************************************/

void WinEDA3D_DrawFrame::Process_Zoom( wxCommandEvent& event )

/***********************************************************/

{

    int ii;
@@ -231,40 +221,29 @@ void WinEDA3D_DrawFrame::Process_Zoom( wxCommandEvent& event ) 
}





/************************************************************************/

void WinEDA3D_DrawFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )

/************************************************************************/

{

}





/*******************************************************************************/

void WinEDA3D_DrawFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu )

/*******************************************************************************/

void WinEDA3D_DrawFrame::OnRightClick( const wxPoint& MousePos,

                                       wxMenu*        PopMenu )

{

}





/************************************/

int WinEDA3D_DrawFrame::BestZoom()

/************************************/



// Retourne le meilleur zoom

{

    return 1;

}





/*******************************************************************/

void WinEDA3D_DrawFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )

/*******************************************************************/

{

}





/************************************************************************/

void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event )

/************************************************************************/

{

#define ROT_ANGLE 10.0
@@ -354,8 +333,8 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event ) 
        return;



    default:

        wxMessageBox(

            wxT( "WinEDA3D_DrawFrame::Process_Special_Functions() error: unknown command" ) );

        wxMessageBox( wxT( "WinEDA3D_DrawFrame::Process_Special_Functions() \

error: unknown command" ) );

        return;

    }
@@ -364,24 +343,20 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event ) 
}





/*****************************************/

void WinEDA3D_DrawFrame::NewDisplay()

/*****************************************/

{

    m_Canvas->ClearLists();

    m_Canvas->CreateDrawGL_List();



//    m_Canvas->InitGL();

    m_Canvas->Refresh( true );

    m_Canvas->DisplayStatus();

}





/******************************************/

void WinEDA3D_DrawFrame::Set3DBgColor()

/******************************************/



/* called to set the background color of the 3D scene

 */

void WinEDA3D_DrawFrame::Set3DBgColor()

{

    S3D_Color color;

    wxColour  newcolor, oldcolor;
@@ -401,9 +376,7 @@ void WinEDA3D_DrawFrame::Set3DBgColor() 
}





/******************************************/

void WinEDA3D_DrawFrame::Set3DAxisOnOff()

/******************************************/

{

    if( g_Parm_3D_Visu.m_Draw3DAxis )

        g_Parm_3D_Visu.m_Draw3DAxis = FALSE;
@@ -413,9 +386,7 @@ void WinEDA3D_DrawFrame::Set3DAxisOnOff() 
}





/******************************************/

void WinEDA3D_DrawFrame::Set3DModuleOnOff()

/******************************************/

{

    if( g_Parm_3D_Visu.m_Draw3DModule )

        g_Parm_3D_Visu.m_Draw3DModule = FALSE;
@@ -425,9 +396,7 @@ void WinEDA3D_DrawFrame::Set3DModuleOnOff() 
}





/******************************************/

void WinEDA3D_DrawFrame::Set3DZoneOnOff()

/******************************************/

{

    if( g_Parm_3D_Visu.m_Draw3DZone )

        g_Parm_3D_Visu.m_Draw3DZone = FALSE;
@@ -437,9 +406,7 @@ void WinEDA3D_DrawFrame::Set3DZoneOnOff() 
}





/******************************************/

void WinEDA3D_DrawFrame::Set3DCommentsOnOff()

/******************************************/

{

    if( g_Parm_3D_Visu.m_Draw3DComments )

        g_Parm_3D_Visu.m_Draw3DComments = FALSE;
@@ -449,9 +416,7 @@ void WinEDA3D_DrawFrame::Set3DCommentsOnOff() 
}





/******************************************/

void WinEDA3D_DrawFrame::Set3DDrawingsOnOff()

/******************************************/

{

    if( g_Parm_3D_Visu.m_Draw3DDrawings )

        g_Parm_3D_Visu.m_Draw3DDrawings = FALSE;
@@ -461,9 +426,7 @@ void WinEDA3D_DrawFrame::Set3DDrawingsOnOff() 
}





/******************************************/

void WinEDA3D_DrawFrame::Set3DEco1OnOff()

/******************************************/

{

    if( g_Parm_3D_Visu.m_Draw3DEco1 )

        g_Parm_3D_Visu.m_Draw3DEco1 = FALSE;
@@ -473,9 +436,7 @@ void WinEDA3D_DrawFrame::Set3DEco1OnOff() 
}





/******************************************/

void WinEDA3D_DrawFrame::Set3DEco2OnOff()

/******************************************/

{

    if( g_Parm_3D_Visu.m_Draw3DEco2 )

        g_Parm_3D_Visu.m_Draw3DEco2 = FALSE;