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

List:       kde-commits
Subject:    [labplot] src/kdefrontend/dockwidgets: Fixes.
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2014-10-31 20:34:55
Message-ID: E1XkIuN-0008KD-Sc () scm ! kde ! org
[Download RAW message or body]

Git commit 6ff19d28d3aab7a3fdcf10dcef008e22e208f7c3 by Alexander Semke.
Committed on 31/10/2014 at 20:34.
Pushed by asemke into branch 'master'.

Fixes.

M  +3    -7    src/kdefrontend/dockwidgets/AxisDock.cpp
M  +3    -3    src/kdefrontend/dockwidgets/XYCurveDock.cpp
M  +2    -2    src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
M  +3    -4    src/kdefrontend/dockwidgets/XYFitCurveDock.cpp

http://commits.kde.org/labplot/6ff19d28d3aab7a3fdcf10dcef008e22e208f7c3

diff --git a/src/kdefrontend/dockwidgets/AxisDock.cpp \
b/src/kdefrontend/dockwidgets/AxisDock.cpp index 0ffa139..25fbbcb 100644
--- a/src/kdefrontend/dockwidgets/AxisDock.cpp
+++ b/src/kdefrontend/dockwidgets/AxisDock.cpp
@@ -334,11 +334,8 @@ void AxisDock::setModel(){
 	list<<"Column";
 	m_aspectTreeModel->setSelectableAspects(list);
 
-	m_initializing=true;
 	cbMajorTicksColumn->setModel(m_aspectTreeModel);
 	cbMinorTicksColumn->setModel(m_aspectTreeModel);
-
-	m_initializing=false;
 }
 
 /*!
@@ -348,6 +345,9 @@ void AxisDock::setAxes(QList<Axis*> list){
   	m_initializing=true;
   	m_axesList=list;
   	m_axis=list.first();
+	Q_ASSERT(m_axis);
+	m_aspectTreeModel =  new AspectTreeModel(m_axis->project());
+	this->setModel();
 
 	labelWidget->setAxes(list);
 
@@ -372,8 +372,6 @@ void AxisDock::setAxes(QList<Axis*> list){
 		cbMinorTicksColumn->setCurrentModelIndex(QModelIndex());
 	}
 
-	m_aspectTreeModel =  new AspectTreeModel(m_axis->project());
-	this->setModel();
 
   	//show the properties of the first axis
 	this->load();
@@ -846,7 +844,6 @@ void AxisDock::majorTicksLineStyleChanged(int index){
 }
 
 void AxisDock::majorTicksColumnChanged(const QModelIndex& index){
-	Q_UNUSED(index);
 	if (m_initializing)
 		return;
 
@@ -987,7 +984,6 @@ void AxisDock::minorTicksIncrementChanged(){
 }
 
 void AxisDock::minorTicksColumnChanged(const QModelIndex& index){
-	Q_UNUSED(index);
 	if (m_initializing)
 		return;
 
diff --git a/src/kdefrontend/dockwidgets/XYCurveDock.cpp \
b/src/kdefrontend/dockwidgets/XYCurveDock.cpp index f3dd44e..6d3c6cf 100644
--- a/src/kdefrontend/dockwidgets/XYCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYCurveDock.cpp
@@ -436,7 +436,6 @@ void XYCurveDock::setModel() {
 	cbYErrorMinusColumn->setSelectableClasses(list);
 	cbYErrorPlusColumn->setSelectableClasses(list);
 
-	m_initializing=true;
 	if (cbXColumn) {
 		cbXColumn->setModel(m_aspectTreeModel);
 		cbYColumn->setModel(m_aspectTreeModel);
@@ -455,10 +454,11 @@ void XYCurveDock::setCurves(QList<XYCurve*> list){
 	m_initializing=true;
 	m_curvesList=list;
 	m_curve=list.first();
-	initGeneralTab();
-	initTabs();
+	Q_ASSERT(m_curve);
 	m_aspectTreeModel = new AspectTreeModel(m_curve->project());
 	setModel();
+	initGeneralTab();
+	initTabs();
 	m_initializing=false;
 }
 
diff --git a/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp \
b/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp index 5d8263f..0232087 100644
--- a/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
@@ -117,10 +117,10 @@ void XYEquationCurveDock::setCurves(QList<XYCurve*> list){
 	m_curve=list.first();
 	m_equationCurve = dynamic_cast<XYEquationCurve*>(m_curve);
 	Q_ASSERT(m_equationCurve);
-	initGeneralTab();
-	initTabs();
 	m_aspectTreeModel =  new AspectTreeModel(m_curve->project());
 	XYCurveDock::setModel();
+	initGeneralTab();
+	initTabs();
 	uiGeneralTab.pbRecalculate->setEnabled(false);
 	m_initializing=false;
 }
diff --git a/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp \
b/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp index 26b3e26..b10abd8 100644
--- a/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp
@@ -173,11 +173,9 @@ void XYFitCurveDock::setModel() {
 	cbYDataColumn->setSelectableClasses(list);
 	cbWeightsColumn->setSelectableClasses(list);
 
-	m_initializing=true;
 	cbXDataColumn->setModel(m_aspectTreeModel);
 	cbYDataColumn->setModel(m_aspectTreeModel);
 	cbWeightsColumn->setModel(m_aspectTreeModel);
-	m_initializing=false;
 
 	connect( cbXDataColumn, SIGNAL(currentModelIndexChanged(QModelIndex)), this, \
SLOT(xDataColumnChanged(QModelIndex)) );  connect( cbYDataColumn, \
SIGNAL(currentModelIndexChanged(QModelIndex)), this, \
SLOT(yDataColumnChanged(QModelIndex)) ); @@ -194,11 +192,11 @@ void \
XYFitCurveDock::setCurves(QList<XYCurve*> list){  m_curve=list.first();
 	m_fitCurve = dynamic_cast<XYFitCurve*>(m_curve);
 	Q_ASSERT(m_fitCurve);
+	m_aspectTreeModel = new AspectTreeModel(m_curve->project());
+	this->setModel();
 	m_fitData = m_fitCurve->fitData();
 	initGeneralTab();
 	initTabs();
-	m_aspectTreeModel =  new AspectTreeModel(m_curve->project());
-	this->setModel();
 	m_initializing=false;
 }
 
@@ -528,6 +526,7 @@ void XYFitCurveDock::recalculateClicked() {
 }
 
 void XYFitCurveDock::enableRecalculate() const {
+	qDebug()<<"XYFitCurveDock::enableRecalculate";
 	if (m_initializing)
 		return;
 


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