HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · tests/qmlchartaxis/main.cpp

Adjust various margins and paddings....

Adjust various margins and paddings. The text items have been changed to use QGraphicsTextItem bounding rects instead of calculating dimensions using QFontMetrics. It seems that QGraphicsTextItem boundingRect involves a lot more of a margin than QFontMetrics provided. To compensate, various margins and paddings have been adjusted lower. Change-Id: Idebf939f5dd804fb96daeaea4bbf1b45f4f02908 Reviewed-by: Mika Salmela <mika.salmela@digia.com>

Heikkinen Miikka - - Load All Authors

File last commit:

r2523:abf0d5005e35


                r2569:f4eaee212ddc

Download file

             main.cpp
        
                    42 lines
            
             | 1.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / tests / qmlchartaxis / main.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
      /****************************************************************************

      **

        Miikka Heikkinen
    
More copyright year changes

              r2433
            
      ** Copyright (C) 2013 Digia Plc

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

      ** This file is part of the Qt Commercial Charts Add-on.

      **

      ** $QT_BEGIN_LICENSE$

      ** Licensees holding valid Qt Commercial licenses may use this file in

      ** accordance with the Qt Commercial License Agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and Digia.

      **

      ** If you have questions regarding the use of this file, please use

      ** contact form at http://qt.digia.com

      ** $QT_END_LICENSE$

      **

      ****************************************************************************/

        Marek Rosa
    
Qt5: fixed QApplication and QWidget includes

              r2049
            
      #include <QApplication>

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
      #include <QDeclarativeEngine>

        Heikkinen Miikka
    
Fix qml application deployment for android...

              r2523
            
      #include <QDir>

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
      #include "qmlapplicationviewer.h"

      Q_DECL_EXPORT int main(int argc, char *argv[])

      {

          QScopedPointer<QApplication> app(createApplication(argc, argv));

          QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());

        Heikkinen Miikka
    
Fix qml application deployment for android...

              r2523
            
      #ifdef Q_OS_ANDROID

          viewer->addImportPath(QString::fromLatin1("assets:/imports"));

          viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));

      #else

          viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));

      #endif

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
        Marek Rosa
    
Qt5: declarative fix part4...

              r2055
            
          // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);

        Tero Ahola
    
Refactored QML axis handling

              r1813
            
          viewer->setSource(QUrl("qrc:/qml/qmlchartaxis/main.qml"));

          viewer->showExpanded();

          return app->exec();

      }

	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

Tero Ahola Refactored QML axis handling	r1813	/****************************************************************************
		**
Miikka Heikkinen More copyright year changes	r2433	** Copyright (C) 2013 Digia Plc
Tero Ahola Refactored QML axis handling	r1813	** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Commercial Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Commercial licenses may use this file in
		** accordance with the Qt Commercial License Agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and Digia.
		**
		** If you have questions regarding the use of this file, please use
		** contact form at http://qt.digia.com
		** $QT_END_LICENSE$
		**
		****************************************************************************/

Marek Rosa Qt5: fixed QApplication and QWidget includes	r2049	#include <QApplication>
Tero Ahola Refactored QML axis handling	r1813	#include <QDeclarativeEngine>
Heikkinen Miikka Fix qml application deployment for android...	r2523	#include <QDir>
Tero Ahola Refactored QML axis handling	r1813	#include "qmlapplicationviewer.h"

		Q_DECL_EXPORT int main(int argc, char *argv[])
		{
		QScopedPointer<QApplication> app(createApplication(argc, argv));
		QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
Heikkinen Miikka Fix qml application deployment for android...	r2523	#ifdef Q_OS_ANDROID
		viewer->addImportPath(QString::fromLatin1("assets:/imports"));
		viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
		#else
		viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
		#endif
Tero Ahola Refactored QML axis handling	r1813
Marek Rosa Qt5: declarative fix part4...	r2055	// // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
Tero Ahola Refactored QML axis handling	r1813	viewer->setSource(QUrl("qrc:/qml/qmlchartaxis/main.qml"));
		viewer->showExpanded();

		return app->exec();
		}