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

List:       kde-commits
Subject:    koffice/kchart
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2006-02-12 15:33:39
Message-ID: 1139758419.101451.31715.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 508669 by ingwa:

improve handling of chart area in kspread

 M  +1 -0      kchartWizard.h  
 M  +1 -0      kchartWizardSetupDataPage.h  
 M  +3 -1      kchart_part.cc  
 M  +5 -2      kchart_part.h  


--- trunk/koffice/kchart/kchartWizard.h #508668:508669
@@ -27,6 +27,7 @@
 
     KChartPart* chart() const { return m_chart; };
 
+    // Set and get the string for the data area.
     void setDataArea( const QString &area );
     QString dataArea() const;
 
--- trunk/koffice/kchart/kchartWizardSetupDataPage.h #508668:508669
@@ -30,6 +30,7 @@
 private:
   KChartPart* _chart;
   KChartWizard* _parent;
+
   kchartWidget* preview;
   QRadioButton* datacol;
   QRadioButton* datarow;
--- trunk/koffice/kchart/kchart_part.cc #508668:508669
@@ -581,12 +581,14 @@
 }
 
 
-bool KChartPart::showWizard()
+bool KChartPart::showWizard( QString &area )
 {
     KChartWizard  *wizard = new KChartWizard( this, m_parentWidget, "wizard" );
 
     connect( wizard, SIGNAL(finished()), this, SLOT(slotModified()) );
 
+    wizard->setDataArea( area );
+
     bool  ret = wizard->exec();
 
     delete wizard;
--- trunk/koffice/kchart/kchart_part.h #508668:508669
@@ -51,7 +51,7 @@
 		     bool  hasRowHeader,
 		     bool  hasRowHeader );
 
-    bool showWizard();
+    bool showWizard( QString &area );
     void initLabelAndLegend();
     void loadConfig(KConfig *conf);
     void saveConfig(KConfig *conf);
@@ -111,6 +111,7 @@
     // The chart and its contents
     KChartParams            *m_params;      // Everything about the chart
     KDChartTableData         m_currentData; // The data in the chart.
+    QString                  m_regionName;
 
     // Other auxiliary values
     bool                     m_bCanChangeValue;
@@ -131,7 +132,9 @@
     WizardExt( KoChart::Part *part )
         : KoChart::WizardExtension( part ) {};
 
-    virtual bool show() { return static_cast<KChartPart *>( part() )->showWizard(); }
+    virtual bool show( QString &area ) {
+        return static_cast<KChartPart *>( part() )->showWizard( area ); 
+    }
 };
 
 }  //KChart namespace
[prev in list] [next in list] [prev in thread] [next in thread]