[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kalgebra
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2010-10-26 16:24:21
Message-ID: 20101026162421.48EF4AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190018 by apol:

Use the same Variables module for 2D functions.


 M  +2 -0      analitzagui/variablesmodel.h  
 M  +2 -2      mobile/functionsdialog.cpp  
 M  +1 -1      mobile/functionsdialog.h  
 M  +1 -1      mobile/uiconfig.cpp  


--- trunk/KDE/kdeedu/kalgebra/analitzagui/variablesmodel.h #1190017:1190018
@@ -45,6 +45,8 @@
 		
 		void insertVariable(const QString& name, const Analitza::Expression& value);
 		void setEditable(bool ed) { m_editable=ed; }
+		
+		Analitza::Variables* variables() const { return m_vars; }
 	public slots:
 		/** Updates the variables information */
 		void updateInformation();
--- trunk/KDE/kdeedu/kalgebra/mobile/functionsdialog.cpp #1190017:1190018
@@ -27,8 +27,8 @@
 #include <analitzagui/functionedit.h>
 #include <analitza/variables.h>
 
-FunctionsDialog::FunctionsDialog(FunctionsModel* model, QWidget* parent)
-	: QDialog(parent), m_model(model), m_vars(new Analitza::Variables)
+FunctionsDialog::FunctionsDialog(FunctionsModel* model, Analitza::Variables* vars, QWidget* parent)
+	: QDialog(parent), m_model(model), m_vars(vars)
 {
 	setLayout(new QVBoxLayout);
 	
--- trunk/KDE/kdeedu/kalgebra/mobile/functionsdialog.h #1190017:1190018
@@ -33,7 +33,7 @@
 {
 	Q_OBJECT
 	public:
-		explicit FunctionsDialog(FunctionsModel* model, QWidget* parent = 0);
+		explicit FunctionsDialog(FunctionsModel* model, Analitza::Variables* vars, QWidget* parent = 0);
 		
 	public slots:
 		void addFunction();
--- trunk/KDE/kdeedu/kalgebra/mobile/uiconfig.cpp #1190017:1190018
@@ -47,7 +47,7 @@
 WIDGET_CREATOR(QDoubleSpinBox)
 WIDGET_CREATOR(QPushButton)
 WIDGET_CREATOR(TreeView)
-WIDGET_CREATOR(FunctionsDialog, m_app->functionsModel())
+WIDGET_CREATOR(FunctionsDialog, m_app->functionsModel(), m_app->variablesModel()->variables())
 WIDGET_CREATOR(Graph2D, m_app->functionsModel())
 
 QScriptValue UiConfig::variablesModel()
[prev in list] [next in list] [prev in thread] [next in thread]