Move EquationHighlighter into its own files

svn path=/trunk/KDE/kdeedu/kmplot/; revision=902520

kmplot/CMakeLists.txt

@@ -13,6 +13,7 @@ set(kmplotpart_PART_SRCS
    xparser.cpp 
    equationedit.cpp
    equationeditwidget.cpp
+   equationhighlighter.cpp
    function.cpp
    view.cpp 
    maindlg.cpp 

kmplot/equationedit.cpp

@@ -39,6 +39,7 @@
 #include <assert.h>
 
 #include "equationeditwidget.h"
+#include "equationhighlighter.h"
 
 CharMap EquationEdit::m_replaceMap;
 
@@ -52,150 +53,6 @@ class EquationEditorWidget : public QWidget, public Ui::EquationEditor
 };
 
 
-//BEGIN class EquationHighlighter
-EquationHighlighter::EquationHighlighter( EquationEdit * parent )
-	: QSyntaxHighlighter( parent->m_equationEditWidget ),
-	m_parent( parent )
-{
-	m_errorPosition = -1;
-}
-
-
-EquationHighlighter::~ EquationHighlighter( )
-{
-}
-
-
-void EquationHighlighter::highlightBlock( const QString & text )
-{
-	// Good color defaults borrowed from Abakus - thanks! :)
-	
-	m_parent->checkTextValidity();
-	
-	if ( text.isEmpty() )
-		return;
-	
-	QTextCharFormat number;
-	number.setForeground( QColor( 0, 0, 127 ) );
-	
-	QTextCharFormat function;
-	function.setForeground( QColor( 85, 0, 0 ) );
-	
-	QTextCharFormat variable;
-	variable.setForeground( QColor( 0, 85, 0 ) );
-	
-	QTextCharFormat matchedParenthesis;
-	matchedParenthesis.setBackground( QColor( 255, 255, 183 ) );
-	
-	QTextCharFormat other;
-	
-	QStringList variables = m_parent->m_equation->variables();
-	QStringList functions = XParser::self()->predefinedFunctions(true) + XParser::self()->userFunctions();
-	
-	for ( int i = 0; i < text.length(); ++i )
-	{
-		QString remaining = text.right( text.length() - i );
-		
-		bool found = false;
-		
-		foreach ( const QString &var, variables )
-		{
-			if ( remaining.startsWith( var ) )
-			{
-				setFormat( i, var.length(), variable );
-				i += var.length()-1;
-				found = true;
-				break;
-			}
-		}
-		if ( found )
-			continue;
-		
-		foreach ( const QString &f, functions )
-		{
-			if ( remaining.startsWith( f ) )
-			{
-				setFormat( i, f.length(), function );
-				i += f.length()-1;
-				found = true;
-				break;
-			}
-		}
-		if ( found )
-			continue;
-		
-		ushort u = text[i].unicode();
-		bool isFraction = (u >= 0xbc && u <= 0xbe) || (u >= 0x2153 && u <= 0x215e);
-		bool isPower = (u >= 0xb2 && u <= 0xb3) || (u == 0x2070) || (u >= 0x2074 && u <= 0x2079);
-		bool isDigit = text[i].isDigit();
-		bool isDecimalPoint = text[i] == QLocale().decimalPoint();
-		
-		if ( isFraction || isPower || isDigit || isDecimalPoint )
-			setFormat( i, 1, number );
-		
-		else
-			setFormat( i, 1, other );
-	}
-	
-	
-	//BEGIN highlight matched brackets
-	int cursorPos = m_parent->m_equationEditWidget->textCursor().position();
-	if ( cursorPos < 0 )
-		cursorPos = 0;
-	
-	// Adjust cursorpos to allow for a bracket before the cursor position
-	if ( cursorPos >= text.size() )
-		cursorPos = text.size()-1;
-	else if ( cursorPos > 0 && (text[cursorPos-1] == '(' || text[cursorPos-1] == ')') )
-		cursorPos--;
-	
-	bool haveOpen =  text[cursorPos] == '(';
-	bool haveClose = text[cursorPos] == ')';
-	
-	if ( (haveOpen || haveClose) && m_parent->hasFocus() )
-	{
-		// Search for the other bracket
-		
-		int inc = haveOpen ? 1 : -1; // which direction to search in
-		
-		int level = 0;
-		for ( int i = cursorPos; i >= 0 && i < text.size(); i += inc )
-		{
-			if ( text[i] == ')' )
-				level--;
-			else if ( text[i] == '(' )
-				level++;
-			
-			if ( level == 0 )
-			{
-				// Matched!
-				setFormat( cursorPos, 1, matchedParenthesis );
-				setFormat( i, 1, matchedParenthesis );
-				break;
-			}
-		}
-	}
-	//END highlight matched brackets
-	
-	
-	if ( m_errorPosition != -1 )
-	{
-		QTextCharFormat error;
-		error.setForeground( Qt::red );
-	
-		setFormat( m_errorPosition, 1, error );
-	}
-}
-
-
-void EquationHighlighter::setErrorPosition( int position )
-{
-	m_errorPosition = position;
-}
-//END class EquationHighlighter
-
-
-
 //BEGIN class EquationEdit
 EquationEdit::EquationEdit( QWidget * parent )
 	: QWidget( parent )

kmplot/equationedit.h

@@ -30,42 +30,18 @@
 #include <kdialog.h>
 
 #include <QMap>
-#include <QSyntaxHighlighter>
-
 
 class Equation;
 class EquationEdit;
 class EquationEditWidget;
 class EquationEditor;
 class EquationEditorWidget;
+class EquationHighlighter;
 class QPushButton;
 
 typedef QMap<QChar, QChar> CharMap;
 
 
-/**
- * \author David Saxton
- */
-class EquationHighlighter : public QSyntaxHighlighter
-{
-	public:
-		EquationHighlighter( EquationEdit * parent );
-		~EquationHighlighter();
-		
-		/**
-		 * This is used to indicate the position where the error occurred.
-		 * If \p position is negative, then no error will be shown.
-		 */
-		void setErrorPosition( int position );
-		
-	protected:
-		virtual void highlightBlock( const QString & text );
-		
-		int m_errorPosition;
-		EquationEdit * m_parent;
-};
-
-
 /**
  * A line edit for equations that also does syntax highlighting, error checking,
  * etc, and provides a button for invoking an advanced equation editor.

kmplot/equationhighlighter.cpp

+/*
+* KmPlot - a math. function plotter for the KDE-Desktop
+*
+* Copyright (C)      2006  David Saxton <david@bluehaze.org>
+*               
+* This file is part of the KDE Project.
+* KmPlot is part of the KDE-EDU Project.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "equationhighlighter.h"
+
+#include <QtCore/QLocale>
+
+#include "equationedit.h"
+#include "equationeditwidget.h"
+#include "xparser.h"
+
+
+EquationHighlighter::EquationHighlighter(EquationEdit* parent)
+	: QSyntaxHighlighter(parent->m_equationEditWidget),
+	m_parent(parent)
+{
+	m_errorPosition = -1;
+}
+
+
+EquationHighlighter::~ EquationHighlighter() { }
+
+
+void EquationHighlighter::highlightBlock(const QString& text) {
+	// Good color defaults borrowed from Abakus - thanks! :)
+	
+	m_parent->checkTextValidity();
+	
+	if (text.isEmpty())
+		return;
+	
+	QTextCharFormat number;
+	number.setForeground(QColor(0, 0, 127));
+	
+	QTextCharFormat function;
+	function.setForeground(QColor(85, 0, 0));
+	
+	QTextCharFormat variable;
+	variable.setForeground(QColor(0, 85, 0));
+	
+	QTextCharFormat matchedParenthesis;
+	matchedParenthesis.setBackground(QColor(255, 255, 183));
+	
+	QTextCharFormat other;
+	
+	QStringList variables = m_parent->m_equation->variables();
+	QStringList functions = XParser::self()->predefinedFunctions(true) + XParser::self()->userFunctions();
+	
+	for (int i = 0; i < text.length(); ++i) {
+		QString remaining = text.right(text.length() - i);
+		
+		bool found = false;
+		
+		foreach (const QString& var, variables) {
+			if (remaining.startsWith(var)) {
+				setFormat(i, var.length(), variable);
+				i += var.length() - 1;
+				found = true;
+				break;
+			}
+		}
+		if (found)
+			continue;
+		
+		foreach (const QString& f, functions) {
+			if (remaining.startsWith(f)) {
+				setFormat(i, f.length(), function);
+				i += f.length() - 1;
+				found = true;
+				break;
+			}
+		}
+		if (found)
+			continue;
+		
+		ushort u = text[i].unicode();
+		bool isFraction = (u >= 0xbc && u <= 0xbe) || (u >= 0x2153 && u <= 0x215e);
+		bool isPower = (u >= 0xb2 && u <= 0xb3) || (u == 0x2070) || (u >= 0x2074 && u <= 0x2079);
+		bool isDigit = text[i].isDigit();
+		bool isDecimalPoint = text[i] == QLocale().decimalPoint();
+		
+		if (isFraction || isPower || isDigit || isDecimalPoint)
+			setFormat(i, 1, number);
+		else
+			setFormat(i, 1, other);
+	}
+	
+	//BEGIN highlight matched brackets
+	int cursorPos = m_parent->m_equationEditWidget->textCursor().position();
+	if (cursorPos < 0)
+		cursorPos = 0;
+	
+	// Adjust cursorpos to allow for a bracket before the cursor position
+	if (cursorPos >= text.size())
+		cursorPos = text.size() - 1;
+	else if (cursorPos > 0 && (text[cursorPos-1] == '(' || text[cursorPos-1] == ')'))
+		cursorPos--;
+	
+	bool haveOpen =  text[cursorPos] == '(';
+	bool haveClose = text[cursorPos] == ')';
+	
+	if ((haveOpen || haveClose) && m_parent->hasFocus()) {
+		// Search for the other bracket
+		
+		int inc = haveOpen ? 1 : -1; // which direction to search in
+		
+		int level = 0;
+		for (int i = cursorPos; i >= 0 && i < text.size(); i += inc) {
+			if (text[i] == ')')
+				level--;
+			else if (text[i] == '(')
+				level++;
+			
+			if (level == 0) {
+				// Matched!
+				setFormat(cursorPos, 1, matchedParenthesis);
+				setFormat(i, 1, matchedParenthesis);
+				break;
+			}
+		}
+	}
+	//END highlight matched brackets
+	
+	if (m_errorPosition != -1) {
+		QTextCharFormat error;
+		error.setForeground(Qt::red);
+	
+		setFormat(m_errorPosition, 1, error);
+	}
+}
+
+
+void EquationHighlighter::setErrorPosition(int position) {
+	m_errorPosition = position;
+}

kmplot/equationhighlighter.h

+/*
+* KmPlot - a math. function plotter for the KDE-Desktop
+*
+* Copyright (C)      2006  David Saxton <david@bluehaze.org>
+*               
+* This file is part of the KDE Project.
+* KmPlot is part of the KDE-EDU Project.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*
+*/
+
+#ifndef EQUATIONHIGHLIGHTER_H
+#define EQUATIONHIGHLIGHTER_H
+
+#include <QtGui/QSyntaxHighlighter>
+
+class EquationEdit;
+class QString;
+
+
+/**
+ * \author David Saxton
+ */
+class EquationHighlighter : public QSyntaxHighlighter
+{
+	public:
+		EquationHighlighter(EquationEdit* parent);
+		~EquationHighlighter();
+		
+		/**
+		 * This is used to indicate the position where the error occurred.
+		 * If \p position is negative, then no error will be shown.
+		 */
+		void setErrorPosition(int position);
+		
+	protected:
+		virtual void highlightBlock(const QString& text);
+		
+		int m_errorPosition;
+		EquationEdit* m_parent;
+};
+
+#endif