[Kst] branches/work/kst/portto4/kst/src

[Barth Netterfield]

SVN commit 1235000 by netterfield:

Remove cruft from port from 1.x
-"settings" is not used.  Remove it.  ApplicationSettings took its place.
-emailthread is not implemented.  #ifdef 0 to make this clear.



 M  +2 -3      libkstapp/datawizard.cpp  
 M  +1 -2      libkstapp/plotaxis.cpp  
 M  +0 -1      libkstapp/plotitem.cpp  
 M  +4 -3      libkstmath/colorsequence.cpp  
 M  +2 -0      libkstmath/emailthread.cpp  
 M  +2 -1      libkstmath/emailthread.h  
 M  +4 -4      libkstmath/eventmonitorentry.cpp  
 M  +2 -4      libkstmath/libkstmath.pro  
 M  +0 -1      libkstmath/palette.cpp  
 D             libkstmath/settings.cpp  
 D             libkstmath/settings.h  


--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #1234999:1235000
@@ -29,7 +29,6 @@
 #include "objectstore.h"
 #include "plotitem.h"
 #include "plotiteminterface.h"
-#include "settings.h"
 #include "applicationsettings.h"
 #include "updatemanager.h"
 #include "datasourcepluginmanager.h"
@@ -1016,7 +1015,7 @@
       curve->setColor(color);
       curve->setHasPoints(_pagePlot->drawLinesAndPoints() || _pagePlot->drawPoints());
       curve->setHasLines(_pagePlot->drawLinesAndPoints() || _pagePlot->drawLines());
-      curve->setLineWidth(Settings::globalSettings()->defaultLineWeight);
+      curve->setLineWidth(_dialogDefaults->value("curves/lineWidth",0).toInt());
       curve->setPointType(ptype++ % KSTPOINT_MAXTYPE);
 
       curve->writeLock();
@@ -1092,7 +1091,7 @@
         curve->setYVector(powerspectrum->vY());
         curve->setHasPoints(_pagePlot->drawLinesAndPoints() || _pagePlot->drawPoints());
         curve->setHasLines(_pagePlot->drawLinesAndPoints() || _pagePlot->drawLines());
-        curve->setLineWidth(Settings::globalSettings()->defaultLineWeight);
+        curve->setLineWidth(_dialogDefaults->value("curves/lineWidth",0).toInt());
         curve->setPointType(ptype++ % KSTPOINT_MAXTYPE);
 
         if (!_pageDataPresentation->plotDataPSD() || colors.count() <= indexColor) {
--- branches/work/kst/portto4/kst/src/libkstapp/plotaxis.cpp #1234999:1235000
@@ -13,7 +13,6 @@
 #include "plotaxis.h"
 
 #include "math_kst.h"
-#include "settings.h"
 #include "dialogdefaults.h"
 
 #include <QDate>
@@ -149,7 +148,7 @@
   // utcOffset() is returned in seconds... as it must be since
   //  some time zones are not an integer number of hours offset
   //  from UTC...
-  jd += double(Settings::globalSettings()->utcOffset()) / 86400.0;
+  //jd += double(Settings::globalSettings()->utcOffset()) / 86400.0;
 
   // get the date from the Julian day number
   double jd_day = floor(jd);
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #1234999:1235000
@@ -39,7 +39,6 @@
 
 #include "math_kst.h"
 
-#include "settings.h"
 #include "dialogdefaults.h"
 
 #include <QMenu>
--- branches/work/kst/portto4/kst/src/libkstmath/colorsequence.cpp #1234999:1235000
@@ -12,13 +12,14 @@
 
 // application specific includes
 #include "colorsequence.h"
-#include "settings.h"
 #include <QVector>
 #include <qapplication.h>
 #include <math_kst.h>
 
 namespace Kst {
 
+static const QString KstColorsName("KstColors");
+
 // Default palette that is used if "Kst Colors" is not found.
 static const char *const colors[] = { "red",
                                       "blue",
@@ -61,9 +62,9 @@
 
 
 void ColorSequence::createPalette( ) {
-  if (_palette != Settings::globalSettings()->curveColorSequencePalette) {
+  if (_palette != KstColorsName) {
     _pal.clear();
-    _palette = Settings::globalSettings()->curveColorSequencePalette;
+    _palette = KstColorsName;
 
     for (int i = 0; i < colorcnt; i++) {
       _pal.insert(i, QColor(colors[i]));
--- branches/work/kst/portto4/kst/src/libkstmath/emailthread.cpp #1234999:1235000
@@ -1,3 +1,4 @@
+#if 0
 /***************************************************************************
                               emailthread.cpp
                               ----------------
@@ -75,3 +76,4 @@
 
 }
 // vim: ts=2 sw=2 et
+#endif
--- branches/work/kst/portto4/kst/src/libkstmath/emailthread.h #1234999:1235000
@@ -1,3 +1,4 @@
+#if 0
 /***************************************************************************
  *                                                                         *
  *   copyright : (C) 2007 The University of Toronto                        *
@@ -58,5 +59,5 @@
 
 }
 #endif
-
+#endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstmath/eventmonitorentry.cpp #1234999:1235000
@@ -285,10 +285,10 @@
     Debug::self()->log(logMessage, _level);
   }
 
-  if (_logEMail && !_eMailRecipients.isEmpty()) {
-    EMailThread* thread = new EMailThread(_eMailRecipients, "Kst Event Monitoring Notification", logMessage);
-    thread->send();
-  }
+  //if (_logEMail && !_eMailRecipients.isEmpty()) {
+  //  EMailThread* thread = new EMailThread(_eMailRecipients, "Kst Event Monitoring Notification", logMessage);
+  //  thread->send();
+  //}
 
 //FIXME ELOG need to be implemented.
 //   if (_logELOG) {
--- branches/work/kst/portto4/kst/src/libkstmath/libkstmath.pro #1234999:1235000
@@ -70,8 +70,7 @@
     psdcalculator.cpp \
     psdfactory.cpp \
     relation.cpp \
-    relationfactory.cpp \
-    settings.cpp
+    relationfactory.cpp
 
 HEADERS += \
     basicplugin.h \
@@ -111,8 +110,7 @@
     psd.h \
     psdcalculator.h \
     relation.h \
-    relationfactory.h \
-    settings.h
+    relationfactory.h
 
 #LEXSOURCES += escan.l
 #YACCSOURCES += eparse.y
--- branches/work/kst/portto4/kst/src/libkstmath/palette.cpp #1234999:1235000
@@ -12,7 +12,6 @@
 
 // application specific includes
 #include "palette.h"
-#include "settings.h"
 #include <QVector>
 #include <qapplication.h>
 #include <math_kst.h>