Differential D6074 Diff 15362 src/backends/qalculate/qalculateexpression.cpp

Changeset View

Standalone View

src/backends/qalculate/qalculateexpression.cpp

Context not available.
66		66
67	void QalculateExpression::evaluate()	67		void QalculateExpression::evaluate()
68	{	68		{
		69		/*
		70		Use Api for:
		71		* help
		72		* plot
		73		* saveVariables
		74		* loadVariables
		75		Use qalc for any other command
		76		*/
69	setStatus(Cantor::Expression::Computing);	77		setStatus(Cantor::Expression::Computing);
70	m_message = QLatin1String("");
71
72	if (command().isEmpty()) {	78		if (command().isEmpty()) {
		79		setStatus(Cantor::Expression::Done);
73	return;	80		return;
74	}	81		}
75		82
76	QStringList commands=command().split(QLatin1Char('\n'));
77	QString resultString;
78		83
		84		QStringList commands = command().split(QLatin1Char('\n'));
79	foreach(const QString& command, commands)	85		foreach(const QString& command, commands)
80	{	86		{
81	if (command.contains(QLatin1String("help"))) {	87		if (command.contains(QLatin1String("help"))) {
Context not available.
102	evaluateLoadVariablesCommand();	108		evaluateLoadVariablesCommand();
103	return;	109		return;
			chinmoyrUnsubmitted Not Done You should comment out this line. It's only for testing isn't it? chinmoyr: You should comment out this line. It's only for testing isn't it?
			rishabhgAuthorUnsubmitted Not Done I am keeping the debug statements for now. They will be removed at some point later rishabhg: I am keeping the debug statements for now. They will be removed at some point later
104	}	110		}
		111		}
		112		// we are here because the commands entered by user are regular commands. We would have returned by now otherwise
		113		QalculateSession* currentSession = dynamic_cast<QalculateSession*>(session());
		114		currentSession->runExpression();
105		115
106	string expression = unlocalizeExpression(command);	116		}
107
108	qDebug() << "EXPR: " << QLatin1String(expression.c_str());
109
110	EvaluationOptions eo = evaluationOptions();
111
112	MathStructure result = CALCULATOR->calculate(expression, eo);
113
114	// update the answer variables
115	static_cast<QalculateSession*>(session())->setLastResult(result);
116
117	// error handling
118	if (checkForCalculatorMessages() & (MSG_WARN \| MSG_WARN))
119	return;
120
121	updateVariables(CALCULATOR->parse(expression, eo.parse_options));
122
123	QSharedPointer<PrintOptions> po = printOptions();
124
125	result.format(*po);
126		117
127	resultString+=QLatin1String(result.print(*po).c_str()) + QLatin1Char('\n');	118		void QalculateExpression::parseOutput(QString& output)
		119		{
		120		output.remove(QLatin1String(">"));
		121		output = output.trimmed();
128		122
129	}	123		qDebug() << "output from qalc for command: " << command() << " " << output << endl;
		124		setResult(new Cantor::TextResult(output));
		125		setStatus(Cantor::Expression::Done);
		126		}
130		127
131	setResult(new Cantor::TextResult(resultString));	128		void QalculateExpression::parseError(QString& error)
132	setStatus(Done);	129		{
		130		error.remove(QLatin1String(">"));
		131		error = error.trimmed();
		132		qDebug() << "Error from qalc for command: " << command() << " " << error << endl;
		133		setErrorMessage(error);
			chinmoyrUnsubmitted Not Done same here. chinmoyr: same here.
		134		setStatus(Cantor::Expression::Error);
133	}	135		}
134		136
135	void QalculateExpression::evaluateSaveVariablesCommand()	137		void QalculateExpression::evaluateSaveVariablesCommand()
Context not available.