Merge branch 'master' of 192.168.1.40:kisscount

This commit is contained in:
Gregory Soutadé 2018-05-07 15:00:19 +02:00
commit 20d7840178
331 changed files with 2250 additions and 47387 deletions

5
.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
*.o
*.objs
*.moc
*~

View File

@ -1,3 +1,34 @@
v0.7 (25/03/2018)
** User **
Set background calendar color to red or yellow when one account is negative or less than 200€ (configurable)
Add start date and end date for accounts, so don't need to hide it when it's closed
Remove some unused blank spaces in GUI
Operation modification now taken in account for Stats Panel
Resize rows to content at startup
Set default month to december for year != cur year (avoid new year bug)
New Windows build !
** Dev **
Qt5 migration done !
StatsPanel code reworked, removing some bugs
Do not reload current panel when a modification is done, but reload other ones
Add Visual Studio project files
Remove libkdchart
** Bugs **
Bug in expression parser, negative mark before parenthesis considered as positive.
Bug in FormulaDelegate : string copy was made in a wrong way
Initial and final negative account values were not displayed in red
Sub operations were not removed from database when deleting meta operation
Week lines were not re computed after deleting an operation
Default month selection should now be correct
Amount in SearchBanner were badly set (missing *100)
Prevent integer overflow when computing percents in CostRepartitionBanner
Fix some bugs in yearTo selection & fill in GenerateDialog
Don't count virtual operations in check mode
Bad account updated when it's changed on MainPanel
v0.6 (08/10/2016)
** User **
Set autofocus attribute to user in index.php

View File

@ -1,8 +1,9 @@
** Dependencies for compilation (on Debian) **
libqt4-dev (>= 4.7)
libqt4-sql-sqlite (>= 4.7)
libofx4
libqt5-dev
libqt5sql5-sqlite
libqt5charts5-dev
libofx-dev
g++
make
gettext

View File

@ -1,4 +1,5 @@
ROOT_DIR="/usr"
#ROOT_DIR="/usr"
ROOT_DIR="."
LIB_DIR=$(DESTDIR)$(ROOT_DIR)"/lib/kisscount/"
SHARE_DIR=$(DESTDIR)$(ROOT_DIR)"/share/kisscount/"
DOC_DIR=$(DESTDIR)$(ROOT_DIR)"/share/doc/kisscount/"
@ -7,13 +8,15 @@ BIN_DIR=$(DESTDIR)$(ROOT_DIR)"/bin/"
CXX=$(HOST)g++
KISSCOUNT=kc
QT_PACKAGES="QtCore QtGui QtSql QtXml"
QT_PACKAGES="Qt5Core Qt5Gui Qt5Sql Qt5Xml Qt5Widgets"
CXXFLAGS+=`pkg-config --cflags $(QT_PACKAGES)`
CXXFLAGS+=-Wall -Isrc -Isrc/win32
CXXFLAGS+=-Wall -Isrc -Isrc/win32 -I${PWD}/lib/qt5charts/usr/include/x86_64-linux-gnu/qt5/ -L${PWD}/lib/qtcharts/lib/ -L${PWD}/lib/qt5charts/usr/lib/x86_64-linux-gnu/
CXXFLAGS+=-Wall
#-Dnullptr=0
ifdef WIN32
CXXFLAGS+=-DRESOURCES_ROOT="\"./resources/\"" -static
else
CXXFLAGS+=-DRESOURCES_ROOT="\"$(SHARE_DIR)\"" -ggdb -fPIC
CXXFLAGS+=-DRESOURCES_ROOT="\"$(SHARE_DIR)\"" -ggdb -fPIC -O0
# For developpers
#CXXFLAGS+=-DRESOURCES_ROOT="\"./resources/\""
endif
@ -24,24 +27,24 @@ MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ')
MOCS=$(MOC_HEADERS:.hpp=.objs)
MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc)
CXXFLAGS+=-Ilib/libkdchart/include -Ilib/libkdchart/src -Ilib/libkdchart/kdablibfakes/include
CXXFLAGS+=-DKDCHART_BUILD_KDCHART_LIB
KDCHART_SOURCES=$(shell find lib/libkdchart/src -name '*.cpp' -type f | tr '\n' ' ')
KDCHART_OBJS=$(KDCHART_SOURCES:.cpp=.o)
UI_CHARTSELECTOR=lib/libkdchart/src/ui_KDChartDatasetSelector.h
KDCHART_MOC_HEADERS=$(shell find lib/libkdchart/src -name '*.h' -type f | tr '\n' ' ')
KDCHART_MOCS=$(KDCHART_MOC_HEADERS:.h=.objs)
KDCHART_MOCS_OBJS=$(KDCHART_MOC_HEADERS:.h=.moc)
LDFLAGS+=lib/libkdchart.a
#CXXFLAGS+=-Ilib/libkdchart/include -Ilib/libkdchart/src -Ilib/libkdchart/kdablibfakes/include
#CXXFLAGS+=-DKDCHART_BUILD_KDCHART_LIB
#KDCHART_SOURCES=$(shell find lib/libkdchart/src -name '*.cpp' -type f | tr '\n' ' ')
#KDCHART_OBJS=$(KDCHART_SOURCES:.cpp=.o)
#UI_CHARTSELECTOR=lib/libkdchart/src/ui_KDChartDatasetSelector.h
#KDCHART_MOC_HEADERS=$(shell find lib/libkdchart/src -name '*.h' -type f | tr '\n' ' ')
#KDCHART_MOCS=$(KDCHART_MOC_HEADERS:.h=.objs)
#KDCHART_MOCS_OBJS=$(KDCHART_MOC_HEADERS:.h=.moc)
#LDFLAGS+=lib/libkdchart.a
ifndef WIN32
LDFLAGS+=`pkg-config --libs $(QT_PACKAGES)`
LDFLAGS+=-lofx
LDFLAGS+=-lofx -lQt5Charts
else
LDFLAGS+=lib_mingw_32/QtCore4.dll lib_mingw_32/QtGui4.dll lib_mingw_32/QtSql4.dll lib_mingw_32/QtXml4.dll
endif
all: mojito lib/libkdchart.a $(KISSCOUNT)
all: mojito $(KISSCOUNT)
clean_all: clean clean_libkdchart
@ -64,17 +67,17 @@ clean:
%.moc : %.h
moc -nw $< -o $@
mojito : $(MOCS_OBJS) $(KDCHART_MOCS_OBJS)
mojito : $(MOCS_OBJS)
$(KISSCOUNT): $(MOCS) $(OBJS)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
$(UI_CHARTSELECTOR): lib/libkdchart/src/KDChartDatasetSelector.ui
uic $< > $(UI_CHARTSELECTOR)
sed s/KDCHARTDATASETSELECTOR_H/UI_KDCHARTDATASETSELECTOR_H/g -i $(UI_CHARTSELECTOR)
# $(UI_CHARTSELECTOR): lib/libkdchart/src/KDChartDatasetSelector.ui
# uic $< > $(UI_CHARTSELECTOR)
# sed s/KDCHARTDATASETSELECTOR_H/UI_KDCHARTDATASETSELECTOR_H/g -i $(UI_CHARTSELECTOR)
lib/libkdchart.a: $(UI_CHARTSELECTOR) $(KDCHART_MOCS) $(KDCHART_OBJS)
$(HOST)ar rcu lib/libkdchart.a $(KDCHART_MOCS) $(KDCHART_OBJS)
# lib/libkdchart.a: $(UI_CHARTSELECTOR) $(KDCHART_MOCS) $(KDCHART_OBJS)
# $(HOST)ar rcu lib/libkdchart.a $(KDCHART_MOCS) $(KDCHART_OBJS)
clean_libkdchart:
rm -rf lib/libkdchart.a

4
README
View File

@ -1,8 +1,8 @@
KissCount is personnal account software delivered under GPL v3 licence terms.
Current version is 0.5
Current version is 0.7
Qt4 (>= 4.7), libqt4-sql-sqlite and libofx (Linux only) are needed
Qt5, libqt5sql5-sqlite and libofx (Linux only) are needed
If you use web view, edit database.php and set $BDD_FILE, it's higly recommanded to use an SSL certificate.

View File

@ -1,8 +1,8 @@
KissCount est un logiciel de gestion de comptes personnels délivré sous licence GPL v3
La version actuelle est 0.5
La version actuelle est 0.7
Qt4 (>= 4.7), libqt4-sql-sqlite et libofx (Uniquement pour Linux) sont nécessaires
Qt5, libqt5sql5-sqlite et libofx (Uniquement pour Linux) sont nécessaires
Si vous utilisez la version web pour visualiser vos comptes, éditez d'abord le fichier database.php en positionnant correctement la variable $BDD_FILE, il est fortement recommandé d'utiliser un certificat SSL.

1
TODO
View File

@ -18,7 +18,6 @@ More translations
Printing (maybe in xml/html)
Refactor web view code
Plugins ?
Qt 5
===============================================================
Will not be implemented

View File

@ -0,0 +1,212 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\controller\KissCount.hpp" />
<ClInclude Include="..\src\model\Account.hpp" />
<ClInclude Include="..\src\model\AccountAmount.hpp" />
<ClInclude Include="..\src\model\Category.hpp" />
<ClInclude Include="..\src\model\Database.hpp" />
<ClInclude Include="..\src\model\export\CSVExportEngine.hpp" />
<ClInclude Include="..\src\model\export\ExportEngine.hpp" />
<ClInclude Include="..\src\model\export\XMLExportEngine.hpp" />
<ClInclude Include="..\src\model\import\GrisbiImportEngine.hpp" />
<ClInclude Include="..\src\model\import\ImportEngine.hpp" />
<ClInclude Include="..\src\model\import\XMLImportEngine.hpp" />
<ClInclude Include="..\src\model\model.hpp" />
<ClInclude Include="..\src\model\Operation.hpp" />
<ClInclude Include="..\src\model\Tag.hpp" />
<ClInclude Include="..\src\model\User.hpp" />
<ClInclude Include="..\src\ParseExp.hpp" />
<ClInclude Include="..\src\view\grid\TableViewDelegate.hpp" />
<QtMoc Include="..\src\view\grid\TabDelegate.hpp" />
<QtMoc Include="..\src\view\grid\StarDelegate.hpp" />
<QtMoc Include="..\src\view\grid\GridAccount.hpp" />
<QtMoc Include="..\src\view\grid\FormulaDelegate.hpp" />
<QtMoc Include="..\src\view\grid\FloatDelegate.hpp" />
<QtMoc Include="..\src\view\grid\DateDelegate.hpp" />
<QtMoc Include="..\src\view\grid\ChoiceDelegate.hpp" />
<QtMoc Include="..\src\view\grid\CalendarDelegate.hpp" />
<ClInclude Include="..\src\view\SupportedLanguages.hpp" />
<ClInclude Include="..\src\view\view.hpp" />
<QtMoc Include="..\src\view\wxUI.hpp" />
<QtMoc Include="..\src\view\UsersDialog.hpp" />
<QtMoc Include="..\src\view\StatsPanel.hpp" />
<QtMoc Include="..\src\view\SnapshotsDialog.hpp" />
<QtMoc Include="..\src\view\SearchPanel.hpp" />
<QtMoc Include="..\src\view\SearchBanner.hpp" />
<QtMoc Include="..\src\view\PreferencesPanel.hpp" />
<QtMoc Include="..\src\view\PasswordDialog.hpp" />
<QtMoc Include="..\src\view\ImportPanel.hpp" />
<QtMoc Include="..\src\view\GenerateDialog.hpp" />
<QtMoc Include="..\src\view\ExportPanel.hpp" />
<QtMoc Include="..\src\view\CostRepartitionBanner.hpp" />
<QtMoc Include="..\src\view\AccountPanel.hpp" />
<ClInclude Include="..\src\win32\compat.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\controller\KissCount.cpp" />
<ClCompile Include="..\src\main.cpp" />
<ClCompile Include="..\src\model\Database.cpp" />
<ClCompile Include="..\src\model\DatabaseUpdate.cpp" />
<ClCompile Include="..\src\model\export\CSVExportEngine.cpp" />
<ClCompile Include="..\src\model\export\ExportEngine.cpp" />
<ClCompile Include="..\src\model\export\XMLExportEngine.cpp" />
<ClCompile Include="..\src\model\import\GrisbiImportEngine.cpp" />
<ClCompile Include="..\src\model\import\ImportEngine.cpp" />
<ClCompile Include="..\src\model\import\OFXImportEngine.cpp" />
<ClCompile Include="..\src\model\import\XMLImportEngine.cpp" />
<ClCompile Include="..\src\model\Operation.cpp" />
<ClCompile Include="..\src\model\User.cpp" />
<ClCompile Include="..\src\ParseExp.cpp" />
<ClCompile Include="..\src\view\AccountPanel.cpp" />
<ClCompile Include="..\src\view\CostRepartitionBanner.cpp" />
<ClCompile Include="..\src\view\ExportPanel.cpp" />
<ClCompile Include="..\src\view\GenerateDialog.cpp" />
<ClCompile Include="..\src\view\grid\CalendarDelegate.cpp" />
<ClCompile Include="..\src\view\grid\ChoiceDelegate.cpp" />
<ClCompile Include="..\src\view\grid\DateDelegate.cpp" />
<ClCompile Include="..\src\view\grid\FloatDelegate.cpp" />
<ClCompile Include="..\src\view\grid\FormulaDelegate.cpp" />
<ClCompile Include="..\src\view\grid\GridAccount.cpp" />
<ClCompile Include="..\src\view\grid\StarDelegate.cpp" />
<ClCompile Include="..\src\view\grid\TabDelegate.cpp" />
<ClCompile Include="..\src\view\ImportPanel.cpp" />
<ClCompile Include="..\src\view\PasswordDialog.cpp" />
<ClCompile Include="..\src\view\PreferencesPanel.cpp" />
<ClCompile Include="..\src\view\SearchBanner.cpp" />
<ClCompile Include="..\src\view\SearchPanel.cpp" />
<ClCompile Include="..\src\view\SnapshotsDialog.cpp" />
<ClCompile Include="..\src\view\StatsPanel.cpp" />
<ClCompile Include="..\src\view\UsersDialog.cpp" />
<ClCompile Include="..\src\view\wxUI.cpp" />
<ClCompile Include="..\src\win32\gmtime_r.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\resources\init.sql" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid>
<Keyword>Qt4VSv1.0</Keyword>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ItemDefinitionGroup>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;%(PreprocessorDefinitions);RESOURCES_ROOT="kcresources/"</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;C:\Users\Greg\source\repos\kisscount\src;C:\Users\Greg\source\repos\kisscount\src\controller;C:\Users\Greg\source\repos\kisscount\src\model;C:\Users\Greg\source\repos\kisscount\src\view;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TreatWChar_tAsBuiltInType>
</ClCompile>
<Link>
<SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Windows</SubSystem>
<OutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateDebugInformation>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Sql.lib;Qt5Widgets.lib;Qt5Xml.lib;Qt5Charts.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<InputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FullPath)</InputFile>
<OutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
<DynamicSource Condition="'$(Configuration)|$(Platform)'=='Release|x64'">output</DynamicSource>
<ExecutionDescription Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc'ing %(Identity)...</ExecutionDescription>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;C:\Users\Greg\source\repos\kisscount\src;C:\Users\Greg\source\repos\kisscount\src\controller;C:\Users\Greg\source\repos\kisscount\src\model;C:\Users\Greg\source\repos\kisscount\src\view</IncludePath>
<Define Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;RESOURCES_ROOT="kcresources/"</Define>
<QTDIR Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)</QTDIR>
</QtMoc>
<QtUic>
<ExecutionDescription Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Uic'ing %(Identity)...</ExecutionDescription>
<OutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\ui_%(Filename).h</OutputFile>
</QtUic>
<QtRcc>
<ExecutionDescription Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Rcc'ing %(Identity)...</ExecutionDescription>
<OutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\qrc_%(Filename).cpp</OutputFile>
</QtRcc>
</ItemDefinitionGroup>
<PropertyGroup Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">
<QtMsBuild>$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
<Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
</Target>
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
<Import Project="$(QtMsBuild)\qt.props" />
</ImportGroup>
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="Shared" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;%(PreprocessorDefinitions);RESOURCES_ROOT="kcresources/";</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;C:\Users\Greg\source\repos\kisscount\src;C:\Users\Greg\source\repos\kisscount\src\controller;C:\Users\Greg\source\repos\kisscount\src\model;C:\Users\Greg\source\repos\kisscount\src\view;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Sqld.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;Qt5Chartsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<QtMoc>
<OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
<IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtSql;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtXml;C:\Users\Greg\source\repos\kisscount\src;C:\Users\Greg\source\repos\kisscount\src\controller;C:\Users\Greg\source\repos\kisscount\src\model;C:\Users\Greg\source\repos\kisscount\src\view</IncludePath>
<Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_SQL_LIB;QT_WIDGETS_LIB;QT_XML_LIB;RESOURCES_ROOT="kcresources/";</Define>
</QtMoc>
<QtUic>
<ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
<OutputFile>.\GeneratedFiles\ui_%(Filename).h</OutputFile>
</QtUic>
<QtRcc>
<ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription>
<OutputFile>.\GeneratedFiles\qrc_%(Filename).cpp</OutputFile>
</QtRcc>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
<Import Project="$(QtMsBuild)\qt.targets" />
</ImportGroup>
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="Qt5.9.4" MocOptions="" />
</VisualStudio>
</ProjectExtensions>
</Project>

View File

@ -0,0 +1,274 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
<Extensions>qrc;*</Extensions>
<ParseFiles>false</ParseFiles>
</Filter>
<Filter Include="Form Files">
<UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
<Extensions>ui</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
<Extensions>qrc;*</Extensions>
<ParseFiles>false</ParseFiles>
</Filter>
<Filter Include="Generated Files">
<UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
<Extensions>moc;h;cpp</Extensions>
<SourceControlFiles>False</SourceControlFiles>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\ParseExp.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\win32\compat.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\controller\KissCount.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\Account.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\AccountAmount.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\Category.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\Database.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\model.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\Operation.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\Tag.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\User.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\export\CSVExportEngine.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\export\ExportEngine.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\export\XMLExportEngine.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\import\GrisbiImportEngine.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\import\ImportEngine.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\model\import\XMLImportEngine.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\view\SupportedLanguages.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\view\view.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\view\grid\TableViewDelegate.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<QtMoc Include="..\src\view\AccountPanel.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\CostRepartitionBanner.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\ExportPanel.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\GenerateDialog.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\ImportPanel.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\PasswordDialog.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\PreferencesPanel.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\SearchBanner.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\SearchPanel.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\SnapshotsDialog.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\StatsPanel.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\UsersDialog.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\wxUI.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\CalendarDelegate.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\ChoiceDelegate.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\DateDelegate.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\FloatDelegate.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\FormulaDelegate.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\GridAccount.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\StarDelegate.hpp">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="..\src\view\grid\TabDelegate.hpp">
<Filter>Header Files</Filter>
</QtMoc>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\ParseExp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\controller\KissCount.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\Database.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\DatabaseUpdate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\Operation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\User.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\export\CSVExportEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\export\ExportEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\export\XMLExportEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\import\GrisbiImportEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\import\ImportEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\import\OFXImportEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\model\import\XMLImportEngine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\AccountPanel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\CostRepartitionBanner.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\ExportPanel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\GenerateDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\ImportPanel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\PasswordDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\PreferencesPanel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\SearchBanner.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\SearchPanel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\SnapshotsDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\StatsPanel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\UsersDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\wxUI.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\CalendarDelegate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\ChoiceDelegate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\DateDelegate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\FloatDelegate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\FormulaDelegate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\GridAccount.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\StarDelegate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\view\grid\TabDelegate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\win32\gmtime_r.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\resources\init.sql">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
</Project>

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QTDIR>C:\Qt\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<QTDIR>C:\Qt\5.9.4\msvc2017_64</QTDIR>
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
</Project>

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: kisscount
Section: misc
Priority: extra
Maintainer: Grégory Soutadé <soutade@gmail.com>
Build-Depends: debhelper (>= 7.0.50~), libofx-dev, libqt4-dev (>= 4.7), libqt4-sql-sqlite
Build-Depends: debhelper (>= 7.0.50~), libofx-dev, libqt5charts5-dev (>=5.10), libqt5gui5 (>=5.10), libqt5qml5 (>=5.10), libqt5quick5 (>=5.10), libqt5quickwidgets5 (>=5.10), libqt5sql5 (>=5.10), libqt5sql5-sqlite (>=5.10), libqt5widgets5 (>=5.10), libqt5xml5 (>=5.10)
Standards-Version: 3.9.1
Homepage: http://indefero.soutade.fr/p/kisscount/
Vcs-Git: git://soutade.fr/kisscount.git

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,24 +0,0 @@
Welcome to KD Chart 2, Klaralvdalens Datakonsult's charting engine for Qt!
Please refer to the license file for conditions of use.
After reading the introductory overview files in doc/
you will find more information at three places:
detailed browsable API reference: doc/refman/index.html
or: http://docs.kdab.com/kdchart/2.4/
programmers manual with examples: doc/manual/kdchart.pdf
our sorted example programs: examples/
In case of additional questions during evaluation or use of
KD Chart please contact our technical support by mail:
kdchart-support@kdab.com
We thank you for your interest in KD Chart and we are here
to assist you if the documentation leaves open questions or
if you just need some help with finding the best way in which
to realize your charting ideas.
The KDAB KD Chart Support Team.

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractAxis.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractCartesianDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractCoordinatePlane.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractPieDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractPolarDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractProxyModel.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractTernaryDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAbstractThreeDAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartAttributesModel.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartBackgroundAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartBarAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartBarDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartCartesianAxis.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartCartesianCoordinatePlane.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartChart.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartDataValueAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartDatasetProxyModel.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartDatasetSelector.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartDiagramObserver.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartEnums.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartFrameAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartGlobal.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartGridAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartHeaderFooter.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartLegend.h"

View File

@ -1 +0,0 @@
#include "../src/LeveyJennings/KDChartLeveyJenningsAxis.h"

View File

@ -1 +0,0 @@
#include "../src/LeveyJennings/KDChartLeveyJenningsCoordinatePlane.h"

View File

@ -1 +0,0 @@
#include "../src/LeveyJennings/KDChartLeveyJenningsDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/LeveyJennings/KDChartLeveyJenningsGrid.h"

View File

@ -1 +0,0 @@
#include "../src/LeveyJennings/KDChartLeveyJenningsGridAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartLineAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartLineDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartMarkerAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartMeasure.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPaintContext.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPalette.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPieAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPieDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPlotter.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPolarCoordinatePlane.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPolarDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartPosition.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartRelativePosition.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartRingDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartRulerAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartStockBarAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartStockDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/Ternary/KDChartTernaryAxis.h"

View File

@ -1 +0,0 @@
#include "../src/Ternary/KDChartTernaryCoordinatePlane.h"

View File

@ -1 +0,0 @@
#include "../src/Ternary/KDChartTernaryLineDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/Ternary/KDChartTernaryPointDiagram.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartTextAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartThreeDBarAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartThreeDLineAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartThreeDPieAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartValueTrackerAttributes.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartWidget.h"

View File

@ -1 +0,0 @@
#include "../src/KDChartZoomParameters.h"

View File

@ -1 +0,0 @@
#include "../src/KDTextDocument.h"

View File

@ -1,181 +0,0 @@
/********************************************************************************
** Form generated from reading UI file 'KDChartDatasetSelector.ui'
**
** Created: Sat Jan 7 12:36:09 2012
** by: Qt User Interface Compiler version 4.7.3
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef KDCHARTDATASETSELECTOR_H
#define KDCHARTDATASETSELECTOR_H
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QCheckBox>
#include <QtGui/QGridLayout>
#include <QtGui/QGroupBox>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QSpacerItem>
#include <QtGui/QSpinBox>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class Ui_DatasetSelector
{
public:
QHBoxLayout *hboxLayout;
QGroupBox *groupBox;
QGridLayout *gridLayout;
QCheckBox *cbReverseColumns;
QLabel *label_5;
QSpinBox *sbStartColumn;
QLabel *label_2;
QSpinBox *sbColumnCount;
QLabel *label;
QLabel *label_6;
QSpinBox *sbStartRow;
QLabel *label_4;
QCheckBox *cbReverseRows;
QLabel *label_3;
QSpinBox *sbRowCount;
QSpacerItem *spacerItem;
void setupUi(QWidget *DatasetSelector)
{
if (DatasetSelector->objectName().isEmpty())
DatasetSelector->setObjectName(QString::fromUtf8("DatasetSelector"));
DatasetSelector->resize(728, 344);
QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3));
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(DatasetSelector->sizePolicy().hasHeightForWidth());
DatasetSelector->setSizePolicy(sizePolicy);
DatasetSelector->setMinimumSize(QSize(0, 0));
hboxLayout = new QHBoxLayout(DatasetSelector);
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
hboxLayout->setContentsMargins(9, 9, 9, 9);
#endif
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
groupBox = new QGroupBox(DatasetSelector);
groupBox->setObjectName(QString::fromUtf8("groupBox"));
groupBox->setCheckable(true);
groupBox->setChecked(false);
gridLayout = new QGridLayout(groupBox);
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
cbReverseColumns = new QCheckBox(groupBox);
cbReverseColumns->setObjectName(QString::fromUtf8("cbReverseColumns"));
gridLayout->addWidget(cbReverseColumns, 3, 1, 1, 3);
label_5 = new QLabel(groupBox);
label_5->setObjectName(QString::fromUtf8("label_5"));
label_5->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
gridLayout->addWidget(label_5, 3, 0, 1, 1);
sbStartColumn = new QSpinBox(groupBox);
sbStartColumn->setObjectName(QString::fromUtf8("sbStartColumn"));
gridLayout->addWidget(sbStartColumn, 2, 3, 1, 1);
label_2 = new QLabel(groupBox);
label_2->setObjectName(QString::fromUtf8("label_2"));
label_2->setAlignment(Qt::AlignCenter);
gridLayout->addWidget(label_2, 2, 2, 1, 1);
sbColumnCount = new QSpinBox(groupBox);
sbColumnCount->setObjectName(QString::fromUtf8("sbColumnCount"));
gridLayout->addWidget(sbColumnCount, 2, 1, 1, 1);
label = new QLabel(groupBox);
label->setObjectName(QString::fromUtf8("label"));
label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
gridLayout->addWidget(label, 2, 0, 1, 1);
label_6 = new QLabel(groupBox);
label_6->setObjectName(QString::fromUtf8("label_6"));
label_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
gridLayout->addWidget(label_6, 1, 0, 1, 1);
sbStartRow = new QSpinBox(groupBox);
sbStartRow->setObjectName(QString::fromUtf8("sbStartRow"));
gridLayout->addWidget(sbStartRow, 0, 3, 1, 1);
label_4 = new QLabel(groupBox);
label_4->setObjectName(QString::fromUtf8("label_4"));
label_4->setAlignment(Qt::AlignCenter);
gridLayout->addWidget(label_4, 0, 2, 1, 1);
cbReverseRows = new QCheckBox(groupBox);
cbReverseRows->setObjectName(QString::fromUtf8("cbReverseRows"));
gridLayout->addWidget(cbReverseRows, 1, 1, 1, 3);
label_3 = new QLabel(groupBox);
label_3->setObjectName(QString::fromUtf8("label_3"));
label_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
gridLayout->addWidget(label_3, 0, 0, 1, 1);
sbRowCount = new QSpinBox(groupBox);
sbRowCount->setObjectName(QString::fromUtf8("sbRowCount"));
gridLayout->addWidget(sbRowCount, 0, 1, 1, 1);
spacerItem = new QSpacerItem(169, 31, QSizePolicy::Minimum, QSizePolicy::Expanding);
gridLayout->addItem(spacerItem, 4, 2, 1, 1);
hboxLayout->addWidget(groupBox);
retranslateUi(DatasetSelector);
QMetaObject::connectSlotsByName(DatasetSelector);
} // setupUi
void retranslateUi(QWidget *DatasetSelector)
{
DatasetSelector->setWindowTitle(QApplication::translate("DatasetSelector", "Data Selector", 0, QApplication::UnicodeUTF8));
groupBox->setTitle(QApplication::translate("DatasetSelector", "Only display a subset of the model in the chart:", 0, QApplication::UnicodeUTF8));
cbReverseColumns->setText(QApplication::translate("DatasetSelector", "in reverse order.", 0, QApplication::UnicodeUTF8));
label_5->setText(QApplication::translate("DatasetSelector", "...", 0, QApplication::UnicodeUTF8));
label_2->setText(QApplication::translate("DatasetSelector", "columns starting at column", 0, QApplication::UnicodeUTF8));
label->setText(QApplication::translate("DatasetSelector", "Display", 0, QApplication::UnicodeUTF8));
label_6->setText(QApplication::translate("DatasetSelector", "...", 0, QApplication::UnicodeUTF8));
label_4->setText(QApplication::translate("DatasetSelector", "rows starting at row", 0, QApplication::UnicodeUTF8));
cbReverseRows->setText(QApplication::translate("DatasetSelector", "in reverse order.", 0, QApplication::UnicodeUTF8));
label_3->setText(QApplication::translate("DatasetSelector", "Display", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui {
class DatasetSelector: public Ui_DatasetSelector {};
} // namespace Ui
QT_END_NAMESPACE
#endif // KDCHARTDATASETSELECTOR_H

View File

@ -1 +0,0 @@
#include "../src/KDABLibFakes.h"

View File

@ -1,80 +0,0 @@
/****************************************************************************
** Copyright (C) 2001-2011 Klaralvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KD Chart library.
**
** Licensees holding valid commercial KD Chart licenses may use this file in
** accordance with the KD Chart Commercial License Agreement provided with
** the Software.
**
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 and version 3 as published by the
** Free Software Foundation and appearing in the file LICENSE.GPL.txt included.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** Contact info@kdab.com if any conditions of this licensing are not
** clear to you.
**
**********************************************************************/
#ifndef KDAB_LIB_FAKES_H
#define KDAB_LIB_FAKES_H
#if defined Q_OS_DARWIN
/* On Mac OS X, ensure that <cmath> will define std::isnan */
#define _GLIBCPP_USE_C99 1
#endif
#include <cmath>
#ifdef Q_OS_SOLARIS
#include <sunmath.h>
#include <math.h>
#endif
#include <qglobal.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#define DEGTORAD(d) (d)*M_PI/180
// Smybian's math.h doesn't define a trunc function
#if defined(Q_OS_SYMBIAN) || defined(QT_SIMULATOR)
#define trunc(x) (double) ((int) (x + (x >= 0.0 ? -0.5 : 0.5)))
#endif
// We use our own ISNAN / ISINF in the code to detect
// that we defined them.
// reason: Windows / MacOS do not have isnan() / isinf()
#if defined (Q_OS_WIN) && defined(_MSC_VER)
#include <float.h>
#define ISNAN(x ) _isnan(x )
#define ISINF(x ) (!(_finite(x ) + _isnan(x ) ) )
#elif defined (Q_OS_DARWIN) || defined (Q_OS_CYGWIN)
#define ISNAN(x) std::isnan(x)
#define ISINF(x) std::isinf(x)
#else
#define ISNAN(x) isnan(x)
#define ISINF(x) isinf(x)
#endif
// We wrap every for() by extra { } to work around
// the scope bug for loop counters in MS Visual C++ v6
#if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
/* This is done in Qt41 qglobal.h but not Qt42*/
#if QT_VERSION < 0x040200
#define for if (0) {} else for
#endif
#define KDAB_FOREACH( v, c ) if (0) {} else Q_FOREACH( v, c )
#else
#define KDAB_FOREACH( v, c ) Q_FOREACH( v, c )
#endif
#endif

View File

@ -1,182 +0,0 @@
/****************************************************************************
** Copyright (C) 2001-2011 Klaralvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KD Chart library.
**
** Licensees holding valid commercial KD Chart licenses may use this file in
** accordance with the KD Chart Commercial License Agreement provided with
** the Software.
**
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 and version 3 as published by the
** Free Software Foundation and appearing in the file LICENSE.GPL.txt included.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** Contact info@kdab.com if any conditions of this licensing are not
** clear to you.
**
**********************************************************************/
#ifndef CARTESIANCOORDINATETRANSFORMATION_H
#define CARTESIANCOORDINATETRANSFORMATION_H
#include <QList>
#include <QRectF>
#include <QPointF>
#include "KDChartZoomParameters.h"
#include <cmath>
#include <limits>
namespace KDChart {
// FIXME: if this struct is used more often, we need to make it a class
// with proper accessor methods:
/**
* \internal
*/
struct CoordinateTransformation {
QRectF diagramRect;
// represents the distance of the diagram coordinate origin to the
// origin of the coordinate plane space:
QPointF originTranslation;
// make a vector base for R2:
double unitVectorX;
double unitVectorY;
// implement isometric scaling:
double isoScaleX;
double isoScaleY;
CartesianCoordinatePlane::AxesCalcMode axesCalcModeY;
CartesianCoordinatePlane::AxesCalcMode axesCalcModeX;
ZoomParameters zoom;
typedef QPair< qreal, qreal > qrealPair;
inline qreal makeLogarithmic( qrealPair reference, qreal value ) const
{
qreal result = value;
qreal relation;
if( reference.second == -1.0 )
relation = 1.0;
else if( reference.second == 1.0 )
relation = 1.0;
else if( reference.second > 0.0 )
relation = reference.second / log10( reference.second );
else if( result < 0.0 )
relation = reference.second / log10( -reference.second );
else
relation = 10.0;
if( value == 0.0 )
result = 0.0;//std::numeric_limits< qreal >::quiet_NaN();
else if( value > 0.0 )
result = log10( result ) * relation;
else if( value < 0.0 )
result = -log10( -result ) * relation;
if( value == 0.0 )
return result;
result -= log10( qAbs( reference.first ) ) * relation;
result *= ( reference.second - reference.first ) / relation / (log10(qAbs(reference.second))-log10(qAbs(reference.first)));
result += reference.first;
if( reference.first < 0.0 )
{
result += reference.first;
result -= reference.second;
result = reference.first - result + reference.second;
}
return result;
}
inline QPointF translate( const QPointF& diagramPoint ) const
{
// ### de-inline me
QPointF result = originTranslation;