HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1352:fb8f470a1906

0

plugins/generic_ws/CMakeLists.txt created 644 +25 0

			@@ -0,0 +1,25
		1	include_directories(include)
		2	FILE (GLOB_RECURSE genericWS_SRCS
		3	include/*.h
		4	src/*.cpp
		5	resources/*.qrc
		6	)
		7
		8	add_definitions(-DQT_PLUGIN)
		9	add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/genericWS.json")
		10	if(NOT BUILD_SHARED_LIBS)
		11	add_definitions(-DQT_STATICPLUGIN)
		12	endif()
		13
		14	add_library(generic_ws ${genericWS_SRCS})
		15	SET_TARGET_PROPERTIES(generic_ws PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
		16
		17	target_link_libraries(generic_ws PUBLIC sciqlopgui)
		18
		19	install(TARGETS generic_ws
		20	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
		21	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
		22	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
		23
		24	include(sciqlop_tests)
		25

0

plugins/generic_ws/include/GenericWSEngine.h created 644 +26 0

			@@ -0,0 +1,26
		1	#ifndef GENERICWSENGINE_H
		2	#define GENERICWSENGINE_H
		3	#include <Data/IDataProvider.h>
		4	#include <Data/DataProviderParameters.h>
		5
		6	class GenericWSEngine: public IDataProvider
		7	{
		8	public:
		9	virtual std::shared_ptr<IDataProvider> clone() const override
		10	{
		11	return std::make_shared<GenericWSEngine>();
		12	}
		13
		14	virtual IDataSeries* getData(const DataProviderParameters &parameters) override
		15	{
		16	auto range = parameters.m_Range;
		17	auto metadata = parameters.m_Data;
		18	auto WS = metadata["WS"].toString();
		19	auto parameter = metadata["WS"].toString();
		20	return nullptr;
		21	}
		22
		23
		24	};
		25
		26	#endif

0

plugins/generic_ws/include/GenericWSPlugin.h created 644 +24 0

			@@ -0,0 +1,24
		1	#ifndef GENERICWSPLUGIN_H
		2	#define GENERICWSPLUGIN_H
		3
		4	#include <Plugin/IPlugin.h>
		5
		6
		7	#include <memory>
		8
		9	#ifndef SCIQLOP_PLUGIN_JSON_FILE_PATH
		10	#define SCIQLOP_PLUGIN_JSON_FILE_PATH "genericWS.json"
		11	#endif
		12
		13	class DataSourceItem;
		14
		15	class GenericWS : public QObject, public IPlugin {
		16	Q_OBJECT
		17	Q_INTERFACES(IPlugin)
		18	Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH)
		19	public:
		20	/// @sa IPlugin::initialize()
		21	void initialize() override;
		22	};
		23
		24	#endif // GENERICWSPLUGIN_H

0

plugins/generic_ws/resources/genericWS.json created 644 +3 0

0

plugins/generic_ws/src/GenericWSEngine.cpp created 644 +1 0

			@@ -0,0 +1,1
		1	#include "GenericWSEngine.h"

0

plugins/generic_ws/src/GenericWSPlugin.cpp created 644 +1 0

			@@ -0,0 +1,1
		1	#include "GenericWSEngine.h"

0

subprojects/libcatalogs created 160000 +1 0

			@@ -0,0 +1,1
		1	Subproject commit f2fa281306099e7136a288dd70fd97d0e33afa15

0

.gitignore +2 -1

              subprojects/CatalogueAPI/
              subprojects/QxOrm/
              documentation/*
-             .idea/*
+             **/.idea/*
              **/__pycache__/*
+             *.srctrl*

0

CMakeLists.txt +5 -2

              enable_testing()
-             find_package(core CONFIG QUIET)
-             if (NOT sciqlopcore_FOUND)
+             find_package(SciQLOPCore CONFIG QUIET)
+             if (NOT SciQLOPCore_FOUND)
+                 if(NOT IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/core)
+                     message("Init submodule Core")
                  execute_process(COMMAND git submodule init core WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
                  execute_process(COMMAND git submodule update core WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+                 endif()
                  add_subdirectory(core)
              endif()

0

core +1 -1

		@@ -1,1 +1,1
1		Subproject commit a05b0ab234936e28b6ba79535ccaee297d83a1e8
	1	Subproject commit 6b6270b07547ddc94a57ecd2cdb54784412c1081

0

gui/include/Visualization/VisualizationGraphWidget.h +3 0

              #include <QLoggingCategory>
              #include <QWidget>
+             #include <QUuid>
              #include <memory>
                  void onDataCacheVariableUpdated();
                  void onUpdateVarDisplaying(std::shared_ptr<Variable> variable, const DateTimeRange &range);
+                 void variableUpdated(QUuid id);
              };
              #endif // SCIQLOP_VISUALIZATIONGRAPHWIDGET_H

0

gui/src/Variable/VariableInspectorWidget.cpp +1 -4

              void VariableInspectorWidget::onTableMenuRequested(const QPoint &pos) noexcept
              {
                  auto selectedRows = ui->tableView->selectionModel()->selectedRows();
-                 // Gets the model to retrieve the underlying selected variables
-                 auto& vc = sqpApp->variableController();
                  auto selectedVariables = QVector<std::shared_ptr<Variable> >{};
                  for (const auto &selectedRow : qAsConst(selectedRows)) {
-                     if (auto selectedVariable = vc[selectedRow.row()]) {
+                     if (auto selectedVariable = this->m_model->variables()[selectedRow.row()]) {
                          selectedVariables.push_back(selectedVariable);
                      }
                  }

0

gui/src/Visualization/VisualizationGraphWidget.cpp +14 -5

                      setGraphRange(range);
                      this->setFlags(GraphFlag::EnableAll);
                  }
-                 connect(variable.get(),&Variable::updated,
-                         [variable=variable,this]()
+                 {
-                     QMetaObject::invokeMethod(this,[variable=variable,this](){this->onUpdateVarDisplaying(variable,this->graphRange());});
-                 });
+                 //@TODO this is bad! when variable is moved to another graph it still fires
+                 // even if this has been deleted
+                 connect(variable.get(),&Variable::updated,this, &VisualizationGraphWidget::variableUpdated);
                  this->onUpdateVarDisplaying(variable,range);//My bullshit
                  emit variableAdded(variable);
              }
                      impl->updateData(it->second, variable, range);
                  }
              }
+             void VisualizationGraphWidget::variableUpdated(QUuid id)
+             {
+                 for(auto& [var,plotables]:impl->m_VariableToPlotMultiMap)
+                 {
+                     if(var->ID()==id)
+                     {
+                             impl->updateData(plotables,var,this->graphRange());
+                     }
+                 }
+             }

0

plugins/CMakeLists.txt +1 0

              add_subdirectory(mockplugin)
              add_subdirectory(amda)
+             add_subdirectory(generic_ws)

0

plugins/amda/src/AmdaProvider.cpp +1 -1

              IDataSeries* AmdaProvider::getData(const DataProviderParameters &parameters)
              {
-                 auto range = parameters.m_Times.front();
+                 auto range = parameters.m_Range;
                  auto metaData = parameters.m_Data;
                  auto productId = metaData.value(AMDA_XML_ID_KEY).toString();
                  auto productValueType

0

plugins/amda/src/AmdaServer.cpp +1 -1

              const auto AMDA_DEFAULT_SERVER_URL = QStringLiteral("amda.irap.omp.eu");
              /// URL of the AMDA test server
-             const auto AMDA_TEST_SERVER_URL = QStringLiteral("amdatest.irap.omp.eu");
+             const auto AMDA_TEST_SERVER_URL = QStringLiteral("amdadev.irap.omp.eu/");
              /// Port used for local server
              const auto AMDA_LOCAL_SERVER_PORT = 6543;

0

plugins/mockplugin/src/CosinusProvider.cpp +1 -1

              IDataSeries* CosinusProvider::getData(const DataProviderParameters &parameters)
              {
-                 return _generate(parameters.m_Times.front(),parameters.m_Data);
+                 return _generate(parameters.m_Range, parameters.m_Data);
              }

	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