HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/src.pro

Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series

Michal Klocek - - Load All Authors

File last commit:

r627:110f905bcf35


                r630:dd8db9a3a988

Download file

             src.pro
        
                    142 lines
            
             | 4.0 KiB
            
                | text/idl
            
             |
                PrologLexer
            
             / src / src.pro
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Michal Klocek
    
Fix previous broken commit

              r145
            
      !include( ../common.pri ):error( Couldn't find the common.pri file! )

        Michal Klocek
    
fix CRLF in src.pro

              r36
            
      TARGET = QtCommercialChart

        Michal Klocek
    
Revert "Integrated scatter series"...

              r39
            
      DESTDIR = $$CHART_BUILD_LIB_DIR

        Michal Klocek
    
fix CRLF in src.pro

              r36
            
      TEMPLATE = lib

      QT += core \

          gui

        Tero Ahola
    
Adding user32.lib is now Win32/VS specific

              r606
            
      win32-msvc*: LIBS += User32.lib

        Michal Klocek
    
fix CRLF in src.pro

              r36
            
      CONFIG += debug_and_release

      CONFIG(debug, debug|release):TARGET = QtCommercialChartd

        Michal Klocek
    
Move axes files to subdir

              r478
            
      SOURCES += \

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
          chartdataset.cpp \

          chartpresenter.cpp \

        Michal Klocek
    
minor. reorder compilation files in src.pro

              r250
            
          charttheme.cpp \

          domain.cpp \

          qchart.cpp \

        Michal Klocek
    
Rename QChartSeries to QSeries

              r360
            
          qchartview.cpp \

        sauimone
    
framework for legend

              r524
            
          qseries.cpp \

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
          qlegend.cpp \

          legendmarker.cpp

        Michal Klocek
    
Move axes files to subdir

              r478
            
      PRIVATE_HEADERS += \

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
          chartdataset_p.h \

        Michal Klocek
    
minor. reorder compilation files in src.pro

              r250
            
          chartitem_p.h \

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
          chartpresenter_p.h \

        Michal Klocek
    
minor. reorder compilation files in src.pro

              r250
            
          charttheme_p.h \

        sauimone
    
Separated legend marker to private header. Added signals for left and right mouse click

              r547
            
          domain_p.h \

          legendmarker_p.h

      PUBLIC_HEADERS += \

        Michal Klocek
    
Move axes files to subdir

              r478
            
          qchart.h \

        Michal Klocek
    
Fix previous broken commit

              r145
            
          qchartglobal.h \

        Michal Klocek
    
Rename QChartSeries to QSeries

              r360
            
          qseries.h \

        sauimone
    
framework for legend

              r524
            
          qchartview.h \

          qlegend.h

        Michal Klocek
    
Animation refactor...

              r530
            
      include(animations/animations.pri)    

        Michal Klocek
    
Move axes files to subdir

              r478
            
      include(axis/axis.pri)

        Michal Klocek
    
Refactor line spline to common xyline...

              r465
            
      include(xychart/xychart.pri)

        Michal Klocek
    
Rename QChartSeries to QSeries

              r360
            
      include(linechart/linechart.pri)

        Michal Klocek
    
Adds area chart...

              r421
            
      include(areachart/areachart.pri)

        Michal Klocek
    
Rename QChartSeries to QSeries

              r360
            
      include(barchart/barchart.pri)

        Jani Honkonen
    
Moved pie stuff to own .pri file and rename stuff

              r146
            
      include(piechart/piechart.pri)

        Tero Ahola
    
Moved scatter impl into a subfolder

              r194
            
      include(scatterseries/scatter.pri)

        Marek Rosa
    
Spline initial

              r295
            
      include(splinechart/splinechart.pri)

        Tero Ahola
    
Moved scatter impl into a subfolder

              r194
            
        Jani Honkonen
    
Adding list of series gradients to theme.

              r494
            
      THEMES += themes/chartthemedefault_p.h \

          themes/chartthemeicy_p.h \

        Michal Klocek
    
Refactor themes...

              r143
            
          themes/chartthemegrayscale_p.h \

          themes/chartthemescientific_p.h \

        Tero Ahola
    
Added draft of dark blue theme

              r581
            
          themes/chartthemevanilla_p.h \

        Tero Ahola
    
New theme with light colors, chartview background

              r584
            
          themes/chartthemebluecerulean_p.h \

          themes/chartthemelight_p.h

        Tero Ahola
    
Moved scatter impl into a subfolder

              r194
            
      HEADERS += $$PUBLIC_HEADERS

        Michal Klocek
    
fix CRLF in src.pro

              r36
            
      HEADERS += $$PRIVATE_HEADERS

        Michal Klocek
    
Refactor themes...

              r143
            
      HEADERS += $$THEMES

        Michal Klocek
    
Fix previous broken commit

              r145
            
      INCLUDEPATH += linechart \

          barchart \

          themes \

          .

        Michal Klocek
    
Revert "Integrated scatter series"...

              r39
            
      OBJECTS_DIR = $$CHART_BUILD_DIR/lib

      MOC_DIR = $$CHART_BUILD_DIR/lib

      UI_DIR = $$CHART_BUILD_DIR/lib

      RCC_DIR = $$CHART_BUILD_DIR/lib

        Michal Klocek
    
fix CRLF in src.pro

              r36
            
      DEFINES += QTCOMMERCIALCHART_LIBRARY

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
      #qt public headers

        Michal Klocek
    
minor. comments in src.pro

              r603
            
      #this is very primitive and lame parser , TODO: make perl script insted

        Michal Klocek
    
Fix missig include dir form src.pro

              r591
            
      !exists($$CHART_BUILD_PUBLIC_HEADER_DIR)

      {

        Michal Klocek
    
minor. comments in src.pro

              r603
            
          system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)

        Michal Klocek
    
Fix missig include dir form src.pro

              r591
            
      }

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
      for(file, PUBLIC_HEADERS) {

          name = $$split(file,'/')

          name = $$last(name)

          class = "$$cat($$file)"

          class = $$find(class,class) 

          !isEmpty(class){

          class = $$split(class,QTCOMMERCIALCHART_EXPORT)

          class = $$member(class,1)

        Michal Klocek
    
minor. change in regpattern in src.pro

              r589
            
          class = $$split(class,' ')

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
          class = $$replace(class,' ','')

          class = $$member(class,0)

        Michal Klocek
    
Adds win32 command condition to src.pro

              r627
            
          win32:{

              command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"

          }else{

              command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"

          } 

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
          PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class

        Michal Klocek
    
Fix missig include dir form src.pro

              r591
            
          system($$command)

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
          }

      }

        Michal Klocek
    
fix CRLF in src.pro

              r36
            
      public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
      public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS

        Michal Klocek
    
fix CRLF in src.pro

              r36
            
      target.path = $$[QT_INSTALL_LIBS]

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
      INSTALLS += target public_headers

      install_build_public_headers.name = build_public_headers

        Michal Klocek
    
Adds private headers handling...

              r193
            
      install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h

      install_build_public_headers.input = PUBLIC_HEADERS

      install_build_public_headers.commands = $$QMAKE_COPY \

        Michal Klocek
    
Fix previous broken commit

              r145
            
          ${QMAKE_FILE_NAME} \

        Michal Klocek
    
Adds private headers handling...

              r193
            
          $$CHART_BUILD_PUBLIC_HEADER_DIR

      install_build_public_headers.CONFIG += target_predeps \

        Michal Klocek
    
Fix previous broken commit

              r145
            
          no_link

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
      install_build_private_headers.name = buld_private_headers

        Michal Klocek
    
Adds private headers handling...

              r193
            
      install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h

      install_build_private_headers.input = PRIVATE_HEADERS

      install_build_private_headers.commands = $$QMAKE_COPY \

          ${QMAKE_FILE_NAME} \

          $$CHART_BUILD_PRIVATE_HEADER_DIR

      install_build_private_headers.CONFIG += target_predeps \

          no_link

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
        Michal Klocek
    
Rename QChartSeries to QSeries

              r360
            
      QMAKE_EXTRA_COMPILERS += install_build_public_headers \

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
          install_build_private_headers \

        Michal Klocek
    
Revert "Integrated scatter series"...

              r39
            
      chartversion.target = qchartversion_p.h

        Michal Klocek
    
Fix previous broken commit

              r145
            
      chartversion.commands = @echo \

          "build_time" \

          > \

          $$chartversion.target;

      chartversion.depends = $$HEADERS \

          $$SOURCES

        Michal Klocek
    
Revert "Integrated scatter series"...

              r39
            
      PRE_TARGETDEPS += qchartversion_p.h

        Michal Klocek
    
Fix previous broken commit

              r145
            
      QMAKE_CLEAN += qchartversion_p.h

        Michal Klocek
    
Revert "Integrated scatter series"...

              r39
            
      QMAKE_EXTRA_TARGETS += chartversion

        Michal Klocek
    
Fix previous broken commit

              r145
            
      unix:QMAKE_DISTCLEAN += -r \

          $$CHART_BUILD_HEADER_DIR \

          $$CHART_BUILD_LIB_DIR

      win32:QMAKE_DISTCLEAN += /Q \

          $$CHART_BUILD_HEADER_DIR \

          $$CHART_BUILD_LIB_DIR

        Michal Klocek
    
Adds qt headers generation to build config

              r588
            
        Jani Honkonen
    
We have so many stupid warnings that "treat warnings as errors" flag is needed...

              r609
            
      # treat warnings as errors

        Jani Honkonen
    
Treat warnings as errors flag for m$ compilers

              r610
            
      win32-msvc*: {

          QMAKE_CXXFLAGS += /WX

      } else {

          QMAKE_CXXFLAGS += -Werror

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Michal Klocek Fix previous broken commit	r145	!include( ../common.pri ):error( Couldn't find the common.pri file! )
Michal Klocek fix CRLF in src.pro	r36	TARGET = QtCommercialChart
Michal Klocek Revert "Integrated scatter series"...	r39	DESTDIR = $$CHART_BUILD_LIB_DIR
Michal Klocek fix CRLF in src.pro	r36	TEMPLATE = lib
		QT += core \
		gui
Tero Ahola Adding user32.lib is now Win32/VS specific	r606	win32-msvc*: LIBS += User32.lib
Michal Klocek fix CRLF in src.pro	r36	CONFIG += debug_and_release
		CONFIG(debug, debug\|release):TARGET = QtCommercialChartd
Michal Klocek Move axes files to subdir	r478	SOURCES += \
Michal Klocek Refactors qchart , adds line animation...	r131	chartdataset.cpp \
		chartpresenter.cpp \
Michal Klocek minor. reorder compilation files in src.pro	r250	charttheme.cpp \
		domain.cpp \
		qchart.cpp \
Michal Klocek Rename QChartSeries to QSeries	r360	qchartview.cpp \
sauimone framework for legend	r524	qseries.cpp \
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	qlegend.cpp \
		legendmarker.cpp
Michal Klocek Move axes files to subdir	r478	PRIVATE_HEADERS += \
Michal Klocek Refactors qchart , adds line animation...	r131	chartdataset_p.h \
Michal Klocek minor. reorder compilation files in src.pro	r250	chartitem_p.h \
Michal Klocek Refactors qchart , adds line animation...	r131	chartpresenter_p.h \
Michal Klocek minor. reorder compilation files in src.pro	r250	charttheme_p.h \
sauimone Separated legend marker to private header. Added signals for left and right mouse click	r547	domain_p.h \
		legendmarker_p.h
		PUBLIC_HEADERS += \
Michal Klocek Move axes files to subdir	r478	qchart.h \
Michal Klocek Fix previous broken commit	r145	qchartglobal.h \
Michal Klocek Rename QChartSeries to QSeries	r360	qseries.h \
sauimone framework for legend	r524	qchartview.h \
		qlegend.h
Michal Klocek Animation refactor...	r530
		include(animations/animations.pri)
Michal Klocek Move axes files to subdir	r478	include(axis/axis.pri)
Michal Klocek Refactor line spline to common xyline...	r465	include(xychart/xychart.pri)
Michal Klocek Rename QChartSeries to QSeries	r360	include(linechart/linechart.pri)
Michal Klocek Adds area chart...	r421	include(areachart/areachart.pri)
Michal Klocek Rename QChartSeries to QSeries	r360	include(barchart/barchart.pri)
Jani Honkonen Moved pie stuff to own .pri file and rename stuff	r146	include(piechart/piechart.pri)
Tero Ahola Moved scatter impl into a subfolder	r194	include(scatterseries/scatter.pri)
Marek Rosa Spline initial	r295	include(splinechart/splinechart.pri)
Tero Ahola Moved scatter impl into a subfolder	r194
Jani Honkonen Adding list of series gradients to theme.	r494	THEMES += themes/chartthemedefault_p.h \
		themes/chartthemeicy_p.h \
Michal Klocek Refactor themes...	r143	themes/chartthemegrayscale_p.h \
		themes/chartthemescientific_p.h \
Tero Ahola Added draft of dark blue theme	r581	themes/chartthemevanilla_p.h \
Tero Ahola New theme with light colors, chartview background	r584	themes/chartthemebluecerulean_p.h \
		themes/chartthemelight_p.h

Tero Ahola Moved scatter impl into a subfolder	r194	HEADERS += $$PUBLIC_HEADERS
Michal Klocek fix CRLF in src.pro	r36	HEADERS += $$PRIVATE_HEADERS
Michal Klocek Refactor themes...	r143	HEADERS += $$THEMES
Michal Klocek Fix previous broken commit	r145	INCLUDEPATH += linechart \
		barchart \
		themes \
		.
Michal Klocek Revert "Integrated scatter series"...	r39	OBJECTS_DIR = $$CHART_BUILD_DIR/lib
		MOC_DIR = $$CHART_BUILD_DIR/lib
		UI_DIR = $$CHART_BUILD_DIR/lib
		RCC_DIR = $$CHART_BUILD_DIR/lib
Michal Klocek fix CRLF in src.pro	r36	DEFINES += QTCOMMERCIALCHART_LIBRARY
Michal Klocek Adds qt headers generation to build config	r588
		#qt public headers
Michal Klocek minor. comments in src.pro	r603	#this is very primitive and lame parser , TODO: make perl script insted
Michal Klocek Fix missig include dir form src.pro	r591	!exists($$CHART_BUILD_PUBLIC_HEADER_DIR)
		{
Michal Klocek minor. comments in src.pro	r603	system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
Michal Klocek Fix missig include dir form src.pro	r591	}

Michal Klocek Adds qt headers generation to build config	r588	for(file, PUBLIC_HEADERS) {
		name = $$split(file,'/')
		name = $$last(name)
		class = "$$cat($$file)"
		class = $$find(class,class)
		!isEmpty(class){
		class = $$split(class,QTCOMMERCIALCHART_EXPORT)
		class = $$member(class,1)
Michal Klocek minor. change in regpattern in src.pro	r589	class = $$split(class,' ')
Michal Klocek Adds qt headers generation to build config	r588	class = $$replace(class,' ','')
		class = $$member(class,0)
Michal Klocek Adds win32 command condition to src.pro	r627	win32:{
		command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
		}else{
		command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
		}
Michal Klocek Adds qt headers generation to build config	r588	PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
Michal Klocek Fix missig include dir form src.pro	r591	system($$command)
Michal Klocek Adds qt headers generation to build config	r588	}
		}

Michal Klocek fix CRLF in src.pro	r36	public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
Michal Klocek Adds qt headers generation to build config	r588	public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS

Michal Klocek fix CRLF in src.pro	r36	target.path = $$[QT_INSTALL_LIBS]
Michal Klocek Adds qt headers generation to build config	r588	INSTALLS += target public_headers

		install_build_public_headers.name = build_public_headers
Michal Klocek Adds private headers handling...	r193	install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
		install_build_public_headers.input = PUBLIC_HEADERS
		install_build_public_headers.commands = $$QMAKE_COPY \
Michal Klocek Fix previous broken commit	r145	${QMAKE_FILE_NAME} \
Michal Klocek Adds private headers handling...	r193	$$CHART_BUILD_PUBLIC_HEADER_DIR
		install_build_public_headers.CONFIG += target_predeps \
Michal Klocek Fix previous broken commit	r145	no_link
Michal Klocek Adds qt headers generation to build config	r588
		install_build_private_headers.name = buld_private_headers
Michal Klocek Adds private headers handling...	r193	install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
		install_build_private_headers.input = PRIVATE_HEADERS
		install_build_private_headers.commands = $$QMAKE_COPY \
		${QMAKE_FILE_NAME} \
		$$CHART_BUILD_PRIVATE_HEADER_DIR
		install_build_private_headers.CONFIG += target_predeps \
		no_link
Michal Klocek Adds qt headers generation to build config	r588
Michal Klocek Rename QChartSeries to QSeries	r360	QMAKE_EXTRA_COMPILERS += install_build_public_headers \
Michal Klocek Adds qt headers generation to build config	r588	install_build_private_headers \

Michal Klocek Revert "Integrated scatter series"...	r39	chartversion.target = qchartversion_p.h
Michal Klocek Fix previous broken commit	r145	chartversion.commands = @echo \
		"build_time" \
		> \
		$$chartversion.target;
		chartversion.depends = $$HEADERS \
		$$SOURCES
Michal Klocek Revert "Integrated scatter series"...	r39	PRE_TARGETDEPS += qchartversion_p.h
Michal Klocek Fix previous broken commit	r145	QMAKE_CLEAN += qchartversion_p.h
Michal Klocek Revert "Integrated scatter series"...	r39	QMAKE_EXTRA_TARGETS += chartversion
Michal Klocek Fix previous broken commit	r145	unix:QMAKE_DISTCLEAN += -r \
		$$CHART_BUILD_HEADER_DIR \
		$$CHART_BUILD_LIB_DIR
		win32:QMAKE_DISTCLEAN += /Q \
		$$CHART_BUILD_HEADER_DIR \
		$$CHART_BUILD_LIB_DIR
Michal Klocek Adds qt headers generation to build config	r588
Jani Honkonen We have so many stupid warnings that "treat warnings as errors" flag is needed...	r609	# treat warnings as errors
Jani Honkonen Treat warnings as errors flag for m$ compilers	r610	win32-msvc*: {
		QMAKE_CXXFLAGS += /WX
		} else {
		QMAKE_CXXFLAGS += -Werror
		}