test-fig target: moved grid drawing

Author: skramm

misc/figures_test/t_footer_frect_1.cxx

@@ -4,29 +4,7 @@
 	Homogr H;
 	H.addScale( 50 );
 	H.addTranslation( 20,20 );
-
-// grid
-	int g=220, g0=g/2;
-	auto colgrid  = img::DrawParams().setColor(g,g,g);
-	auto colgrid0 = img::DrawParams().setColor(g0,g0,g0).setThickness(2);
-	for (int i=0; i<6; i++ )
-	{
-		Line2d li( LineDir::H, i );
-		auto li2 = H*li;
-		if( i==0 )
-			li2.draw( img2, colgrid0 );
-		else
-			li2.draw( img2, colgrid );
-	}
-	for (int i=0; i<7; i++ )
-	{
-		Line2d li( LineDir::V, i );
-		auto li2 = H*li;
-		if( i==0 )
-			li2.draw( img2, colgrid0 );
-		else
-			li2.draw( img2, colgrid );
-	}
+	drawGrid( img2, H );
 
 	auto r1b = H*r1;
 	auto r2b = H*r2;
@@ -37,7 +15,6 @@
 	r1b.draw( img2, img::DrawParams().setColor(250,0,20) );
 	r2b.draw( img2, img::DrawParams().setColor(20,0,250) );
 
-//	img2.write( std::string(argv[0])+ ".png" );
 	img2.write( std::string(argv[0])+ ".svg" );
 }
 

misc/figures_test/t_footer_polyline_1.cxx

@@ -4,29 +4,7 @@
 	Homogr H;
 	H.addScale( 50 );
 	H.addTranslation( 20,20 );
-
-// grid
-	int g=220, g0=g/2;
-	auto colgrid  = img::DrawParams().setColor(g,g,g);
-	auto colgrid0 = img::DrawParams().setColor(g0,g0,g0).setThickness(2);
-	for (int i=0; i<6; i++ )
-	{
-		Line2d li( LineDir::H, i );
-		auto li2 = H*li;
-		if( i==0 )
-			li2.draw( img2, colgrid0 );
-		else
-			li2.draw( img2, colgrid );
-	}
-	for (int i=0; i<7; i++ )
-	{
-		Line2d li( LineDir::V, i );
-		auto li2 = H*li;
-		if( i==0 )
-			li2.draw( img2, colgrid0 );
-		else
-			li2.draw( img2, colgrid );
-	}
+	drawGrid( img2, H );
 
 	auto poly1 = H*pl;
 	auto dp = img::DrawParams().setColor(250,0,20).showPoints(true).setPointStyle(img::PtStyle::Times).showIndex(true);

misc/figures_test/t_header.cxx

@@ -8,6 +8,33 @@
 #define NUMTYPE double
 
 using namespace h2d;
+
+template<typename IMG,typename HOMOG>
+void drawGrid( IMG& img, const HOMOG& H )
+{
+	int g=220, g0=g/2;
+	auto colgrid  = img::DrawParams().setColor(g,g,g);
+	auto colgrid0 = img::DrawParams().setColor(g0,g0,g0).setThickness(2);
+	for (int i=0; i<6; i++ )
+	{
+		Line2d li( LineDir::H, i );
+		auto li2 = H*li;
+		if( i==0 )
+			li2.draw( img, colgrid0 );
+		else
+			li2.draw( img, colgrid );
+	}
+	for (int i=0; i<7; i++ )
+	{
+		Line2d li( LineDir::V, i );
+		auto li2 = H*li;
+		if( i==0 )
+			li2.draw( img, colgrid0 );
+		else
+			li2.draw( img, colgrid );
+	}
+}
+
 int main( int argc, const char** argv )
 {
 	img::Image<img::SvgImage> img2(350,400);