Adding the dialog for setting stepped lines.

The UI changes still need some more tweaking:
- adjusting the vertical alignment in the splineresourcegroup
- put the images in the radio buttons instead of in front of them

Change-Id: I4bc5ebe5167eca9a5b1341d9328a7d74b62cf819

chart2/UIConfig_chart2.mk

@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/smoothlinesdlg \
+	chart2/uiconfig/ui/steppedlinesdlg \
 ))
 
 # vim: set noet sw=4 ts=4:

chart2/source/controller/dialogs/Bitmaps.hrc

@@ -39,6 +39,10 @@
 #define IMG_TYPE_NET    (RID_APP_START + 8)
 #define IMG_TYPE_STOCK  (RID_APP_START + 9)
 #define IMG_TYPE_COLUMN_LINE  (RID_APP_START + 10)
+#define IMG_STEP_START  (RID_APP_START + 11)
+#define IMG_STEP_END    (RID_APP_START + 12)
+#define IMG_STEP_CENTER_X (RID_APP_START + 13)
+#define IMG_STEP_CENTER_Y (RID_APP_START + 14)
 
 //-----------------------------------------------------------------------------
 //Chart Subtypes
@@ -115,6 +119,7 @@
 #define BMP_POINTS_XVALUES (RID_APP_START + 47)
 #define BMP_POINTS_XCATEGORY (RID_APP_START + 48)
 #define BMP_POINTS_STACKED (RID_APP_START + 49)
+#define BMP_POINTS_STACKED (RID_APP_START + 49)
 
 
 #define BMP_LINE_P_XVALUES (RID_APP_START + 50)
@@ -141,6 +146,18 @@
 #define BMP_LINE_O_STACKED_SMOOTH (RID_APP_START + 66)
 #define BMP_LINE3D_STACKED_SMOOTH (RID_APP_START + 67)
 
+#define BMP_LINE_P_XVALUES_STEPPED (RID_APP_START + 97)
+#define BMP_LINE_O_XVALUES_STEPPED (RID_APP_START + 98)
+#define BMP_LINE3D_XVALUES_STEPPED (RID_APP_START + 99)
+
+#define BMP_LINE_P_XCATEGORY_STEPPED (RID_APP_START + 100)
+#define BMP_LINE_O_XCATEGORY_STEPPED (RID_APP_START + 101)
+#define BMP_LINE3D_XCATEGORY_STEPPED (RID_APP_START + 102)
+
+#define BMP_LINE_P_STACKED_STEPPED (RID_APP_START + 103)
+#define BMP_LINE_O_STACKED_STEPPED (RID_APP_START + 104)
+#define BMP_LINE3D_STACKED_STEPPED (RID_APP_START + 105)
+
 //----------------------
 // Area Chart Subtypes
 

chart2/source/controller/dialogs/Bitmaps.src

@@ -68,6 +68,26 @@ Image IMG_TYPE_BUBBLE
     ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
     MaskColor = STD_MASKCOLOR;
 };
+Image IMG_STEP_START
+{
+    ImageBitmap = Bitmap { File = "step_start_30.png" ; };
+    MaskColor = STD_MASKCOLOR;
+};
+Image IMG_STEP_END
+{
+    ImageBitmap = Bitmap { File = "step_end_30.png" ; };
+    MaskColor = STD_MASKCOLOR;
+};
+Image IMG_STEP_CENTER_X
+{
+    ImageBitmap = Bitmap { File = "step_center_x_30.png" ; };
+    MaskColor = STD_MASKCOLOR;
+};
+Image IMG_STEP_CENTER_Y
+{
+    ImageBitmap = Bitmap { File = "step_center_y_30.png" ; };
+    MaskColor = STD_MASKCOLOR;
+};
 Bitmap BMP_BUBBLE_1
 {
     File = "bubble_52x60.png" ;
@@ -324,6 +344,43 @@ Bitmap BMP_LINE3D_STACKED_SMOOTH
     File = "stacksmooth3d_52x60.png" ;
 };
 //---------------------
+Bitmap BMP_LINE_P_XVALUES_STEPPED
+{
+    File = "valueaxissteppedboth_52x60.png" ;
+};
+Bitmap BMP_LINE_O_XVALUES_STEPPED
+{
+    File = "valueaxissteppedlines_52x60.png" ;
+};
+Bitmap BMP_LINE3D_XVALUES_STEPPED
+{
+    File = "valueaxisstepped3d_52x60.png" ;
+};
+Bitmap BMP_LINE_P_XCATEGORY_STEPPED
+{
+    File = "nostacksteppedboth_52x60.png" ;
+};
+Bitmap BMP_LINE_O_XCATEGORY_STEPPED
+{
+    File = "nostacksteppedlines_52x60.png" ;
+};
+Bitmap BMP_LINE3D_XCATEGORY_STEPPED
+{
+    File = "nostackstepped3d_52x60.png" ;
+};
+Bitmap BMP_LINE_P_STACKED_STEPPED
+{
+    File = "stacksteppedboth_52x60.png" ;
+};
+Bitmap BMP_LINE_O_STACKED_STEPPED
+{
+    File = "stacksteppedlines_52x60.png" ;
+};
+Bitmap BMP_LINE3D_STACKED_STEPPED
+{
+    File = "stackstepped3d_52x60.png" ;
+};
+//---------------------
 Bitmap BMP_NET
 {
     File = "net_52x60.png" ;

chart2/source/controller/dialogs/ChartTypeDialogController.cxx

@@ -678,39 +678,59 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C
 {
     rSubTypeList.Clear();
 
-    if( CurveStyle_LINES==rParameter.eCurveStyle )
+    switch( rParameter.eCurveStyle )
     {
-        //direct lines
+        case CurveStyle_CUBIC_SPLINES:
+        case CurveStyle_B_SPLINES:
             if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
             {
                 rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
-            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY )));
-            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY )));
-            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY_SMOOTH )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY_SMOOTH )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY_SMOOTH )));
             }
             else
             {
                 rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
-            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED )));
-            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED )));
-            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED_SMOOTH )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED_SMOOTH )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED_SMOOTH )));
             }
+            break;
+        case CurveStyle_STEP_START:
+        case CurveStyle_STEP_END:
+        case CurveStyle_STEP_CENTER_X:
+        case CurveStyle_STEP_CENTER_Y:
+            if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
+            {
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY_STEPPED )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY_STEPPED )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY_STEPPED )));
             }
-    else //CurveStyle_LINES
+            else
             {
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED_STEPPED )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED_STEPPED )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED_STEPPED )));
+            }
+            break;
+        default: // includes CurveStyle_LINES
+            //direct lines
             if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
             {
                 rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
-            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY_SMOOTH )));
-            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY_SMOOTH )));
-            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY_SMOOTH )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY )));
             }
             else
             {
                 rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
-            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED_SMOOTH )));
-            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED_SMOOTH )));
-            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED_SMOOTH )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED )));
             }
     }
 
@@ -800,20 +820,33 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Cha
 {
     rSubTypeList.Clear();
 
-    if( CurveStyle_LINES==rParameter.eCurveStyle )
+    switch (rParameter.eCurveStyle)
     {
-        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
-        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES )));
-        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES )));
-        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES )));
-    }
-    else //CurveStyle_LINES
+        case CurveStyle_CUBIC_SPLINES:
+        case CurveStyle_B_SPLINES:
         {
-        //smooth lines
             rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
             rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES_SMOOTH )));
             rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES_SMOOTH )));
             rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES_SMOOTH )));
+            break;
+        }
+        case CurveStyle_STEP_START:
+        case CurveStyle_STEP_END:
+        case CurveStyle_STEP_CENTER_X:
+        case CurveStyle_STEP_CENTER_Y:
+        {
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES_STEPPED )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES_STEPPED )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES_STEPPED )));
+            break;
+        }
+        default: // includes CurveStyle_LINES
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );

chart2/source/controller/dialogs/Strings.src

@@ -28,6 +28,11 @@ String STR_DLG_SMOOTH_LINE_PROPERTIES
     Text [ en-US ] = "Smooth Lines" ;
 };
 
+String STR_DLG_STEPPED_LINE_PROPERTIES
+{
+    Text [ en-US ] = "Stepped Lines" ;
+};
+
 String STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE
 {
     Text [ en-US ] = "Number Format for Percentage Value" ;

chart2/source/controller/dialogs/Strings_AdditionalControls.src

@@ -46,6 +46,21 @@ String STR_TEXT_SEPARATOR
     Text [ en-US ] = "Separator";
 };
 
+String STR_LINETYPE_STRAIGHT
+{
+    Text [ en-US ] = "Straight";
+};
+
+String STR_LINETYPE_SMOOTH
+{
+    Text [ en-US ] = "Smooth";
+};
+
+String STR_LINETYPE_STEPPED
+{
+    Text [ en-US ] = "Stepped";
+};
+
 //-----------------------------------
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/controller/dialogs/tp_ChartType.hrc

@@ -26,8 +26,10 @@
 #define LB_3D_SCHEME        1
 #define LB_CHARTTYPE        2
 #define CT_CHARTVARIANT     3
+#define LB_LINETYPE         4
 
 #define FT_CHARTTYPE            1
+#define FT_LINETYPE             2
 
 #define CB_X_AXIS_CATEGORIES 1
 #define CB_3D_LOOK           2

chart2/source/controller/dialogs/tp_ChartType.src

@@ -145,6 +145,22 @@ TabPage TP_CHARTTYPE
         Text [ en-US ] = "Deep";
     };
 
+    FixedText FT_LINETYPE
+    {
+        Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ;
+        Size = MAP_APPFONT ( 150 , 10 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~Line type";
+    };
+    ListBox LB_LINETYPE
+    {
+        HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_LINETYPE";
+        Border = TRUE;
+        TabStop = TRUE;
+        DropDown = TRUE;
+        Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_SPLINES ) ;
+        Size = MAP_APPFONT ( 150 , 10 ) ;
+    };
     CheckBox CB_SPLINES
     {
         HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES";
@@ -152,12 +168,11 @@ TabPage TP_CHARTTYPE
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "S~mooth lines" ;
     };
-
     PushButton PB_SPLINE_DIALOG
     {
         HelpID = "chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG";
         TabStop = TRUE ;
-        Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES-6 ) ;
+        Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         Text [ en-US ] = "Properties..." ;
     };

chart2/source/inc/Strings.hrc

@@ -77,6 +77,10 @@
 #define STR_3DSCHEME_REALISTIC               (RID_APP_START + 232)
 #define STR_3DSCHEME_CUSTOM                  (RID_APP_START + 259)
 
+#define STR_LINETYPE_STRAIGHT                (RID_APP_START + 297)
+#define STR_LINETYPE_SMOOTH                  (RID_APP_START + 298)
+#define STR_LINETYPE_STEPPED                 (RID_APP_START + 299)
+
 //additional strings
 #define STR_TEXT_SEPARATOR                   (RID_APP_START + 20)
 
@@ -236,6 +240,7 @@
 #define STR_PAGE_CHART_LOCATION              (RID_APP_START + 230)
 
 #define STR_DLG_SMOOTH_LINE_PROPERTIES              (RID_APP_START + 239)
+#define STR_DLG_STEPPED_LINE_PROPERTIES             (RID_APP_START + 270)
 #define STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE   (RID_APP_START + 266)
 
 #define STR_PAGE_POSITIONING  (RID_APP_START + 277)