[Libreoffice-commits] core.git: chart2/source

Laurent Balland-Poirier laurent.balland-poirier at laposte.net
Sun Nov 24 23:17:09 PST 2013


 chart2/source/controller/dialogs/res_Trendline.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 382ceea544b612b20946c8bf8a85e8abed7b4c60
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Sun Nov 24 22:38:04 2013 +0100

    fdo#40315 Improve UI for moving average trendline
    
    If moving average trendline is selected, show equation is
    uncheked, and all options disable
    
    Change-Id: Ic25c09b8c8410a12ac9f14cb0ba7833f304053ee
    Reviewed-on: https://gerrit.libreoffice.org/6796
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 7a4c495..36a79db 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -292,6 +292,18 @@ void TrendlineResources::FillValueSets()
 
 void TrendlineResources::UpdateControlStates()
 {
+    bool bMovingAverage = ( m_eTrendLineType == CHREGRESS_MOVING_AVERAGE );
+    m_pNF_ExtrapolateForward->Enable(!bMovingAverage);
+    m_pNF_ExtrapolateBackward->Enable(!bMovingAverage);
+    m_pCB_SetIntercept->Enable(!bMovingAverage);
+    m_pNF_InterceptValue->Enable(!bMovingAverage);
+    if(bMovingAverage)
+    {
+        m_pCB_ShowEquation->SetState( STATE_NOCHECK );
+        m_pCB_ShowCorrelationCoeff->SetState( STATE_NOCHECK );
+    }
+    m_pCB_ShowEquation->Enable(!bMovingAverage);
+    m_pCB_ShowCorrelationCoeff->Enable(!bMovingAverage);
 }
 
 } //  namespace chart


More information about the Libreoffice-commits mailing list