chart46: #i25706# implement date axis

7 files changed, 330 insertions, 2 deletions

diff --git a/offapi/com/sun/star/chart/ChartAxis.idl b/offapi/com/sun/star/chart/ChartAxis.idl
index f71d9c07c..7d7e0e2ff 100644
--- a/offapi/com/sun/star/chart/ChartAxis.idl
+++ b/offapi/com/sun/star/chart/ChartAxis.idl
@@ -53,8 +53,16 @@
 
 #ifndef __com_sun_star_chart_ChartAxisMarkPosition_idl__ 
 #include <com/sun/star/chart/ChartAxisMarkPosition.idl> 
-#endif 
- 
+#endif
+
+#ifndef __com_sun_star_chart_ChartAxisType_idl__ 
+#include <com/sun/star/chart/ChartAxisType.idl> 
+#endif
+
+#ifndef __com_sun_star_chart_TimeIncrement_idl__ 
+#include <com/sun/star/chart/TimeIncrement.idl> 
+#endif
+
 #ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
 #include <com/sun/star/xml/UserDefinedAttributeSupplier.idl>
 #endif
@@ -169,6 +177,20 @@ published service ChartAxis
 
     //------------------------------------------------------------------------- 
      
+    /** determines which type of axis this is, e.g. a date-axis or a category-axis @see ChartAxisType
+        @since OOo 3.4
+     */
+    [optional, property] long AxisType;
+
+    //------------------------------------------------------------------------- 
+     
+    /** if the current axis is a date-time the intervals are choosen as given with TimeIncrement
+        @since OOo 3.4
+     */
+    [optional, maybevoid, property] TimeIncrement TimeIncrement;
+
+    //------------------------------------------------------------------------- 
+     
     /** Determines if the axis orientation is mathematical or reversed.
      */
     [optional, property] boolean ReverseDirection;
diff --git a/offapi/com/sun/star/chart/ChartAxisType.idl b/offapi/com/sun/star/chart/ChartAxisType.idl
new file mode 100644
index 000000000..f51c5857c
--- /dev/null
+++ b/offapi/com/sun/star/chart/ChartAxisType.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef com_sun_star_chart_ChartAxisType_idl
+#define com_sun_star_chart_ChartAxisType_idl
+
+module com
+{
+module sun
+{
+module star
+{
+module chart
+{
+/** @since OOo 3.4
+*/
+published constants ChartAxisType
+{
+    /** the type of the axis is choosen automatically dependent on the chart type, the dimension and the underlying data
+     */
+    const long AUTOMATIC = 0; 
+
+    /** the axis represent discrete category texts if chart type and the dimension allows
+     */
+    const long CATEGORY = 1;
+
+    /** the axis shows dates if the given data and chart type and the dimension allows
+     */
+    const long DATE = 2;
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/chart/TimeIncrement.idl b/offapi/com/sun/star/chart/TimeIncrement.idl
new file mode 100644
index 000000000..cdefaace2
--- /dev/null
+++ b/offapi/com/sun/star/chart/TimeIncrement.idl
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef com_sun_star_chart_TimeIncrement_idl
+#define com_sun_star_chart_TimeIncrement_idl
+
+#include <com/sun/star/chart/TimeInterval.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module chart {
+
+//=============================================================================
+
+/** A TimeIncrement describes how tickmarks are positioned on the scale of a date-time axis.
+@since OOo 3.4
+*/
+published struct TimeIncrement
+{
+    /** if the any contains a struct of type <type>::com::sun::star::chart::TimeInterval</type> 
+        this is used as a fixed distance value for the major tickmarks.  Otherwise, if the any is empty or contains an
+        incompatible type, the distance between major tickmarks is calculated automatically by the application.
+     */
+    any     MajorTimeInterval;
+
+    /** if the any contains a struct of type <type>::com::sun::star::chart::TimeInterval</type> 
+        this is used as a fixed distance value for the minor tickmarks.  Otherwise, if the any is empty or contains an
+        incompatible type, the distance between minor tickmarks is calculated automatically by the application.
+     */
+    any     MinorTimeInterval;
+
+    /** if the any contains a constant of type <type>::com::sun::star::chart::TimeUnit</type> 
+        this is the smallest time unit that is displayed on the date-time axis.
+        Otherwise, if the any is empty or contains an incompatible type,
+        the resolution is choosen automatically by the application.
+     */
+    any     TimeResolution;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/chart/TimeInterval.idl b/offapi/com/sun/star/chart/TimeInterval.idl
new file mode 100644
index 000000000..3b9097058
--- /dev/null
+++ b/offapi/com/sun/star/chart/TimeInterval.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef com_sun_star_chart_TimeInterval_idl
+#define com_sun_star_chart_TimeInterval_idl
+
+#include <com/sun/star/chart/TimeUnit.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module chart {
+
+//=============================================================================
+
+/** Describes an interval on a date-time axis
+@since OOo 3.4
+*/
+published struct TimeInterval
+{
+    /** specifies the number of units
+    */
+    long    Number;
+
+    /** specifies a unit for the interval
+        <p>is a value out of the constant group <type>::com::sun::star::chart::TimeUnit</type>.</p>
+    */
+    long    TimeUnit;
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/chart/TimeUnit.idl b/offapi/com/sun/star/chart/TimeUnit.idl
new file mode 100644
index 000000000..112c2c639
--- /dev/null
+++ b/offapi/com/sun/star/chart/TimeUnit.idl
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_chart_TimeUnit_idl__ 
+#define __com_sun_star_chart_TimeUnit_idl__ 
+  
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
+/** Specifies a unit for intervals on a date-time axis
+@since OOo 3.4
+ */
+published constants TimeUnit
+{ 
+    const long DAY = 0;
+    const long MONTH = 1;
+    const long YEAR = 2;
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif
diff --git a/offapi/com/sun/star/chart/XDateCategories.idl b/offapi/com/sun/star/chart/XDateCategories.idl
new file mode 100755
index 000000000..d2e86686f
--- /dev/null
+++ b/offapi/com/sun/star/chart/XDateCategories.idl
@@ -0,0 +1,70 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_chart_XDateCategories_idl__
+#define __com_sun_star_chart_XDateCategories_idl__
+
+#include <com/sun/star/uno/XInterface.idl> 
+ 
+//============================================================================= 
+ 
+ module com {  module sun {  module star {  module chart {  
+ 
+//============================================================================= 
+ 
+/** Allows to set date values as categories.
+
+<p>Can be obtained from interface <type>XChartDocument</type> via method getData().</p>
+
+@since OOo 3.4
+*/
+
+published interface XDateCategories
+{ 
+    //------------------------------------------------------------------------- 
+     
+    /** sets dates as categories
+    
+        @param rDates
+            a sequence of sequences of doubles representing dates.
+    */
+    void setDateCategories( [in] sequence< double > rDates ); 
+
+    //------------------------------------------------------------------------- 
+
+    /** retrieves the date values if the category x-axis id a date axis
+
+        @returns
+            a sequence of doubles representing dates.
+     */
+    sequence< double > getDateCategories();
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; };  
+ 
+#endif 
diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk
index fdbf07173..b05edf2ad 100644
--- a/offapi/com/sun/star/chart/makefile.mk
+++ b/offapi/com/sun/star/chart/makefile.mk
@@ -52,6 +52,7 @@ IDLFILES=\
     ChartAxisPosition.idl\
     ChartAxisLabelPosition.idl\
     ChartAxisMarkPosition.idl\
+    ChartAxisType.idl\
     ChartAxisXSupplier.idl\
     ChartAxisYSupplier.idl\
     ChartAxisZSupplier.idl\
@@ -84,6 +85,7 @@ IDLFILES=\
     ChartTwoAxisXSupplier.idl\
     ChartTwoAxisYSupplier.idl\
     DataLabelPlacement.idl\
+    TimeIncrement.idl \
     Diagram.idl\
     Dim3DDiagram.idl\
     DonutDiagram.idl\
@@ -94,6 +96,8 @@ IDLFILES=\
     PieDiagram.idl\
     StackableDiagram.idl\
     StockDiagram.idl\
+    TimeUnit.idl\
+    TimeInterval.idl\
     X3DDefaultSetter.idl\
     X3DDisplay.idl\
     XAxisXSupplier.idl\
@@ -104,6 +108,7 @@ IDLFILES=\
     XChartDataChangeEventListener.idl\
     XChartDocument.idl\
     XComplexDescriptionAccess.idl\
+    XDateCategories.idl\
     XDiagram.idl\
     XDiagramPositioning.idl\
     XStatisticDisplay.idl\