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

List:       kde-commits
Subject:    branches/extragear/kde3/graphics/kst/src/libkstapp
From:       Andrew Walker <arwalker () sumusltd ! com>
Date:       2010-01-26 0:55:49
Message-ID: 1264467349.646990.3135.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1080293 by arwalker:

CCBUG:224225 remove automatic assignment of weight vector in interactive non-linear \
fit from curve

 M  +5 -8      kstfitdialog_i.cpp  


--- branches/extragear/kde3/graphics/kst/src/libkstapp/kstfitdialog_i.cpp \
#1080292:1080293 @@ -159,7 +159,7 @@
   if (w && w->view()->findChild(_strPlotName)) {
     Kst2DPlotPtr plot = kst_cast<Kst2DPlot>(w->view()->findChild(_strPlotName));
     if (plot) {
-      QString strLabel = QString("[%1]").arg(plugin->tagName());      
+      QString strLabel = QString("[%1]").arg(plugin->tagName());
       KstViewLabelPtr label = new KstViewLabel();
 
       label->setTransparent(true);
@@ -242,11 +242,9 @@
 
 
 void KstFitDialogI::generateEntries(bool input, int& cnt, QWidget *parent, \
                QGridLayout *grid, const QValueList<Plugin::Data::IOValue>& table) {
-  const QString& pluginName = _pluginList[_w->PluginCombo->currentItem()];
-  const Plugin::Data& pluginData = \
PluginCollection::self()->pluginList()[PluginCollection::self()->pluginNameList()[pluginName]];
                
-  bool isWeighted = pluginData._isFitWeighted;
-
-  QString scalarLabelTemplate, vectorLabelTemplate, stringLabelTemplate;
+  QString scalarLabelTemplate;
+  QString vectorLabelTemplate;
+  QString stringLabelTemplate;
   int iInputVector = 0;
 
   if (input) {
@@ -277,8 +275,7 @@
         string = true;
         break;
       case Plugin::Data::IOValue::TableType:
-        if (input && ( iInputVector == 0 || iInputVector == 1 || 
-                     ( isWeighted && iInputVector == 2 && !_evector.isEmpty() ) ) ) \
{ +        if (input && ( iInputVector == 0 || iInputVector == 1 ) ) {
           fixed = true;
         }
         if ((*it)._subType == Plugin::Data::IOValue::FloatSubType ||


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