Added primitive for Crossword Exporting.

Added first exporting function
This commit is contained in:
2015-06-16 16:58:30 +03:00
parent af923b152f
commit b3f8230d07
5 changed files with 39 additions and 14 deletions

View File

@@ -1,8 +1,8 @@
.PHONY: clean All .PHONY: clean All
All: All:
@echo "----------Building project:[ CrossBench - Release ]----------" @echo "----------Building project:[ wxCrossGen - Release ]----------"
@cd "CrossBench" && $(MAKE) -f "CrossBench.mk" @cd "wxCrossGen" && $(MAKE) -f "wxCrossGen.mk"
clean: clean:
@echo "----------Cleaning project:[ CrossBench - Release ]----------" @echo "----------Cleaning project:[ wxCrossGen - Release ]----------"
@cd "CrossBench" && $(MAKE) -f "CrossBench.mk" clean @cd "wxCrossGen" && $(MAKE) -f "wxCrossGen.mk" clean

View File

@@ -28,4 +28,10 @@ struct WordInfo {
bool direct; bool direct;
}; };
struct FilledCrossword {
GridType grid;
std::vector< WordInfo > words;
std::vector< wxString > ans;
};
#endif // CROSSBASETYPES_HPP #endif // CROSSBASETYPES_HPP

View File

@@ -5,4 +5,23 @@
#include "crossbasetypes.hpp" #include "crossbasetypes.hpp"
//wxTextFile::GetEOL()
void exportToString(const FilledCrossword &cross, const bool prn_ans, wxString &str_out){
}
bool exportToFile(const FilledCrossword &cross, const bool prn_ans, const wxString path){
wxTextFile f(path);
if ( f.Exists() )
return false;
f.Create();
wxString cont;
exportToString(cross, prn_ans, cont);
f.AddLine(cont);
f.Write();
f.Close();
return true;
}
#endif // CROSSEXPORT_HPP #endif // CROSSEXPORT_HPP

View File

@@ -2,12 +2,12 @@
## Auto Generated makefile by CodeLite IDE ## Auto Generated makefile by CodeLite IDE
## any manual changes will be erased ## any manual changes will be erased
## ##
## Debug ## Release
ProjectName :=wxCrossGen ProjectName :=wxCrossGen
ConfigurationName :=Debug ConfigurationName :=Release
WorkspacePath := "/data/Sync/SyncProjects/CrossGen" WorkspacePath := "/data/Sync/SyncProjects/CrossGen"
ProjectPath := "/data/Sync/SyncProjects/CrossGen/wxCrossGen" ProjectPath := "/data/Sync/SyncProjects/CrossGen/wxCrossGen"
IntermediateDirectory :=./Debug IntermediateDirectory :=../Release
OutDir := $(IntermediateDirectory) OutDir := $(IntermediateDirectory)
CurrentFileName := CurrentFileName :=
CurrentFilePath := CurrentFilePath :=
@@ -28,14 +28,14 @@ LibraryPathSwitch :=-L
PreprocessorSwitch :=-D PreprocessorSwitch :=-D
SourceSwitch :=-c SourceSwitch :=-c
OutputFile :=$(IntermediateDirectory)/$(ProjectName).out OutputFile :=$(IntermediateDirectory)/$(ProjectName).out
Preprocessors := Preprocessors :=$(PreprocessorSwitch)NDEBUG
ObjectSwitch :=-o ObjectSwitch :=-o
ArchiveOutputSwitch := ArchiveOutputSwitch :=
PreprocessOnlySwitch :=-E PreprocessOnlySwitch :=-E
ObjectsFileList :="wxCrossGen.txt" ObjectsFileList :="wxCrossGen.txt"
PCHCompileFlags := PCHCompileFlags :=
MakeDirCommand :=mkdir -p MakeDirCommand :=mkdir -p
LinkOptions := $(shell wx-config --debug=yes --libs --unicode=yes) LinkOptions := -s $(shell wx-config --debug=no --libs --unicode=yes)
IncludePath := $(IncludeSwitch). $(IncludeSwitch)../src IncludePath := $(IncludeSwitch). $(IncludeSwitch)../src
IncludePCH := IncludePCH :=
RcIncludePath := RcIncludePath :=
@@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch).
AR := /usr/bin/ar rcu AR := /usr/bin/ar rcu
CXX := /usr/bin/g++-4.8 CXX := /usr/bin/g++-4.8
CC := /usr/bin/gcc-4.8 CC := /usr/bin/gcc-4.8
CXXFLAGS := -std=c++11 -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors) CXXFLAGS := -std=c++11 -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors) CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
ASFLAGS := ASFLAGS :=
AS := /usr/bin/as AS := /usr/bin/as
@@ -79,7 +79,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
$(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)
$(IntermediateDirectory)/.d: $(IntermediateDirectory)/.d:
@test -d ./Debug || $(MakeDirCommand) ./Debug @test -d ../Release || $(MakeDirCommand) ../Release
PreBuild: PreBuild:
@@ -101,6 +101,6 @@ $(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
## Clean ## Clean
## ##
clean: clean:
$(RM) -r ./Debug/ $(RM) -r ../Release/

View File

@@ -1 +1 @@
./Debug/main.cpp.o ../Release/main.cpp.o