Remove useless file from https://codereview.scilab.org/#/c/16327/ (fix Windows compil... 29/16329/1
Vincent COUVERT [Tue, 7 Apr 2015 09:17:49 +0000 (11:17 +0200)]
Change-Id: Ide8a3e83db61b076b1821307983b393027ba078a

scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/src/c/getHandleProperty/set_color_property.c [deleted file]

index d1c46a3..7e67382 100644 (file)
@@ -530,7 +530,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\set_color_map_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_color_mode_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_color_range_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\set_color_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_colored_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_colors_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_cube_scaling_property.c" />
index b9a1192..b8e50ac 100644 (file)
     <ClCompile Include="src\c\getHandleProperty\set_color_range_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\set_color_property.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\set_colored_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/graphics/src/c/getHandleProperty/set_color_property.c b/scilab/modules/graphics/src/c/getHandleProperty/set_color_property.c
deleted file mode 100644 (file)
index 6910bd6..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-/*------------------------------------------------------------------------*/
-/* file: set_colors_property.c                                            */
-/* desc : function to modify in Scilab the polyline colors                */
-/*------------------------------------------------------------------------*/
-
-#include "MALLOC.h"
-#include "setHandleProperty.h"
-#include "SetProperty.h"
-#include "getPropertyAssignedValue.h"
-#include "Scierror.h"
-#include "localization.h"
-#include "GetProperty.h"
-#include "SetPropertyStatus.h"
-
-#include "getGraphicObjectProperty.h"
-#include "setGraphicObjectProperty.h"
-#include "graphicObjectProperties.h"
-
-/*------------------------------------------------------------------------*/
-int set_colors_property(void* _pvCtx, char* pobjUID, size_t stackPointer, int valueType, int nbRow, int nbCol )
-{
-    BOOL status = FALSE;
-    int iNumElements = 0;
-    int* piNumElements = &iNumElements;
-
-    if (valueType != sci_matrix)
-    {
-        Scierror(999, _("Wrong type for '%s' property: Real matrix expected.\n"), "interp_color_vector");
-        return SET_PROPERTY_ERROR;
-    }
-
-    getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_NUM_ELEMENTS__, jni_int, (void **) &piNumElements);
-
-    /*
-     * A way to display a more explicit message would be to first get the
-     * interpolation vector set flag and test it for NULL.
-     */
-    if (piNumElements == NULL)
-    {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "data");
-        return SET_PROPERTY_ERROR;
-    }
-
-    if (nbCol == 0)
-    {
-        int colorSet = 0;
-        setGraphicObjectProperty(pobjUID, __GO_COLOR_SET__, &colorSet, jni_bool, 1);
-    }
-
-    if (nbCol == iNumElements)
-    {
-        int * tmp = MALLOC(nbCol * sizeof(int));
-        stk(stackPointer);
-
-        copyDoubleVectorToIntFromStack(stackPointer, tmp, nbCol);
-
-        status = setGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_COLORS__, tmp, jni_int_vector, nbCol);
-        if (status == TRUE)
-        {
-            int colorSet = 1;
-            setGraphicObjectProperty(pobjUID, __GO_COLOR_SET__, &colorSet, jni_bool, 1);
-            FREE(tmp);
-            return SET_PROPERTY_SUCCEED;
-        }
-        else
-        {
-            FREE(tmp);
-            Scierror(999, _("'%s' property does not exist for this handle.\n"), "interp_color_vector");
-            return SET_PROPERTY_ERROR;
-        }
-    }
-    else
-    {
-        Scierror(999, _("The number of column of the color vector must match the number of points defining the line.\n"));
-        return SET_PROPERTY_ERROR;
-    }
-}
-/*------------------------------------------------------------------------*/