[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Honour line type and width for histograms.
Disable the point style Type: label when applicable.


  M +2 -2      curveappearancewidget.ui   1.13
  M +1 -0      curveappearancewidget.ui.h   1.12
  M +5 -0      ksthistogram.cpp   1.22
  M +42 -28    ksthsdialog_i.cpp   1.52


--- kdeextragear-2/kst/kst/curveappearancewidget.ui  #1.12:1.13
@@ -10,5 +10,5 @@
             <y>0</y>
             <width>371</width>
-            <height>108</height>
+            <height>110</height>
         </rect>
     </property>
@@ -70,5 +70,5 @@
                 <widget class="QLabel" row="1" column="1">
                     <property name="name">
-                        <cstring>textLabel2_2</cstring>
+                        <cstring>_textLabelPointStyle</cstring>
                     </property>
                     <property name="sizePolicy">

--- kdeextragear-2/kst/kst/curveappearancewidget.ui.h  #1.11:1.12
@@ -139,4 +139,5 @@ void CurveAppearanceWidget::setUsePoints
   _showPoints->setEnabled(usePoints);
   _combo->setEnabled(usePoints);
+  _textLabelPointStyle->setEnabled(usePoints);
   if (!usePoints && _showPoints->isChecked()) {
     _showPoints->setChecked(false);

--- kdeextragear-2/kst/kst/ksthistogram.cpp  #1.21:1.22
@@ -37,4 +37,9 @@ KstHistogram::KstHistogram(const QString
                            const QColor &in_color)
 : KstBaseCurve() {
+  setHasPoints(false);
+  setHasLines(true);
+  setLineWidth(0);
+  setLineStyle(0);
+
   commonConstructor(in_tag, in_V, xmin_in, xmax_in, in_n_bins, in_norm_mode,
                     in_color);

--- kdeextragear-2/kst/kst/ksthsdialog_i.cpp  #1.51:1.52
@@ -146,4 +146,5 @@ bool KstHsDialogI::new_I() {
   KstHistogramPtr hs;
   double new_max, new_min, m;
+  bool bRetVal = false;
   int new_n_bins;
   KstHsNormType new_norm_mode;
@@ -206,6 +207,14 @@ bool KstHsDialogI::new_I() {
                           new_n_bins, new_norm_mode,
                           _curveAppearance->color());
+    if (hs) {
+      hs->setHasPoints(_curveAppearance->showPoints());
+      hs->setHasLines(_curveAppearance->showLines());
+      hs->setLineWidth(_curveAppearance->lineWidth());
+      hs->setLineStyle(_curveAppearance->lineStyle());
+      hs->Point.setType(_curveAppearance->pointType());
+    }
   }
 
+  if (hs) {
   Kst2DPlotPtr plot;
   KstViewWindow *w = dynamic_cast<KstViewWindow*>(KstApp::inst()->findWindow(_curvePlacement->_plotWindow->currentText()));
@@ -240,5 +249,10 @@ bool KstHsDialogI::new_I() {
   hs = 0L;
   emit modified();
-  return true;
+    bRetVal = true;
+  } else {
+    bRetVal = false;
+  }
+  
+  return bRetVal;
 }