# HG changeset patch # User am@osimis.io # Date 1535641771 -7200 # Node ID df5011cf903c30706f92a0b4dc286fc5e1d817a5 # Parent 87376a645ee19a8578f0aa295349f44ffa41edf7 renaming diff -r 87376a645ee1 -r df5011cf903c Applications/Qt/BasicQtApplicationRunner.cpp --- a/Applications/Qt/BasicQtApplicationRunner.cpp Thu Aug 30 17:06:22 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/** - * Stone of Orthanc - * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics - * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2018 Osimis S.A., Belgium - * - * This program is free software: you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - **/ - - -#if ORTHANC_ENABLE_QT != 1 -#error this file shall be included only with the ORTHANC_ENABLE_QT set to 1 -#endif - -#include "BasicQtApplicationRunner.h" -#include -#include - -#include "../../Framework/Toolbox/MessagingToolbox.h" - -#include -#include -#include -#include -#include "../../Platforms/Generic/OracleWebService.h" - - -namespace OrthancStone -{ - void BasicQtApplicationRunner::Initialize() - { - } - - void BasicQtApplicationRunner::DeclareCommandLineOptions(boost::program_options::options_description& options) - { - } - - void BasicQtApplicationRunner::Run(NativeStoneApplicationContext& context, const std::string& title, int argc, char* argv[]) - { - context.Start(); - - QApplication app(argc, argv); - InitializeMainWindow(context); - - window_->show(); - app.exec(); - - context.Stop(); - } - - void BasicQtApplicationRunner::Finalize() - { - } - - -} diff -r 87376a645ee1 -r df5011cf903c Applications/Qt/BasicQtApplicationRunner.h --- a/Applications/Qt/BasicQtApplicationRunner.h Thu Aug 30 17:06:22 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/** - * Stone of Orthanc - * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics - * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2018 Osimis S.A., Belgium - * - * This program is free software: you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - **/ - - -#pragma once - -#include "../Generic/NativeStoneApplicationRunner.h" -#include "QStoneMainWindow.h" - -#if ORTHANC_ENABLE_QT != 1 -#error this file shall be included only with the ORTHANC_ENABLE_QT set to 1 -#endif - -namespace OrthancStone -{ - class BasicQtApplicationRunner : public NativeStoneApplicationRunner - { - protected: - std::auto_ptr window_; - - virtual void InitializeMainWindow(NativeStoneApplicationContext& context) = 0; - public: - BasicQtApplicationRunner(MessageBroker& broker, - IStoneApplication& application) - : NativeStoneApplicationRunner(broker, application) - { - } - - - virtual void Initialize(); - - virtual void DeclareCommandLineOptions(boost::program_options::options_description& options); - virtual void ParseCommandLineOptions(const boost::program_options::variables_map& parameters) {} - virtual void Run(NativeStoneApplicationContext& context, const std::string& title, int argc, char* argv[]); - virtual void Finalize(); - }; - -} diff -r 87376a645ee1 -r df5011cf903c Applications/Qt/QtStoneApplicationRunner.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Applications/Qt/QtStoneApplicationRunner.cpp Thu Aug 30 17:09:31 2018 +0200 @@ -0,0 +1,67 @@ +/** + * Stone of Orthanc + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2018 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + **/ + + +#if ORTHANC_ENABLE_QT != 1 +#error this file shall be included only with the ORTHANC_ENABLE_QT set to 1 +#endif + +#include "QtStoneApplicationRunner.h" +#include +#include + +#include "../../Framework/Toolbox/MessagingToolbox.h" + +#include +#include +#include +#include +#include "../../Platforms/Generic/OracleWebService.h" + + +namespace OrthancStone +{ + void QtStoneApplicationRunner::Initialize() + { + } + + void QtStoneApplicationRunner::DeclareCommandLineOptions(boost::program_options::options_description& options) + { + } + + void QtStoneApplicationRunner::Run(NativeStoneApplicationContext& context, const std::string& title, int argc, char* argv[]) + { + context.Start(); + + QApplication app(argc, argv); + InitializeMainWindow(context); + + window_->show(); + app.exec(); + + context.Stop(); + } + + void QtStoneApplicationRunner::Finalize() + { + } + + +} diff -r 87376a645ee1 -r df5011cf903c Applications/Qt/QtStoneApplicationRunner.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Applications/Qt/QtStoneApplicationRunner.h Thu Aug 30 17:09:31 2018 +0200 @@ -0,0 +1,55 @@ +/** + * Stone of Orthanc + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2018 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + **/ + + +#pragma once + +#include "../Generic/NativeStoneApplicationRunner.h" +#include "QStoneMainWindow.h" + +#if ORTHANC_ENABLE_QT != 1 +#error this file shall be included only with the ORTHANC_ENABLE_QT set to 1 +#endif + +namespace OrthancStone +{ + class QtStoneApplicationRunner : public NativeStoneApplicationRunner + { + protected: + std::auto_ptr window_; + + virtual void InitializeMainWindow(NativeStoneApplicationContext& context) = 0; + public: + QtStoneApplicationRunner(MessageBroker& broker, + IStoneApplication& application) + : NativeStoneApplicationRunner(broker, application) + { + } + + + virtual void Initialize(); + + virtual void DeclareCommandLineOptions(boost::program_options::options_description& options); + virtual void ParseCommandLineOptions(const boost::program_options::variables_map& parameters) {} + virtual void Run(NativeStoneApplicationContext& context, const std::string& title, int argc, char* argv[]); + virtual void Finalize(); + }; + +} diff -r 87376a645ee1 -r df5011cf903c Applications/Samples/Qt/SampleQtApplicationRunner.h --- a/Applications/Samples/Qt/SampleQtApplicationRunner.h Thu Aug 30 17:06:22 2018 +0200 +++ b/Applications/Samples/Qt/SampleQtApplicationRunner.h Thu Aug 30 17:09:31 2018 +0200 @@ -21,7 +21,7 @@ #pragma once -#include "../../Qt/BasicQtApplicationRunner.h" +#include "../../Qt/QtStoneApplicationRunner.h" #include "SampleMainWindow.h" #if ORTHANC_ENABLE_QT != 1 @@ -32,7 +32,7 @@ { namespace Samples { - class SampleQtApplicationRunner : public OrthancStone::BasicQtApplicationRunner + class SampleQtApplicationRunner : public OrthancStone::QtStoneApplicationRunner { protected: virtual void InitializeMainWindow(OrthancStone::NativeStoneApplicationContext& context) @@ -42,7 +42,7 @@ public: SampleQtApplicationRunner(MessageBroker& broker, SampleApplicationBase& application) - : OrthancStone::BasicQtApplicationRunner(broker, application) + : OrthancStone::QtStoneApplicationRunner(broker, application) { } diff -r 87376a645ee1 -r df5011cf903c Resources/CMake/QtConfiguration.cmake --- a/Resources/CMake/QtConfiguration.cmake Thu Aug 30 17:06:22 2018 +0200 +++ b/Resources/CMake/QtConfiguration.cmake Thu Aug 30 17:09:31 2018 +0200 @@ -28,7 +28,7 @@ list(APPEND QT_SOURCES ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.cpp - ${ORTHANC_STONE_ROOT}/Applications/Qt/BasicQtApplicationRunner.cpp + ${ORTHANC_STONE_ROOT}/Applications/Qt/QtStoneApplicationRunner.cpp ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.cpp )