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

[Peter Kümmel]

SVN commit 1319395 by kuemmel:

also build with msvc 2012

 M  +2 -0      libkst/math_kst.h  
 M  +6 -6      libkstapp/axistab.cpp  
 M  +2 -2      libkstapp/axistab.ui  
 M  +6 -6      libkstapp/plotaxis.cpp  
 M  +1 -1      libkstapp/plotaxis.h  


--- branches/work/kst/portto4/kst/src/libkst/math_kst.h #1319394:1319395
@@ -101,6 +101,8 @@
 #ifndef isinf
 #define isinf !_finite
 #endif
+template<class T>
+bool isfinite(T value) { return !isinf(value); }
 #endif
 
 #if 0
--- branches/work/kst/portto4/kst/src/libkstapp/axistab.cpp #1319394:1319395
@@ -78,7 +78,7 @@
   connect(_scaleReverse, SIGNAL(stateChanged(int)), this, SIGNAL(modified()));
   connect(_scaleDisplayType, SIGNAL(currentIndexChanged(int)), this, SIGNAL(modified()));
   connect(_scaleInterpretType, SIGNAL(currentIndexChanged(int)), this, SIGNAL(modified()));
-  connect(_timezone, SIGNAL(currentIndexChanged(int)), this, SIGNAL(modified()));
+  connect(_timeZone, SIGNAL(currentIndexChanged(int)), this, SIGNAL(modified()));
 
   connect(_axisMinorTickCount, SIGNAL(valueChanged(int)), this, SIGNAL(modified()));
 
@@ -89,7 +89,7 @@
 
   connect(_rotation, SIGNAL(valueChanged(int)), this, SIGNAL(modified()));
 
-  _timezone->addItems(KstTimeZone::tzList());
+  _timeZone->addItems(KstTimeZone::tzList());
 
   _scaleLog->setProperty("si","&Logarithmic");
   _scaleReverse->setProperty("si","&Reverse");
@@ -430,17 +430,17 @@
 
 
 QString AxisTab::timezone() const {
-  return _timezone->currentText();
+  return _timeZone->currentText();
 }
 
 
 bool AxisTab::timezoneDirty() const {
-  return _timezone->currentIndex() != -1;
+  return _timeZone->currentIndex() != -1;
 }
 
 
 void AxisTab::setTimezone(QString timezone) {
-  _timezone->setCurrentIndex(_timezone->findText(timezone));
+  _timeZone->setCurrentIndex(_timeZone->findText(timezone));
 }
 
 
@@ -530,7 +530,7 @@
   _rotation->clear();
   _scaleInterpretType->setCurrentIndex(-1);
   _scaleDisplayType->setCurrentIndex(-1);
-  _timezone->setCurrentIndex(-1);
+  _timeZone->setCurrentIndex(-1);
 
   _drawAxisMajorTicks->setCheckState(Qt::PartiallyChecked);
   _drawAxisMajorGridLines->setCheckState(Qt::PartiallyChecked);
--- branches/work/kst/portto4/kst/src/libkstapp/axistab.ui #1319394:1319395
@@ -126,7 +126,7 @@
          </widget>
         </item>
         <item row="2" column="3">
-         <widget class="QComboBox" name="_timezone">
+         <widget class="QComboBox" name="_timeZone">
           <property name="enabled">
            <bool>false</bool>
           </property>
@@ -874,7 +874,7 @@
   <connection>
    <sender>_scaleInterpret</sender>
    <signal>toggled(bool)</signal>
-   <receiver>_timezone</receiver>
+   <receiver>_timeZone</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
--- branches/work/kst/portto4/kst/src/libkstapp/plotaxis.cpp #1319394:1319395
@@ -159,7 +159,7 @@
   // gmtOffset() is returned in seconds... as it must be since
   //  some time zones are not an integer number of hours offset
   //  from UTC...
-  jd += (_timezone.gmtOffset(convertJDtoCTime(jd)))/(3600.0*24.0);
+  jd += (_timeZone.gmtOffset(convertJDtoCTime(jd)))/(3600.0*24.0);
 
   // get the date from the Julian day number
   double jd_day = floor(jd);
@@ -538,13 +538,13 @@
 
 
 QString PlotAxis::timezoneName() const {
-  return _timezone.tzName();
+  return _timeZone.tzName();
 }
 
 
 void PlotAxis::setTimezoneName(QString timezone) {
-  if (_timezone.tzName() != timezone) {
-    _timezone.setTZ(timezone);
+  if (_timeZone.tzName() != timezone) {
+    _timeZone.setTZ(timezone);
     _dirty = true;
   }
 }
@@ -1177,8 +1177,8 @@
   xml.writeAttribute("significantdigits", QVariant(axisSignificantDigits()).toString());
   xml.writeAttribute("rotation", QVariant(axisLabelRotation()).toString());
   xml.writeAttribute("zoommode", QVariant(axisZoomMode()).toString());
-  xml.writeAttribute("timezonename", _timezone.tzName());
-  xml.writeAttribute("timezoneoffset", QVariant(_timezone.gmtOffset(0)).toString());
+  xml.writeAttribute("timezonename", _timeZone.tzName());
+  xml.writeAttribute("timezoneoffset", QVariant(_timeZone.gmtOffset(0)).toString());
   _axisPlotMarkers.saveInPlot(xml);
   xml.writeEndElement();
 }
--- branches/work/kst/portto4/kst/src/libkstapp/plotaxis.h #1319394:1319395
@@ -176,7 +176,7 @@
     bool _axisInterpret;
     AxisDisplayType _axisDisplay;
     AxisInterpretationType _axisInterpretation;
-    KstTimeZone _timezone;
+    KstTimeZone _timeZone;
 
     MajorTickMode _axisMajorTickMode;
     MajorTickMode _axisOverrideMajorTicks;