diff --git a/3d-viewer/3d_aux.cpp b/3d-viewer/3d_aux.cpp index d6f0e87213..d563f8b643 100644 --- a/3d-viewer/3d_aux.cpp +++ b/3d-viewer/3d_aux.cpp @@ -171,14 +171,14 @@ Info_3D_Visu::Info_3D_Visu() m_Rot[ii] = 0.0; m_Layers = 1; - m_BoardSettings = NULL; - m_Draw3DAxis = TRUE; - m_Draw3DModule = TRUE; - m_Draw3DZone = TRUE; - m_Draw3DComments = TRUE; - m_Draw3DDrawings = TRUE; - m_Draw3DEco1 = TRUE; - m_Draw3DEco2 = TRUE; + m_BoardSettings = NULL; + m_Draw3DAxis = TRUE; + m_Draw3DModule = TRUE; + m_Draw3DZone = TRUE; + m_Draw3DComments = TRUE; + m_Draw3DDrawings = TRUE; + m_Draw3DEco1 = TRUE; + m_Draw3DEco2 = TRUE; } @@ -209,8 +209,8 @@ WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title, text += ReturnUnitSymbol( units ); msgtitle = new wxStaticText( parent, -1, text, wxDefaultPosition, wxSize( - -1, - -1 ), 0 ); + -1, + -1 ), 0 ); BoxSizer->Add( msgtitle, wxGROW | wxLEFT | wxRIGHT | wxTOP | wxBOTTOM | wxADJUST_MINSIZE ); @@ -225,11 +225,11 @@ WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title, wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxADJUST_MINSIZE, 5 ); m_XValueCtrl = new wxTextCtrl( parent, - -1, - wxEmptyString, - wxDefaultPosition, - wxSize( -1, -1 ), - 0 ); + -1, + wxEmptyString, + wxDefaultPosition, + wxSize( -1, -1 ), + 0 ); GridSizer->Add( m_XValueCtrl, 0, @@ -237,19 +237,19 @@ WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title, 5 ); msgtitle = new wxStaticText( parent, -1, wxT( - "Y:" ), wxDefaultPosition, wxSize( -1, - -1 ), 0 ); + "Y:" ), wxDefaultPosition, wxSize( -1, + -1 ), 0 ); GridSizer->Add( msgtitle, 0, wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxADJUST_MINSIZE, 5 ); m_YValueCtrl = new wxTextCtrl( parent, - -1, - wxEmptyString, - wxDefaultPosition, - wxSize( -1, -1 ), - 0 ); + -1, + wxEmptyString, + wxDefaultPosition, + wxSize( -1, -1 ), + 0 ); GridSizer->Add( m_YValueCtrl, 0, @@ -257,19 +257,19 @@ WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title, 5 ); msgtitle = new wxStaticText( parent, -1, wxT( - "Z:" ), wxDefaultPosition, wxSize( -1, - -1 ), 0 ); + "Z:" ), wxDefaultPosition, wxSize( -1, + -1 ), 0 ); 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 ); + -1, + wxEmptyString, + wxDefaultPosition, + wxSize( -1, -1 ), + 0 ); GridSizer->Add( m_ZValueCtrl, 0, diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index 7604d15b78..89ca4c2b17 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -343,6 +343,7 @@ void WinEDA3D_DrawFrame::NewDisplay() m_Canvas->Refresh( true ); } + /******************************************/ void WinEDA3D_DrawFrame::Set3DBgColor() /******************************************/ @@ -367,22 +368,28 @@ void WinEDA3D_DrawFrame::Set3DBgColor() } } + /******************************************/ void WinEDA3D_DrawFrame::Set3DAxisOnOff() /******************************************/ { - if (g_Parm_3D_Visu.m_Draw3DAxis) g_Parm_3D_Visu.m_Draw3DAxis = FALSE; - else g_Parm_3D_Visu.m_Draw3DAxis = TRUE; - NewDisplay(); + if( g_Parm_3D_Visu.m_Draw3DAxis ) + g_Parm_3D_Visu.m_Draw3DAxis = FALSE; + else + g_Parm_3D_Visu.m_Draw3DAxis = TRUE; + NewDisplay(); } + /******************************************/ void WinEDA3D_DrawFrame::Set3DModuleOnOff() /******************************************/ { - if (g_Parm_3D_Visu.m_Draw3DModule) g_Parm_3D_Visu.m_Draw3DModule = FALSE; - else g_Parm_3D_Visu.m_Draw3DModule = TRUE; - NewDisplay(); + if( g_Parm_3D_Visu.m_Draw3DModule ) + g_Parm_3D_Visu.m_Draw3DModule = FALSE; + else + g_Parm_3D_Visu.m_Draw3DModule = TRUE; + NewDisplay(); } @@ -390,43 +397,57 @@ void WinEDA3D_DrawFrame::Set3DModuleOnOff() void WinEDA3D_DrawFrame::Set3DZoneOnOff() /******************************************/ { - if (g_Parm_3D_Visu.m_Draw3DZone) g_Parm_3D_Visu.m_Draw3DZone = FALSE; - else g_Parm_3D_Visu.m_Draw3DZone = TRUE; - NewDisplay(); + if( g_Parm_3D_Visu.m_Draw3DZone ) + g_Parm_3D_Visu.m_Draw3DZone = FALSE; + else + g_Parm_3D_Visu.m_Draw3DZone = TRUE; + NewDisplay(); } + /******************************************/ void WinEDA3D_DrawFrame::Set3DCommentsOnOff() /******************************************/ { - if (g_Parm_3D_Visu.m_Draw3DComments) g_Parm_3D_Visu.m_Draw3DComments = FALSE; - else g_Parm_3D_Visu.m_Draw3DComments = TRUE; - NewDisplay(); + if( g_Parm_3D_Visu.m_Draw3DComments ) + g_Parm_3D_Visu.m_Draw3DComments = FALSE; + else + g_Parm_3D_Visu.m_Draw3DComments = TRUE; + NewDisplay(); } + /******************************************/ void WinEDA3D_DrawFrame::Set3DDrawingsOnOff() /******************************************/ { - if (g_Parm_3D_Visu.m_Draw3DDrawings) g_Parm_3D_Visu.m_Draw3DDrawings = FALSE; - else g_Parm_3D_Visu.m_Draw3DDrawings = TRUE; - NewDisplay(); + if( g_Parm_3D_Visu.m_Draw3DDrawings ) + g_Parm_3D_Visu.m_Draw3DDrawings = FALSE; + else + g_Parm_3D_Visu.m_Draw3DDrawings = TRUE; + NewDisplay(); } + /******************************************/ void WinEDA3D_DrawFrame::Set3DEco1OnOff() /******************************************/ { - if (g_Parm_3D_Visu.m_Draw3DEco1) g_Parm_3D_Visu.m_Draw3DEco1 = FALSE; - else g_Parm_3D_Visu.m_Draw3DEco1 = TRUE; - NewDisplay(); + if( g_Parm_3D_Visu.m_Draw3DEco1 ) + g_Parm_3D_Visu.m_Draw3DEco1 = FALSE; + else + g_Parm_3D_Visu.m_Draw3DEco1 = TRUE; + NewDisplay(); } + /******************************************/ void WinEDA3D_DrawFrame::Set3DEco2OnOff() /******************************************/ { - if (g_Parm_3D_Visu.m_Draw3DEco2) g_Parm_3D_Visu.m_Draw3DEco2 = FALSE; - else g_Parm_3D_Visu.m_Draw3DEco2 = TRUE; - NewDisplay(); + if( g_Parm_3D_Visu.m_Draw3DEco2 ) + g_Parm_3D_Visu.m_Draw3DEco2 = FALSE; + else + g_Parm_3D_Visu.m_Draw3DEco2 = TRUE; + NewDisplay(); }