graphics.lib --> graphics.dll
Allan Cornet [Sun, 10 Jun 2007 15:52:51 +0000 (15:52 +0000)]
move periwin.c in wsci (will be removed)

update nographics --> scilab without graphics module :p

42 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/graphics/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/graphics.vcproj
scilab/modules/graphics/graphics_header.def [new file with mode: 0644]
scilab/modules/graphics/includes/color.h
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_demo.c
scilab/modules/graphics/sci_gateway/c/sci_xstringl.c
scilab/modules/graphics/src/c/Actions.c
scilab/modules/graphics/src/c/BasicAlgos.c
scilab/modules/graphics/src/c/BuildObjects.c
scilab/modules/graphics/src/c/FeC.c
scilab/modules/graphics/src/c/Format.c
scilab/modules/graphics/src/c/GetProperty.c
scilab/modules/graphics/src/c/Plo2dn.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/Xcall.c
scilab/modules/graphics/src/c/Xcall1.c
scilab/modules/graphics/src/c/getHandleProperty/getPropertyAssignedValue.c
scilab/modules/graphics/src/c/getHandleProperty/setGetHashTable.c
scilab/modules/graphics/src/c/handleDrawing/drawTextEntity.c
scilab/modules/graphics/src/c/periFig.c
scilab/modules/graphics/src/c/periGif.c
scilab/modules/graphics/src/c/periPos.c
scilab/modules/graphics/src/c/pixel_mode.c
scilab/modules/graphics/src/cpp/LibScilab_Import.def
scilab/modules/graphics/src/cpp/graphics_Import.def [new file with mode: 0644]
scilab/modules/graphics/src/cpp/scirenderer.vcproj
scilab/modules/graphics/src/nographics/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/graphics/src/nographics/nographics.c
scilab/modules/graphics/src/nographics/nographics.rc [new file with mode: 0644]
scilab/modules/graphics/src/nographics/nographics.vcproj [new file with mode: 0644]
scilab/modules/graphics/src/nographics/nographics_header.def [new file with mode: 0644]
scilab/modules/graphics/src/nographics/resource.h [new file with mode: 0644]
scilab/modules/gui/src/c/wsci/FigureToPrint.c
scilab/modules/gui/src/c/wsci/periWin.c [moved from scilab/modules/graphics/src/c/periWin.c with 99% similarity]
scilab/modules/gui/src/c/wsci/wsci.vcproj
scilab/modules/tclsci/LibScilab_Import.def
scilab/modules/tclsci/graphics_Import.def [new file with mode: 0644]
scilab/modules/tclsci/tclsci.vcproj

index b7a4e57..960e9fe 100644 (file)
@@ -179,7 +179,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "modules\graphics\src\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphics\graphics.vcproj", "{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
        ProjectSection(ProjectDependencies) = postProject
+               {C8ADB2B9-FAB3-4802-8F34-BDE4EDB3B41E} = {C8ADB2B9-FAB3-4802-8F34-BDE4EDB3B41E}
+               {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
+               {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
+               {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer", "modules\integer\src\c\integer.vcproj", "{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
@@ -716,6 +723,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization-Ant", "modules
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographics", "modules\graphics\src\nographics\nographics.vcproj", "{0AC1142C-0EFF-4406-9E5D-6111A7A8F614}"
+       ProjectSection(ProjectDependencies) = postProject
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1184,6 +1196,10 @@ Global
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}.Debug|Win32.Build.0 = Debug|Win32
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}.Release|Win32.ActiveCfg = Release|Win32
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}.Release|Win32.Build.0 = Release|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Debug|Win32.ActiveCfg = Debug|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Debug|Win32.Build.0 = Debug|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Release|Win32.ActiveCfg = Release|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 99a43c5..d2908dd 100644 (file)
@@ -166,7 +166,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "modules\graphics\src\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphics\graphics.vcproj", "{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
        ProjectSection(ProjectDependencies) = postProject
+               {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9} = {78BD64CE-181D-4D3F-9254-5C4F55C1EDC9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {C8ADB2B9-FAB3-4802-8F34-BDE4EDB3B41E} = {C8ADB2B9-FAB3-4802-8F34-BDE4EDB3B41E}
+               {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
+               {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer", "modules\integer\src\c\integer.vcproj", "{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
@@ -774,6 +781,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization-Ant", "modules
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographics", "modules\graphics\src\nographics\nographics.vcproj", "{0AC1142C-0EFF-4406-9E5D-6111A7A8F614}"
+       ProjectSection(ProjectDependencies) = postProject
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1242,6 +1254,10 @@ Global
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}.Debug|Win32.Build.0 = Debug|Win32
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}.Release|Win32.ActiveCfg = Release|Win32
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}.Release|Win32.Build.0 = Release|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Debug|Win32.ActiveCfg = Debug|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Debug|Win32.Build.0 = Debug|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Release|Win32.ActiveCfg = Release|Win32
+               {0AC1142C-0EFF-4406-9E5D-6111A7A8F614}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/scilab/modules/graphics/LibScilab_Import.def b/scilab/modules/graphics/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..ae81f61
--- /dev/null
@@ -0,0 +1,199 @@
+LIBRARY    LibScilab.dll\r
+\r
+\r
+EXPORTS\r
+;--------------------------\r
+; core\r
+;--------------------------\r
+ sciprint\r
+ putlhsvar_\r
+ error_\r
+ cluni0_\r
+ createvar_\r
+ stack_\r
+ com_\r
+ getrhsvar_\r
+ checklhs_\r
+ checkrhs_\r
+ intersci_\r
+ createvarfromptr_\r
+ Scierror\r
+ ExceptionMessage\r
+;\r
+syncexec_\r
+cha1_\r
+deletewin_\r
+StoreCommand1\r
+sciReturnString\r
+sciReturnDouble\r
+sciReturnRowVector\r
+sciReturnInt\r
+sciReturnColHandleVector\r
+sciReturnRowStringVector\r
+sciReturnEmptyMatrix\r
+sciReturnMatrix\r
+sciReturnHandle\r
+destroyReturnedList\r
+addMatrixToReturnedList\r
+addColVectorToReturnedList\r
+createReturnedList\r
+sciReturnRowVectorFromInt\r
+sciReturnRowIntVector\r
+sciReturnStringMatrix\r
+addStringColVectorToReturnedList\r
+sciReturnChar\r
+sciReturnUserData\r
+findopt_\r
+vartype_\r
+firstopt_\r
+check_length\r
+iop_\r
+SciViewportGet\r
+elementtype_\r
+getlistrhsvar_\r
+gdImageDestroy\r
+gdImageCreateFromGif\r
+readxbmimg_\r
+getScilabMode\r
+List_free\r
+List_pop\r
+List_append\r
+List_find\r
+scistring_\r
+convert2sci_\r
+List_free_item\r
+List_free_full\r
+List_find_full\r
+gdImagePPM\r
+gdImageGif\r
+gdSetBackground\r
+gdImageChangeColor\r
+gdImageFilledRectangle\r
+gdImageCopyResized\r
+gdImageCreateFromXbm\r
+gdImageGetPixel\r
+gdImageCreate\r
+gdSetClipping\r
+gdUnsetClipping\r
+gdSetAlu\r
+gdImageSetStyle\r
+gdImageSetPixel\r
+gdImageColorAllocate\r
+gdImageColorDeallocate\r
+gdImageString\r
+gdImageStringUp\r
+gdCharWidth\r
+gdImageThickLine\r
+gdImageThickRectangle\r
+gdImageRectangle\r
+gdImagePolyLine\r
+gdImageFilledPolygon\r
+gdImageSymb\r
+ReadbdfFont\r
+getSCIpath\r
+TryToGetDC\r
+RefreshGraphToolBar\r
+getmen_\r
+ismenu_\r
+sxevents_\r
+CtrlCHit\r
+GPopupResize\r
+MenuFixCurrentWin\r
+CloseGraphMacros\r
+CreateGraphToolBar\r
+CreateGedMenus\r
+InitStatusBar\r
+ReadRegistryGraph\r
+dsort_\r
+check_dim_prop\r
+check_same_dims\r
+get_optionals\r
+check_vector\r
+overload_\r
+vstk_\r
+recu_\r
+check_scalar\r
+numopt_\r
+check_dims\r
+gettype_\r
+msgs_\r
+callscifun_\r
+Interface_XS2BMP\r
+IsAScalar\r
+Interface_XS2EMF\r
+ExportBMP\r
+GetData\r
+GetDataSize\r
+SciViewportMove\r
+GetScreenDPI\r
+CreateGraphClass\r
+CtrlCwasTyped\r
+;\r
+getgraphwin\r
+setgraphwinresized\r
+getgraphwinButtonHeight\r
+getgraphwinOriginx\r
+getgraphwinOriginy\r
+getgraphwinSizex\r
+getgraphwinSizey\r
+getgraphwinhInstance\r
+setgraphwinymax\r
+setgraphwinxmax\r
+;\r
+\r
+CPixmapResize1\r
+clip_line\r
+set_clip_box\r
+ReleaseWinHdc\r
+MaybeSetWinhdc\r
+wininfo\r
+deletePoints\r
+fill_grid_rectangles\r
+fill_grid_rectangles1\r
+getcolordef\r
+CheckColormap\r
+get_b\r
+get_g\r
+get_r\r
+getwindowdim_\r
+initgraphicGif_\r
+SciMouseRelease\r
+SciMouseCapture\r
+SetWinhdc\r
+sedeco_\r
+loadfamily_\r
+xclick_\r
+displaynumbers_\r
+getFontMaxSize_\r
+queryfamily_\r
+xinfo_\r
+drawarrows_\r
+fillrectangle_\r
+xend_\r
+fillarcs_\r
+fillarc_\r
+drawpolyline_\r
+fillpolylines_\r
+drawClippedPolyline_\r
+setpopupname_\r
+xclick_any_\r
+xselgraphic_\r
+drawpolylines_\r
+cleararea_\r
+xgetmouse_\r
+boundingbox_\r
+clearwindow_\r
+drawaxis_\r
+MissileGCget_\r
+initgraphic_\r
+displaystring_\r
+drawpolymark_\r
+drawsegments_\r
+fillpolyline_\r
+MissileGCset_\r
+drawrectangle_\r
+drawrectangles_\r
+drawarcs_\r
+drawarc_\r
+SwitchWindow\r
+CheckScilabXgc\r
index b554797..33cb18a 100644 (file)
@@ -15,6 +15,10 @@ Source: modules\{#GRAPHICS}\readme.txt; DestDir: {app}\modules\{#GRAPHICS}; Comp
 Source: modules\{#GRAPHICS}\licence.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
 Source: modules\{#GRAPHICS}\changelog.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
 ;
+Source: bin\graphics.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
+;
+Source: bin\nographics.dll; DestDir: {app}\bin; DestName: graphics.dll; Components: not ({#COMPN_GRAPHICS})
+;
 Source: bin\jogl.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
 Source: bin\jogl_awt.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
 Source: bin\jogl_cg.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
index b1ff394..30f83c1 100644 (file)
@@ -4,6 +4,8 @@
        Version="8,00"
        Name="graphics"
        ProjectGUID="{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
+       RootNamespace="graphics"
+       Keyword="Win32Proj"
        >
        <Platforms>
                <Platform
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(ConfigurationName)"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       ConfigurationType="2"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../java/jdk/include;../../java/jdk/include/win32;includes;../core/includes;../../libs/MALLOC/includes;../../libs/hashtable;src/c;src/cpp;../jvm/includes"
-                               PreprocessorDefinitions="_LIB;STRICT;WITH_TK;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               MinimalRebuild="true"
                                BasicRuntimeChecks="0"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
-                               SuppressStartupBanner="true"
+                               Detect64BitPortabilityProblems="true"
                                DebugInformationFormat="3"
-                               CompileAs="0"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1036"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n graphics.dll %%f &gt;nul&#x0D;&#x0A;copy *.def graphicstmp.def &gt;nul&#x0D;&#x0A;copy ..\graphics_header.def+graphicstmp.def  ..\graphics.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../libs/graphics.lib"
-                               SuppressStartupBanner="true"
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/fixed:no"
+                               AdditionalDependencies="LibScilab.lib ../../bin/blasplus.lib ../../bin/lapack.lib"
+                               OutputFile="../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="graphics.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
                                Name="VCXDCMakeTool"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def graphics.def &gt;nul&#x0D;&#x0A;copy graphics.def ..\..\..\libs\graphics.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd.. &gt;nul&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(ConfigurationName)"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       ConfigurationType="2"
                        CharacterSet="2"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                AdditionalIncludeDirectories="../../java/jdk/include;../../java/jdk/include/win32;includes;../core/includes;../../libs/MALLOC/includes;../../libs/hashtable;src/c;src/cpp;../jvm/includes"
-                               PreprocessorDefinitions="NDEBUG;_LIB;STRICT;WITH_TK;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                EnableEnhancedInstructionSet="1"
                                UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="0"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1036"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n graphics.dll %%f &gt;nul&#x0D;&#x0A;copy *.def graphicstmp.def &gt;nul&#x0D;&#x0A;copy ..\graphics_header.def+graphicstmp.def  ..\graphics.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../libs/graphics.lib"
-                               SuppressStartupBanner="true"
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib ../../bin/blasplus.lib ../../bin/lapack.lib"
+                               OutputFile="../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="graphics.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               ImportLibrary="../../bin/$(ProjectName).lib"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
                                Name="VCXDCMakeTool"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def graphics.def &gt;nul&#x0D;&#x0A;copy graphics.def ..\..\..\libs\graphics.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd.. &gt;nul&#x0D;&#x0A;"
                        />
                </Configuration>
        </Configurations>
        <Files>
                <Filter
                        Name="Source Files"
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
                                RelativePath=".\src\c\Actions.c"
                                >
                        </File>
                        <File
-                               RelativePath="src\c\periWin.c"
-                               >
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               Optimization="1"
-                                               FavorSizeOrSpeed="2"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
                                RelativePath=".\src\c\pixel_mode.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_gateway\c\sci_xload.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_gateway\c\sci_xname.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_gateway\c\sci_xsave.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_gateway\c\sci_xsegs.c"
                                >
                        </File>
                </Filter>
                <Filter
                        Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                        <File
                                RelativePath=".\includes\Actions.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\fig.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\Format.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\Graphics.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\graphicSession.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\gsort.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\gw_graphics.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\intcommongraphics.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\Interaction.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\Plo2d.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\src\c\Plo2dEch.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\qsort.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\resources.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\sci_xsort.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\sci_xstring.h"
                                >
                        </File>
diff --git a/scilab/modules/graphics/graphics_header.def b/scilab/modules/graphics/graphics_header.def
new file mode 100644 (file)
index 0000000..43270f5
--- /dev/null
@@ -0,0 +1,4 @@
+LIBRARY    graphics.dll\r
+\r
+\r
+EXPORTS\r
index 1eaee6e..17fb27f 100644 (file)
@@ -7,7 +7,12 @@
  --------------------------------------------------------------------------*/
 #define GREYNUMBER 17
 #define DEFAULTNUMCOLORS 32
+
+#ifndef _MSC_VER
 extern unsigned short default_colors[];
+#endif
+
+
 #define DEFAULTBLACK 0
 #define DEFAULTWHITE 7
 
index dd2db00..e805a51 100644 (file)
@@ -121,17 +121,17 @@ int C2F(gw_graphics)(void)
 #ifndef _DEBUG
          _try
          {
-                 (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
+                 (*(Tab[Fin-1].f)) (Tab[Fin-1].name,(unsigned long)strlen(Tab[Fin-1].name));
          }
          _except (EXCEPTION_EXECUTE_HANDLER)
          {
                  ExceptionMessage(GetExceptionCode(),Tab[Fin-1].name);
          }
 #else
-         (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
+         (*(Tab[Fin-1].f)) (Tab[Fin-1].name,(unsigned long)strlen(Tab[Fin-1].name));
 #endif
 #else
-         (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
+         (*(Tab[Fin-1].f)) (Tab[Fin-1].name,(unsigned long)strlen(Tab[Fin-1].name));
 #endif
 
          C2F(putlhsvar)();
index becca5a..cac5aa9 100644 (file)
@@ -14,7 +14,7 @@
 
 int sci_demo( char * fname, char * code, int * flagx )
 {
-  int mlhs=0,mrhs=1,ibegin=1, l1, m1=strlen(code), n1=1;
+  int mlhs=0,mrhs=1,ibegin=1, l1, m1= (int)strlen(code), n1=1;
        static char name[] = "execstr" ;
        Nbvars = 0 ;
        
index 8453051..d0cf719 100644 (file)
@@ -57,7 +57,7 @@ int sci_xstringl( char *fname, unsigned long fname_len )
     for (j = 0 ; j < n3 ; ++j) 
     {
       strcpy(C2F(cha1).buf + ib,Str[i+ m3*j]);
-      ib += strlen(Str[i+ m3*j]);
+      ib +=  (int)strlen(Str[i+ m3*j]);
       if ( j != n3-1) { C2F(cha1).buf[ib]=' '; ib++;}
     }
     C2F(dr1)("xstringl",C2F(cha1).buf,&v,&v,&v,&v,&v,&v,&x,&y,rect,&dv,9L,bsiz);
index 98ff3a7..2270eaa 100644 (file)
@@ -132,7 +132,7 @@ void scig_erase(integer win_num)
 int scig_2dzoom(integer win_num)
 {
   char name[4];
-  int ret;
+  int ret = 0;
   integer verb=0,cur,na;
 
   if ( scig_buzy  == 1 ) return 0; ;
@@ -205,7 +205,7 @@ void scig_loadsg(int win_num, char *filename)
   char * macroCall = NULL ;
   /* the sting is "xload('(1)')" where (1) is filemame */
   /* Consequently we have 9 fixed character and two variable strings. */
-  int macroCallLength = 9 + strlen(filename) ;
+  int macroCallLength = 9 + (int)strlen(filename) ;
 
   if ( scig_buzy  == 1 ) { return ; }
   scig_buzy  = 1 ;
@@ -233,7 +233,7 @@ void scig_savesg( int win_num, char * filename )
 
   /* the sting is "xsave('(1)',(2))" where (1) is filemame and (2) the string */
   /* corresponding of win_num. Consequently we have 10 fixed character and two variable strings. */
-  int macroCallLength = 10 + strlen(filename) + GET_NB_DIGITS(win_num) ;
+  int macroCallLength = 10 +  (int)strlen(filename) + GET_NB_DIGITS(win_num) ;
 
   macroCall = MALLOC( (macroCallLength+1) * sizeof(char) ) ; /* +1 for the \0 terminating character */
 
index 8c63435..c61fbde 100644 (file)
@@ -107,7 +107,7 @@ void stringArrayCopy( char * dest[], char * src[], int nbElement )
   int i ;
   for ( i = 0 ; i < nbElement ; i++ )
   {
-    int elemSize = strlen( src[i] ) + 1 ;
+    int elemSize =  (int)strlen( src[i] ) + 1 ;
     FREE( dest[i] ) ;
 
     dest[i] = MALLOC( elemSize * sizeof(char) ) ;
index 730e00b..ffb993b 100644 (file)
@@ -2763,7 +2763,7 @@ sciPointObj * ConstructUimenu (sciPointObj * pparent, char *label,char *callback
        }
 
       strcpy(pUIMENU_FEATURE (pobj)->label.callback,callback);
-      pUIMENU_FEATURE (pobj)->label.callbacklen = strlen(callback); 
+      pUIMENU_FEATURE (pobj)->label.callbacklen =  (int)strlen(callback); 
 
       pUIMENU_FEATURE (pobj)->visible = TRUE; /* A changer */ 
 
index 4b98582..5df99da 100644 (file)
@@ -199,7 +199,7 @@ int C2F(fec)(double *x, double *y, double *triangles, double *func, integer *Nno
     n1=1; styl[0]=1;styl[1]=0;
     sciSetCurrentObj (ConstructLegend
                       (sciGetCurrentSubWin(),
-                       legend, strlen(legend), n1, styl, &pptabofpointobj)); 
+                       legend,  (int)strlen(legend), n1, styl, &pptabofpointobj)); 
     
     
     sciDrawObj(sciGetCurrentObj ()); 
index e697e10..3cba027 100644 (file)
@@ -126,7 +126,7 @@ static int Fsepare(char *fmt, integer dec, integer *l, double xmin, double xmax,
     { x += xpas;
       strcpy(buf2,buf1);
       sprintf(buf1,fmt,dec,x);
-      *l = (((int)strlen(buf1) >= *l) ? strlen(buf1) : *l) ;
+      *l = (((int)strlen(buf1) >= *l) ? (integer)strlen(buf1) : *l) ;
       if ( strcmp(buf1,buf2) == 0) return(0);
     }
   return(1);
@@ -201,7 +201,7 @@ static int Fsepare1(char *fmt, integer dec, integer *l, double *xx, integer nx)
   for ( i=1 ; i < nx ; i++)
     { strcpy(buf2,buf1);
       sprintf(buf1,fmt,dec,xx[i]);
-      *l = (((int)strlen(buf1) >= *l) ? strlen(buf1) : *l) ;
+      *l = (((int)strlen(buf1) >= *l) ? (integer)strlen(buf1) : *l) ;
       if ( strcmp(buf1,buf2) == 0) return(0);
     }
   return(1);
@@ -1275,7 +1275,7 @@ char * copyFormatedValue( double value, const char format[5], int bufferSize )
 
   sprintf( buffer , format, value ) ;
 
-  resLength = strlen( buffer ) + 1 ; /* + 1 <=> 0 terminating char */
+  resLength =  (int)strlen( buffer ) + 1 ; /* + 1 <=> 0 terminating char */
 
   res = MALLOC( resLength * sizeof(char) ) ;
 
index 29d8a5a..6e33f8a 100644 (file)
@@ -4972,7 +4972,7 @@ int sciGetInfoMessageLength( sciPointObj * pObj )
   switch ( sciGetEntityType(pObj) )
   {
   case SCI_FIGURE:
-    return strlen( pFIGURE_FEATURE(pObj)->infoMessage ) ;
+    return  (int)strlen( pFIGURE_FEATURE(pObj)->infoMessage ) ;
   default:
     sciprint( "This object has no info_message property.\n" ) ;
     return -1 ;
index 3be557e..64951df 100644 (file)
@@ -257,7 +257,7 @@ int plot2dn(integer ptype,char *logflags,double *x,double *y,integer *n1,integer
     if (with_leg) {
       sciSetCurrentObj (ConstructLegend
                         (sciGetCurrentSubWin(),
-                        legend, strlen(legend), *n1, style, pptabofpointobj)); 
+                        legend,  (int)strlen(legend), *n1, style, pptabofpointobj)); 
       hdl=sciGetHandle(sciGetCurrentObj ());   
       hdltab[cmpt]=hdl;
       cmpt++;
index 7b3949d..17a1e32 100644 (file)
@@ -4800,7 +4800,7 @@ int sciSetInfoMessage( sciPointObj * pObj, const char * newMessage )
       }
       else
       {
-        int messageSize = strlen( newMessage ) + 1 ;
+        int messageSize =  (int)strlen( newMessage ) + 1 ;
         if ( ppFigure->infoMessage != NULL )
         {
           ppFigure->infoMessage = REALLOC( ppFigure->infoMessage, messageSize * sizeof(char) ) ;
@@ -4826,7 +4826,7 @@ int sciInitEventHandler( sciPointObj * pObj, char * name )
   {
   case SCI_FIGURE:
     {
-      int nameLength = strlen( name ) + 1 ;
+      int nameLength =  (int)strlen( name ) + 1 ;
       sciFigure * ppFigure = pFIGURE_FEATURE(pObj) ;
       if ( ppFigure->eventHandler != NULL )
       {
index 7a7b07d..4a4cbc7 100644 (file)
@@ -354,7 +354,7 @@ static void C2F(all)(char x0[],char x1[],integer *x2,integer *x3,integer *x4,int
                     integer *x7,double *dx1,double *dx2,double *dx3,double *dx4, integer lx0, integer lx1)
 { 
   const struct funreplace *fr;
-  fr=xcall_in_word_set(x0,strlen(x0));
+  fr=xcall_in_word_set(x0,(unsigned int)strlen(x0));
   if ( fr != NULL ) 
     {
       (*(fr->action[DriverId]))(x1,x2,x3,x4,x5,x6,x7,dx1,dx2,dx3,dx4,lx0,lx1);
index d0aa098..d6ad8e1 100644 (file)
@@ -198,7 +198,7 @@ int C2F(dr1)( char x0[],char x1[],integer *x2,integer *x3,integer *x4,integer *x
                    integer lx0, integer lx1)
 { 
   const struct funreplace *fr;
-  fr=in_word_set(x0,strlen(x0));
+  fr=in_word_set(x0,(unsigned long)strlen(x0));
   if ( fr != NULL ) 
     {
       (*(fr->action))(x0,x1,x2,x3,x4,x5,x6,x7,dx1,dx2,dx3,dx4,lx0,lx1);
@@ -255,7 +255,7 @@ int C2F(xgetg)( char * str, char * str1, integer * len,integer  lx0,integer lx1)
   if ( strcmp(str,"fpf") == 0) 
   {
     strncpy(str1,FPF,32);
-    *len= strlen(str1);
+    *len= (integer)strlen(str1);
   }
   else if ( strcmp(str,"auto clear")==0) 
   {
index 382da1c..4d5d50e 100644 (file)
@@ -94,7 +94,7 @@ char ** createCopyStringMatrixFromStack( int stackPointer, int nbElement )
 
   for ( i = 0 ; i < nbElement ; i++ )
   {
-    int size = strlen( values[i] ) + 1 ;
+    int size =  (int)strlen( values[i] ) + 1 ;
     res[i] = MALLOC( size * sizeof(char) ) ;
 
     if ( res[i] == NULL )
index 5ac4d58..c54740a 100644 (file)
@@ -60,7 +60,7 @@ int insertGetHashtable( GetPropertyHashTable * hashTable, char * key, getPropert
   /* allocate a new key because the hashtable claims ownership */
   /* and will free it when destroyed */
   char * copyKey   = NULL ;
-  int    keyLength = strlen( key ) + 1 ;
+  int    keyLength =  (int)strlen( key ) + 1 ;
 
   copyKey = MALLOC( keyLength * sizeof(char) ) ;
   if ( copyKey == NULL ) { return 0 ; }
@@ -90,7 +90,7 @@ int insertSetHashtable( SetPropertyHashTable * hashTable, char * key, setPropert
   /* allocate a new key because the hashtable claims ownership */
   /* and will free it when destroyed */
   char * copyKey   = NULL ;
-  int    keyLength = strlen( key ) + 1 ;
+  int    keyLength =  (int)strlen( key ) + 1 ;
 
   copyKey = MALLOC( keyLength * sizeof(char) ) ;
   strcpy( copyKey, key ) ;
index 1b20d00..d85e4d1 100644 (file)
@@ -143,7 +143,7 @@ int drawTextEntity( sciPointObj * pObj )
       C2F (dr) ("xset", "dashes", textProperties, textProperties, textProperties+3, textProperties+3, textProperties+3, &v, &dv,&dv, &dv, &dv, 5L, 6L);
       C2F (dr) ("xset", "foreground", textProperties, textProperties, textProperties+3, textProperties+3, textProperties+3, &v,&dv, &dv, &dv, &dv, 5L, 10L);
 
-      C2F (dr) ("xarea", "xv", &n, xm, ym, &close, PI0, PI0, PD0, PD0, PD0, PD0, 5L,strlen("xv"));
+      C2F (dr) ("xarea", "xv", &n, xm, ym, &close, PI0, PI0, PD0, PD0, PD0, PD0, 5L,(integer)strlen("xv"));
     }
 
     /* draw the line around the box */
index e5df479..41628f4 100644 (file)
@@ -57,6 +57,44 @@ static BOOL ScilabGCXfig_is_initialized = FALSE;
 #define WHITE 7
 #define BLACK 0
 
+
+#ifdef _MSC_VER
+unsigned short default_colors[] = {
+       0,   0,   0, /* Black: DEFAULTBLACK */
+       0,   0, 255, /* Blue */
+       0, 255,   0, /* Green */
+       0, 255, 255, /* Cyan */
+       255,   0,   0, /* Red */
+       255,   0, 255, /* Magenta */
+       255,   0,   0, /* Yellow */
+       255, 255, 255, /* White: DEFAULTWHITE */
+       0,   0, 144, /* Blue4 */
+       0,   0, 176, /* Blue3 */
+       0,   0, 208, /* Blue2 */
+       135, 206, 255, /* LtBlue */
+       0, 144,   0, /* Green4 */
+       0, 176,   0, /* Green3 */
+       0, 208,   0, /* Green2 */
+       0, 144, 144, /* Cyan4 */
+       0, 176, 176, /* Cyan3 */
+       0, 208, 208, /* Cyan2 */
+       144,   0,   0, /* Red4 */
+       176,   0,   0, /* Red3 */
+       208,   0,   0, /* Red2 */
+       144,   0, 144, /* Magenta4 */
+       176,   0, 176, /* Magenta3 */
+       208,   0, 208, /* Magenta2 */
+       128,  48,   0, /* Brown4 */
+       160,  64,   0, /* Brown3 */
+       192,  96,   0, /* Brown2 */
+       255, 128, 128, /* Pink4 */
+       255, 160, 160, /* Pink3 */
+       255, 192, 192, /* Pink2 */
+       255, 224, 224, /* Pink */
+       255, 215,   0  /* Gold */
+};
+#endif
+
 void C2F(Write2VectXfig)(integer *vx, integer *vy, integer n, integer flag); 
 void C2F(WriteGenericXfig)(char *string, integer nobj, integer sizeobj, integer *vx, integer *vy, integer sizev, integer flag, integer *fvect);
 void C2F(InitScilabGCXfig)(integer *v1, integer *v2, integer *v3, integer *v4);
@@ -2261,7 +2299,7 @@ void C2F(queryfamilyXfig)(char *name, integer *j, integer *v3, integer *v4, inte
   name[0]='\0';
   for (i=0;i<FONTNUMBER;i++) {
     strcat(name,FontInfoTabXfig_[i].fname);
-    v3[i]=strlen(FontInfoTabXfig_[i].fname);
+    v3[i]=(integer)strlen(FontInfoTabXfig_[i].fname);
   }
   *j=FONTNUMBER;
 }
index 8c41a82..e085b3b 100644 (file)
@@ -51,6 +51,7 @@
 #include "Xcall1.h"
 #include "periScreen.h"
 
+#include "color.h"
 
 #if defined(_MSC_VER)
 #define CoordModePrevious 1
@@ -85,7 +86,9 @@ static FILE *file= (FILE *) 0;
 static FILE *file= stdout ;
 #endif
 
-
+#ifdef _MSC_VER
+extern unsigned short default_colors[];
+#endif
 
 
 void C2F(WriteGeneric1Gif)();
@@ -2360,7 +2363,7 @@ void C2F(queryfamilyGif)(char *name, integer *j, integer *v3, integer *v4, integ
   integer i ;
   name[0]='\0';
   for (i=0;i<FONTNUMBER;i++) {
-    v3[i]=strlen(FontInfoTabGif[i].fname);
+    v3[i]=(integer)strlen(FontInfoTabGif[i].fname);
     strcat(name,FontInfoTabGif[i].fname);
   }
   *j=FONTNUMBER;
index 12e9550..06f45bc 100644 (file)
@@ -48,9 +48,15 @@ static BOOL ScilabGCPos_is_initialized = FALSE;
 #include "math_graphics.h"
 #include "periPos.h"
 #include "color.h"
+
 #include "bcg.h" /* NG */
 #include "MALLOC.h" /* MALLOC */
 
+
+#ifdef _MSC_VER
+extern unsigned short default_colors[];
+#endif
+
 void C2F(WriteGeneric1Pos)(char *string, integer nobjpos, integer objbeg, integer sizeobj, integer *vx, integer *vy, integer flag, integer *fvect);
 void C2F(xgetmarkPos)(integer *verbose, integer *symb, integer *narg, double *dummy);
 void C2F(xsetmarkPos)(integer *number, integer *size, integer *v3, integer *v4);
@@ -2488,7 +2494,7 @@ void C2F(queryfamilyPos)(char *name, integer *j, integer *v3, integer *v4, integ
   name[0]='\0';
   for (i=0;i<FONTNUMBER;i++) {
     strcat(name,FontInfoTabPos[i].fname);
-    v3[i]=strlen(FontInfoTabPos[i].fname);
+    v3[i]=(integer)strlen(FontInfoTabPos[i].fname);
   }
   *j=FONTNUMBER;
 }
index 2b026fb..340c3a3 100644 (file)
@@ -49,7 +49,7 @@ int getPixelModeIndex( const char * modeName )
 
   int nameLen = 0 ;
 
-  nameLen = strlen( modeName ) ;
+  nameLen =  (int)strlen( modeName ) ;
 
   switch( modeName[0] )
   {
index 4053a41..76addc2 100644 (file)
@@ -2,46 +2,9 @@
 \r
 \r
 EXPORTS\r
-; from graphics\r
+Scierror\r
 List_free\r
-sciGetLastSons\r
-sciGetVisibility\r
-sciGetEntityType\r
-sciGetParentFigure\r
 List_append\r
 List_free_item\r
-drawTextEntity\r
-drawSurfaceEntity\r
-drawSubWinEntity\r
-drawSegsEntity\r
-drawRectangleEntity\r
-drawPolylineEntity\r
-drawLegendEntity\r
-drawGrayplotEntity\r
-sciGetNum\r
-ReleaseWinHdc\r
-sciGetScilabXgc\r
-GetDriverId\r
-dr_\r
-MaybeSetWinhdc\r
-sciGetBackground\r
-drawFecEntity\r
-drawCompoundEntity\r
-drawAxesEntity\r
-drawArcEntity\r
-sciGetCurrentFigure\r
 sciprint\r
-getHandleDrawer\r
-sciGetCurrentScilabXgc\r
-sciGetIsMark\r
-sciGetIsFilled\r
-sciGetIsLine\r
-sciGetParent\r
-sciGetInfoMessage\r
-sciGetForeground\r
-sciGetLineWidth\r
-sciGetLineStyle\r
-Scierror\r
-sciGetGraphicContext\r
-sciGetNumColors\r
-sciIsExistingFigure
\ No newline at end of file
+\r
diff --git a/scilab/modules/graphics/src/cpp/graphics_Import.def b/scilab/modules/graphics/src/cpp/graphics_Import.def
new file mode 100644 (file)
index 0000000..a0961b5
--- /dev/null
@@ -0,0 +1,37 @@
+LIBRARY    graphics.dll\r
+\r
+\r
+EXPORTS\r
+; from graphics\r
+sciIsExistingFigure\r
+sciGetLineStyle\r
+sciGetCurrentScilabXgc\r
+sciGetIsMark\r
+sciGetIsFilled\r
+sciGetIsLine\r
+sciGetParent\r
+sciGetInfoMessage\r
+sciGetForeground\r
+sciGetLineWidth\r
+sciGetGraphicContext\r
+sciGetNumColors\r
+sciGetLastSons\r
+sciGetVisibility\r
+sciGetEntityType\r
+sciGetParentFigure\r
+drawTextEntity\r
+drawSurfaceEntity\r
+drawSubWinEntity\r
+drawSegsEntity\r
+drawRectangleEntity\r
+drawPolylineEntity\r
+drawLegendEntity\r
+drawGrayplotEntity\r
+sciGetNum\r
+sciGetBackground\r
+drawFecEntity\r
+drawCompoundEntity\r
+drawAxesEntity\r
+drawArcEntity\r
+sciGetCurrentFigure\r
+getHandleDrawer
\ No newline at end of file
index 6483160..7cd5087 100644 (file)
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"\r
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/fixed:no"\r
-                               AdditionalDependencies="LibScilab.lib"\r
+                               AdditionalDependencies="LibScilab.lib graphics.lib"\r
                                OutputFile="../../../../bin/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="scirenderer.def"\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"\r
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="LibScilab.lib"\r
+                               AdditionalDependencies="LibScilab.lib graphics.lib"\r
                                OutputFile="../../../../bin/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="scirenderer.def"\r
diff --git a/scilab/modules/graphics/src/nographics/LibScilab_Import.def b/scilab/modules/graphics/src/nographics/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..cd87bef
--- /dev/null
@@ -0,0 +1,5 @@
+LIBRARY    LibScilab.dll\r
+\r
+\r
+EXPORTS\r
+ Scierror\r
index d887aba..7f03459 100644 (file)
@@ -2,6 +2,11 @@
 /* INRIA 2007 */
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
+#include "../../includes/bcg.h"
+#include "../../includes/ObjectStructure.h"
+#include "../../includes/clipping.h"
+#include "../../includes/Events.h"
+#include "../../includes/WindowList.h"
 #include "machine.h"
 #include "Scierror.h"
 /*-----------------------------------------------------------------------------------*/ 
@@ -26,3 +31,217 @@ int getWinsMaxId( void )
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/ 
+int scig_2dzoom(integer win_num)
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+struct BCG * getWindowXgcNumber( integer i ) 
+{
+        return NULL ;
+}
+/*-----------------------------------------------------------------------------------*/ 
+void getWins( integer * Num, integer * Ids, integer * flag ) 
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+int GetDriverId( void ) 
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+WindowList * getScilabWindowList( void )
+{
+       return NULL;
+}
+/*-----------------------------------------------------------------------------------*/ 
+int CheckClickQueue(int *win,int *x,int *y,int *ibut,int *motion,int *release)
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+void scig_unzoom(integer win_num)
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+void set_wait_click(int val)
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+int ClearClickQueue(int win)
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+int sciSetViewport( sciPointObj * pObj, int xSize, int ySize )
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+void sciGetViewport( sciPointObj * pObj, int * xSize, int * ySize )
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+int get_window_scale( integer i, double * subwin )
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+double Maxi(double *vect,integer n)
+{
+       return 0.0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+double Mini(double *vect, integer n)
+{
+       return 0.0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+struct BCG * addWindowItem( void ) 
+{
+       return NULL;
+}
+/*-----------------------------------------------------------------------------------*/ 
+int removeWindowItem( struct BCG * window )
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+int scig_3drot(integer win_num)
+{
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/ 
+void scig_replay(integer win_num)
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+void scig_erase(integer win_num)
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+void scig_loadsg(int win_num, char *filename) 
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+struct BCG * getFirstWindow( void )
+{
+       return NULL;
+}
+/*-----------------------------------------------------------------------------------*/ 
+BOOL isWindowListEmpty( void )
+{
+       return TRUE;
+}
+/*-----------------------------------------------------------------------------------*/ 
+void del_window_scale( integer i ) 
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+void scig_savesg( int win_num, char * filename ) 
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+void Cscale2default( void )
+{
+
+}
+/*-----------------------------------------------------------------------------------*/ 
+void C2F(clipPolyLine)( integer       n     , \r
+                                          integer     * vx    , \r
+                                          integer     * vy    , \r
+                                          integer       closed,\r
+                                          SClipRegion * clipping )\r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+int scig_toPs( integer win_num, integer colored, char * bufname, char * driver )\r
+{\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+void delete_sgwin_entities(int win_num)\r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+Scig_deletegwin_handler get_scig_deletegwin_handler ( void )\r
+{\r
+       return NULL;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+void set_event_select(int val)\r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(entier2d)( integer * n, double * dx,integer * s )\r
+{\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(dr)(char x0[],char x1[],integer *x2,integer *x3,integer *x4,integer *x5,integer *x6,\r
+                       integer *x7,double *dx1,double *dx2,double *dx3,double *dx4,\r
+                       integer lx0, integer lx1) \r
+{\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+void scig_sel(integer win_num)\r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+void DeleteObjs(integer win_num)\r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+int C2F(dr1)( char x0[],char x1[],integer *x2,integer *x3,integer *x4,integer *x5,integer *x6,\r
+                        integer *x7,double *dx1,double *dx2,double *dx3,double *dx4,\r
+                        integer lx0, integer lx1) \r
+{\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+void sciRedrawF(int *num)\r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+ int C2F(SetDriver)()\r
+{\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+ void GetDriver1(char *str, integer *v2,integer * v3,integer * v4, integer *v5,integer * v6,\r
+        integer * v7,double * dv1,double * dv2,double * dv3,double * dv4) \r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+int PushClickQueue (int win,int x,int y,int ibut,int motion,int release)\r
+{\r
+       return 0;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+void sciGetIdFigure (int *vect, int *id, int *flag)\r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+void set_cf_type( int val ) \r
+{\r
+\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
diff --git a/scilab/modules/graphics/src/nographics/nographics.rc b/scilab/modules/graphics/src/nographics/nographics.rc
new file mode 100644 (file)
index 0000000..f77ee31
--- /dev/null
@@ -0,0 +1,97 @@
+// Microsoft Visual C++ generated resource script.\r
+//\r
+#include "resource.h"\r
+\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 2 resource.\r
+//\r
+//#include "afxres.h"\r
+#define APSTUDIO_HIDDEN_SYMBOLS\r
+#include "windows.h"\r
+/////////////////////////////////////////////////////////////////////////////\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// French (France) resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// TEXTINCLUDE\r
+//\r
+\r
+1 TEXTINCLUDE \r
+BEGIN\r
+    "resource.h\0"\r
+END\r
+\r
+\r
+3 TEXTINCLUDE \r
+BEGIN\r
+    "\r\n"\r
+    "\0"\r
+END\r
+\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+\r
+VS_VERSION_INFO VERSIONINFO\r
+ FILEVERSION 5,0,0,0\r
+ PRODUCTVERSION 5,0,0,0\r
+ FILEFLAGSMASK 0x17L\r
+#ifdef _DEBUG\r
+ FILEFLAGS 0x1L\r
+#else\r
+ FILEFLAGS 0x0L\r
+#endif\r
+ FILEOS 0x4L\r
+ FILETYPE 0x0L\r
+ FILESUBTYPE 0x0L\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "040c04b0"\r
+        BEGIN\r
+            VALUE "FileDescription", "nographics module"\r
+            VALUE "FileVersion", "5, 0, 0, 0"\r
+            VALUE "InternalName", "nographics module"\r
+            VALUE "LegalCopyright", "Copyright (C) 2007"\r
+            VALUE "OriginalFilename", "nographics.dll"\r
+            VALUE "ProductName", " nographics"\r
+            VALUE "ProductVersion", "5, 0, 0, 0"\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x40c, 1200\r
+    END\r
+END\r
+\r
+#endif    // French (France) resources\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+\r
+\r
+#ifndef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 3 resource.\r
+//\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#endif    // not APSTUDIO_INVOKED\r
+\r
diff --git a/scilab/modules/graphics/src/nographics/nographics.vcproj b/scilab/modules/graphics/src/nographics/nographics.vcproj
new file mode 100644 (file)
index 0000000..e863ad4
--- /dev/null
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8,00"\r
+       Name="nographics"\r
+       ProjectGUID="{0AC1142C-0EFF-4406-9E5D-6111A7A8F614}"\r
+       RootNamespace="nographics"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../../core/includes"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOGRAPHICS_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="0"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               Description="Make dependencies"\r
+                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nographics.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nographicstmp.def &gt;nul&#x0D;&#x0A;copy ..\nographics_header.def+nographicstmp.def  ..\nographics.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions="/fixed:no"\r
+                               AdditionalDependencies="LibScilab.lib"\r
+                               OutputFile="../../../../bin/$(ProjectName).dll"\r
+                               LinkIncremental="1"\r
+                               ModuleDefinitionFile="nographics.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               InlineFunctionExpansion="1"\r
+                               FavorSizeOrSpeed="1"\r
+                               WholeProgramOptimization="false"\r
+                               AdditionalIncludeDirectories="../../../core/includes"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOGRAPHICS_EXPORTS"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               Description="Make dependencies"\r
+                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nographics.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nographicstmp.def &gt;nul&#x0D;&#x0A;copy ..\nographics_header.def+nographicstmp.def  ..\nographics.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="LibScilab.lib"\r
+                               OutputFile="../../../../bin/$(ProjectName).dll"\r
+                               LinkIncremental="1"\r
+                               ModuleDefinitionFile="nographics.def"\r
+                               GenerateDebugInformation="false"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="0"\r
+                               ImportLibrary="../../../../bin/$(ProjectName).lib"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\nographics.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\nographics.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/scilab/modules/graphics/src/nographics/nographics_header.def b/scilab/modules/graphics/src/nographics/nographics_header.def
new file mode 100644 (file)
index 0000000..43270f5
--- /dev/null
@@ -0,0 +1,4 @@
+LIBRARY    graphics.dll\r
+\r
+\r
+EXPORTS\r
diff --git a/scilab/modules/graphics/src/nographics/resource.h b/scilab/modules/graphics/src/nographics/resource.h
new file mode 100644 (file)
index 0000000..60f0181
--- /dev/null
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}\r
+// Microsoft Visual C++ generated include file.\r
+// Used by graphics.rc\r
+\r
+// Next default values for new objects\r
+// \r
+#ifdef APSTUDIO_INVOKED\r
+#ifndef APSTUDIO_READONLY_SYMBOLS\r
+#define _APS_NEXT_RESOURCE_VALUE        101\r
+#define _APS_NEXT_COMMAND_VALUE         40001\r
+#define _APS_NEXT_CONTROL_VALUE         1001\r
+#define _APS_NEXT_SYMED_VALUE           101\r
+#endif\r
+#endif\r
index 6922cc6..24debeb 100644 (file)
@@ -8,9 +8,9 @@
 #include "../../../modules/graphics/includes/xs2file.h"
 /*-----------------------------------------------------------------------------------*/
 extern HINSTANCE hdllInstance;
-extern int WindowsPrintScreen;
-extern int Printer_XRes;
-extern int Printer_YRes;
+static int WindowsPrintScreen;
+static int Printer_XRes;
+static int Printer_YRes;
 extern void dos2win32 (char *filename, char *filename1);
 extern char GetPrinterOrientation(void);
 extern void Setscig_buzyState(BOOL state);
similarity index 99%
rename from scilab/modules/graphics/src/c/periWin.c
rename to scilab/modules/gui/src/c/wsci/periWin.c
index 7a42a72..2a3d7bc 100644 (file)
 
 #include "sciprint.h"
 
-#include "../../gui/src/c/wsci/wresource.h"
-#include "../../gui/src/c/wsci/resource.h"
-#include "../../gui/src/c/wsci/wcommon.h"
-#include "../../gui/src/c/wsci/wgraph.h"
-#include "../../gui/src/c/wsci/wtext.h"
-#include "Events.h"
-
-#include "bcg.h"
-#include "periWin.h" 
-#include "color.h" 
-#include "scigraphic.h"
+#include "wresource.h"
+#include "resource.h"
+#include "wcommon.h"
+#include "wgraph.h"
+#include "wtext.h"
+#include "../../../../graphics/includes/Events.h"
+
+#include "../../../../graphics/includes/bcg.h"
+#include "../../../../graphics/includes/periWin.h" 
+#include "../../../../graphics/includes/color.h" 
+#include "../../../../graphics/includes/scigraphic.h"
 #include "machine.h"
-#include "clipping.h"
-#include "SetProperty.h"
+#include "../../../../graphics/includes/clipping.h"
+#include "../../../../graphics/includes/SetProperty.h"
 
-#include "math_graphics.h"
+#include "../../../../graphics/includes/math_graphics.h"
 
 #include "MALLOC.h" /* MALLOC */
 
@@ -53,6 +53,9 @@
 
 #define GXxor 6
 
+LPSTR szGraphClass = "wscilab_graph";
+LPSTR szParentGraphClass = "wscilab_parent_graph";
+
 
 /** 
     Warning : the following code won't work if the win.a library is 
@@ -97,43 +100,6 @@ static double *vdouble = 0; /* used when a double argument is needed */
    used in periPos.c and periFig.c
 */
 
-unsigned short default_colors[] = {
-  0,   0,   0, /* Black: DEFAULTBLACK */
-  0,   0, 255, /* Blue */
-  0, 255,   0, /* Green */
-  0, 255, 255, /* Cyan */
-  255,   0,   0, /* Red */
-  255,   0, 255, /* Magenta */
-  255,   0,   0, /* Yellow */
-  255, 255, 255, /* White: DEFAULTWHITE */
-  0,   0, 144, /* Blue4 */
-  0,   0, 176, /* Blue3 */
-  0,   0, 208, /* Blue2 */
-  135, 206, 255, /* LtBlue */
-  0, 144,   0, /* Green4 */
-  0, 176,   0, /* Green3 */
-  0, 208,   0, /* Green2 */
-  0, 144, 144, /* Cyan4 */
-  0, 176, 176, /* Cyan3 */
-  0, 208, 208, /* Cyan2 */
-  144,   0,   0, /* Red4 */
-  176,   0,   0, /* Red3 */
-  208,   0,   0, /* Red2 */
-  144,   0, 144, /* Magenta4 */
-  176,   0, 176, /* Magenta3 */
-  208,   0, 208, /* Magenta2 */
-  128,  48,   0, /* Brown4 */
-  160,  64,   0, /* Brown3 */
-  192,  96,   0, /* Brown2 */
-  255, 128, 128, /* Pink4 */
-  255, 160, 160, /* Pink3 */
-  255, 192, 192, /* Pink2 */
-  255, 224, 224, /* Pink */
-  255, 215,   0  /* Gold */
-};
-
-LPSTR szGraphClass = "wscilab_graph";
-LPSTR szParentGraphClass = "wscilab_parent_graph";
 
 
 #define MAXDASH 5
@@ -188,7 +154,6 @@ static BOOL SciPalette(int iNumClr);
 static void set_current_clip (void);
 static void set_clip_after_scroll (void) ;
 
-
 extern void UpdateFileGraphNameMenu(struct BCG *ScilabGC);
 extern void CreateGraphToolBar(struct BCG * ScilabGC); 
 extern void CreateGedMenus(struct BCG * ScilabGC); 
index beed490..f139f62 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\periWin.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\printf.c"
                                >
                        </File>
index a103ec4..ba7edfb 100644 (file)
@@ -29,7 +29,6 @@ EXPORTS
  intersci_
  createvarfromptr_
  ExceptionMessage
- set_cf_type
  getSCIpath
  error_scilab
  message_scilab
\ No newline at end of file
diff --git a/scilab/modules/tclsci/graphics_Import.def b/scilab/modules/tclsci/graphics_Import.def
new file mode 100644 (file)
index 0000000..53d1585
--- /dev/null
@@ -0,0 +1,6 @@
+LIBRARY    graphics.dll\r
+\r
+\r
+EXPORTS\r
+ set_cf_type\r
\ No newline at end of file
index 849d777..b84d6ee 100644 (file)
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n tclsci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def tclscitmp.def &gt;nul&#x0D;&#x0A;copy ..\tclsci_header.def+tclscitmp.def  ..\tclsci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n tclsci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def tclscitmp.def &gt;nul&#x0D;&#x0A;copy ..\tclsci_header.def+tclscitmp.def  ..\tclsci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/fixed:no"
-                               AdditionalDependencies="LibScilab.lib"
+                               AdditionalDependencies="LibScilab.lib graphics.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="tclsci.def"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n tclsci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def tclscitmp.def &gt;nul&#x0D;&#x0A;copy ..\tclsci_header.def+tclscitmp.def  ..\tclsci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)graphics_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)graphics.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n tclsci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def tclscitmp.def &gt;nul&#x0D;&#x0A;copy ..\tclsci_header.def+tclscitmp.def  ..\tclsci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib"
+                               AdditionalDependencies="LibScilab.lib graphics.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="tclsci.def"