Merged kicad-gal-orson (9eb39168) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_draw_basic_functions.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -415,6 +415,6 @@ void CALLBACK tessErrorCB( GLenum errorCode )
		errorStr = gluErrorString( errorCode );

		// DEBUG //
		D( printf( "Tess ERROR: %s\n", errorStr ); )
		DBG( printf( "Tess ERROR: %s\n", errorStr ); )
		#endif
		}

3d-viewer/vrmlmodelparser.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ int VRML_MODEL_PARSER::readMaterial( FILE* file, int* LineNum )
		}
		}

		D( printf( "ReadMaterial error: material not found\n" ) );
		DBG( printf( "ReadMaterial error: material not found\n" ) );
		return 0;
		}

		@@ -207,7 +207,7 @@ int VRML_MODEL_PARSER::readChildren( FILE* file, int* LineNum )
		}
		else
		{
		D( printf( "ReadChildren error line %d <%s> \n", *LineNum, text ) );
		DBG( printf( "ReadChildren error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}
		@@ -241,7 +241,7 @@ int VRML_MODEL_PARSER::readShape( FILE* file, int* LineNum )
		}
		else
		{
		D( printf( "ReadShape error line %d <%s> \n", *LineNum, text ) );
		DBG( printf( "ReadShape error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}
		@@ -271,7 +271,7 @@ int VRML_MODEL_PARSER::readAppearance( FILE* file, int* LineNum )
		}
		else
		{
		D( printf( "ReadAppearance error line %d <%s> \n", *LineNum, text ) );
		DBG( printf( "ReadAppearance error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}

3d-viewer/x3dmodelparser.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -197,19 +197,19 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		if( !parseDoubleTriplet( properties[ wxT( "diffuseColor" ) ],
		material->m_DiffuseColor ) )
		{
		D( printf("diffuseColor parsing error") );
		DBG( printf("diffuseColor parsing error") );
		}

		if( !parseDoubleTriplet( properties[ wxT( "specularColor" ) ],
		material->m_SpecularColor ) )
		{
		D( printf("specularColor parsing error") );
		DBG( printf("specularColor parsing error") );
		}

		if( !parseDoubleTriplet( properties[ wxT( "emissiveColor" ) ],
		material->m_EmissiveColor ) )
		{
		D( printf("emissiveColor parsing error") );
		DBG( printf("emissiveColor parsing error") );
		}

		wxStringTokenizer values;
		@@ -221,7 +221,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		else
		{
		D( printf( "ambienterror" ) );
		DBG( printf( "ambienterror" ) );
		}

		values.SetString( properties[ wxT( "shininess" ) ] );
		@@ -232,7 +232,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		else
		{
		D( printf( "shininess error" ) );
		DBG( printf( "shininess error" ) );
		}

		values.SetString( properties[ wxT( "transparency" ) ] );
		@@ -243,7 +243,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		else
		{
		D( printf( "trans error") );
		DBG( printf( "trans error") );
		}

		material->SetMaterial();
		@@ -303,7 +303,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
		}
		}

		D( printf( "ReadMaterial error: material not found\n" ) );
		DBG( printf( "ReadMaterial error: material not found\n" ) );
		}
		}

		@@ -373,7 +373,7 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,
		tokens.GetNextToken().ToDouble( &rotation.z ) &&
		tokens.GetNextToken().ToDouble( &angle ) ) )
		{
		D( printf("rotation read error") );
		DBG( printf("rotation read error") );
		}

		double vrmlunits_to_3Dunits = g_Parm_3D_Visu.m_BiuTo3Dunits *
		@@ -407,7 +407,7 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,

		if( points.size() % 3 != 0 )
		{
		D( printf( "Number of points is incorrect" ) );
		DBG( printf( "Number of points is incorrect" ) );
		return;
		}

common/dialogs/dialog_page_settings.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,7 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event )
		if( SavePageSettings() )
		{
		m_screen->SetModify();
		m_parent->GetCanvas()->Refresh();
		m_parent->RefreshCanvas();

		if( m_localPrjConfigChanged )
		m_parent->SaveProjectSettings( true );

common/drawframe.cpp

+19 −15

Original line number	Diff line number	Diff line
		@@ -234,13 +234,14 @@ void EDA_DRAW_FRAME::SkipNextLeftButtonReleaseEvent()
		void EDA_DRAW_FRAME::OnToggleGridState( wxCommandEvent& aEvent )
		{
		SetGridVisibility( !IsGridVisible() );

		if( m_galCanvasActive )
		{
		m_galCanvas->GetGAL()->SetGridVisibility( IsGridVisible() );
		m_galCanvas->Refresh();
		m_galCanvas->GetView()->MarkTargetDirty( KiGfx::TARGET_NONCACHED );
		}
		else
		m_canvas->Refresh();

		RefreshCanvas();
		}


		@@ -395,11 +396,12 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )

		if( m_galCanvasActive )
		{
		KiGfx::GAL* gal = m_galCanvas->GetGAL();
		gal->SetGridSize( VECTOR2D( screen->GetGrid().m_Size.x, screen->GetGrid().m_Size.y ) );
		m_galCanvas->GetGAL()->SetGridSize( VECTOR2D( screen->GetGrid().m_Size.x,
		screen->GetGrid().m_Size.y ) );
		m_galCanvas->GetView()->MarkTargetDirty( KiGfx::TARGET_NONCACHED );
		}

		Refresh();
		RefreshCanvas();
		}


		@@ -979,18 +981,18 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
		// Switch to GAL rendering
		if( !m_galCanvasActive )
		{
		// Change view settings only if GAL was not active previously
		double zoom = 1.0 / ( zoomFactor * m_canvas->GetZoom() );
		view->SetScale( zoom );
		view->SetCenter( VECTOR2D( m_canvas->GetScreenCenterLogicalPosition() ) );
		}

		// Set up grid settings
		gal->SetGridVisibility( IsGridVisible() );
		gal->SetGridSize( VECTOR2D( screen->GetGridSize().x, screen->GetGridSize().y ) );
		gal->SetGridOrigin( VECTOR2D( screen->GetGridOrigin() ) );
		gal->SetGridOriginMarkerSize( 15 );
		gal->SetGridDrawThreshold( 10 );

		// Set up viewport
		double zoom = 1.0 / ( zoomFactor * m_canvas->GetZoom() );
		view->SetScale( zoom );
		view->SetCenter( VECTOR2D( m_canvas->GetScreenCenterLogicalPosition() ) );
		}
		}
		else
		{
		@@ -1014,6 +1016,8 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
		m_auimgr.GetPane( wxT( "DrawFrameGal" ) ).Show( aEnable );
		m_auimgr.Update();

		m_galCanvas->SetFocus();
		m_galCanvasActive = aEnable;

		if( aEnable )
		m_galCanvas->SetFocus();
		}

Admin message