Bugfixes; funcionando sistema básico

Author: joepreludian

src/main.cc

@@ -16,26 +16,28 @@ int main()
 		float xCoord = (float) (i -100)/10;
 
 		matrix_x.add(i, 1, xCoord);
+		matrix_x.add(i, 2, xCoord); //Segundo plotter
+		matrix_x.add(i, 3, xCoord);
+
 		matrix_y.add(i, 1, sin(2*xCoord) + cos(xCoord));
+		matrix_y.add(i, 2, cos(2*xCoord) + sin(xCoord)); //Segundo plotter em Y. Alterando dados
+		matrix_y.add(i, 3, 1);
 	}
 
 	//Instanciando plotter
 	//MatrixPlot matrixplot = MatrixPlot(2, 2); //Define subplot Cols; subplot Rows;
 
 	MatrixPlot matrixplot = MatrixPlot();
+	matrixplot.setAutoRange(false);
+
+	matrixplot.SetRange('x', -10, 10);
+	matrixplot.SetRange('y', -2, 6);
+
 	matrixplot.plot1d(matrix_x, matrix_y);
 	cout << "Depois do plot" << endl;
-	//Matrix matrix_box = Matrix(10,2);
 
-	//matrixplot.plotbox(matrix);
+	matrixplot.saveToFile("teste.eps");
 
-	//Plotando matrix 1d
-	/*
-	matrixplot.plot1d(matrix, 0); //Plota e define o indice do subplot
-	matrixplot.plot1d(matrix, 1);
-	matrixplot.plot1d(matrix, 2);
-	matrixplot.plot1d(matrix, 3);
-	*/
 	matrixplot.Run();
 
 	return 0;

src/matrix-plot.cc

@@ -19,7 +19,6 @@
 
 #include "matrix-plot.h"
 #include "MatrixPlotWindow.h"
-#include <mgl2/fltk.h>
 
 MatrixPlot::MatrixPlot(int subplotCols, int subplotRows)
 {
@@ -179,22 +178,39 @@ void MatrixPlot::plot1d(Matrix & xMatrix, Matrix & yMatrix){
 
 		//Subplotagem
 
-		this->SubPlot(
+		/*this->SubPlot(
 				this->subplotCols,
 				this->subplotRows,
 				0, "");
 
-		this->Axis("xy");
+		this->Axis("xy");*/
 
-		if (this->autoRange)
+		string color = "";
+		switch (subplotIndex)
+		{
+		case 0:
+			color = "r";
+			break;
+		case 1:
+			color = "g";
+			break;
+		case 2:
+			color = "b";
+			break;
+		}
+
+		if (this->autoRange && subplotIndex == (subplotAmount-1))
 		{
 			this->SetRange('x', matrixRange.x_min, matrixRange.x_max);
 			this->SetRange('y', matrixRange.y_min, matrixRange.y_max);
 		}
 
-		this->Plot(matrix_X_coordinates, matrix_Y_coordinates);
+		this->Axis("xy");
+		this->Plot(matrix_X_coordinates, matrix_Y_coordinates, color.c_str());
+		this->AddLegend("Plot",color.c_str());
 	}
 
+	this->Legend();
 
 }
 
@@ -282,9 +298,15 @@ void MatrixPlot::plotbox(Matrix & referenceMatrix, int subplotIndex)
 		}
 
 		this->Plot(matrix_X_coordinates, matrix_Y_coordinates);
+
 }
 
 void MatrixPlot::setAutoRange(bool option)
 {
 	this->autoRange = option;
 }
+
+void MatrixPlot::saveToFile(const string filename)
+{
+	this->WriteEPS(filename.c_str());
+}

src/matrix-plot.h

@@ -36,6 +36,7 @@ class MatrixPlot : public mglFLTK
 	void plotbox(Matrix &, int = 0);
 
 	void setAutoRange(bool);
+	void saveToFile(const string);
 
 private:
 	bool autoRange;