Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dtk-widgets
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dtk
dtk-widgets
Commits
867f871d
Commit
867f871d
authored
Mar 07, 2019
by
LE BRETON Come
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds the first draft of menu bar generator from json.
parent
49560a68
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
273 additions
and
0 deletions
+273
-0
src/dtkWidgets/CMakeLists.txt
src/dtkWidgets/CMakeLists.txt
+3
-0
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator
+1
-0
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
+109
-0
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
+34
-0
tst/dtkWidgets/CMakeLists.txt
tst/dtkWidgets/CMakeLists.txt
+3
-0
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.cpp
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.cpp
+80
-0
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.h
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.h
+43
-0
No files found.
src/dtkWidgets/CMakeLists.txt
View file @
867f871d
...
...
@@ -64,6 +64,8 @@ set(${PROJECT_NAME}_HEADERS
dtkWidgetsParameterIntSpinBox.h
dtkWidgetsParameterFactory
dtkWidgetsParameterFactory.h
dtkWidgetsParameterMenuBarGenerator
dtkWidgetsParameterMenuBarGenerator.h
dtkWidgetsSettings
dtkWidgetsSettings.h
dtkWidgetsStylesheetParser
...
...
@@ -94,6 +96,7 @@ set(${PROJECT_NAME}_SOURCES
dtkWidgetsParameter.cpp
dtkWidgetsParameterIntSpinBox.cpp
dtkWidgetsParameterFactory.cpp
dtkWidgetsParameterMenuBarGenerator.cpp
dtkWidgetsSettings.cpp
dtkWidgetsStylesheetParser.cpp
dtkWidgetsWidget.cpp
)
...
...
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator
0 → 100644
View file @
867f871d
#include "dtkWidgetsParameterMenuBarGenerator.h"
\ No newline at end of file
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
0 → 100644
View file @
867f871d
// Version: $Id:
//
//
// Commentary:
//
//
// Change Log:
//
//
// Code:
#include "dtkWidgetsParameterMenuBarGenerator.h"
#include "dtkWidgetsParameter.h"
#include <dtkCore/dtkCoreParameter>
class
dtkWidgetsParameterMenuBarGeneratorPrivate
{
public:
void
parseGroup
(
const
QJsonObject
&
);
void
parseParameter
(
const
QJsonObject
&
);
public:
QHash
<
QString
,
dtkCoreAbstractParameter
*>
parameters
;
QHash
<
QString
,
dtkWidgetsAbstractParameter
*>
widgets
;
};
void
dtkWidgetsParameterMenuBarGeneratorPrivate
::
parseParameter
(
const
QJsonObject
&
parameter_object
)
{
QString
parameter_uid
=
parameter_object
[
"uid"
].
toString
();
bool
advanced
=
parameter_object
[
"advanced"
].
toBool
();
dtkCoreAbstractParameter
*
parameter
=
QString
widget
=
parameter_object
[
"widget"
].
toString
();
// parameters.insert(
qDebug
()
<<
"p uid"
<<
parameter_uid
<<
", advanced"
<<
advanced
<<
", widget"
<<
widget
;
}
void
dtkWidgetsParameterMenuBarGeneratorPrivate
::
parseGroup
(
const
QJsonObject
&
group_object
)
{
QString
group_uid
=
group_object
[
"uid"
].
toString
();
QString
icon
=
group_object
[
"icon"
].
toString
();
bool
advanced
=
group_object
[
"advanced"
].
toBool
();
QJsonArray
group_contents_array
=
group_object
[
"contents"
].
toArray
();
for
(
auto
it
=
group_contents_array
.
begin
();
it
!=
group_contents_array
.
end
();
++
it
)
{
if
(
it
->
isObject
())
{
QJsonObject
content_object
=
it
->
toObject
();
if
(
content_object
.
contains
(
"group"
))
{
QJsonObject
group_object
=
content_object
[
"group"
].
toObject
();
parseGroup
(
group_object
);
}
else
if
(
content_object
.
contains
(
"parameter"
))
{
QJsonObject
parameter_object
=
content_object
[
"parameter"
].
toObject
();
parseParameter
(
parameter_object
);
}
}
}
}
dtkWidgetsParameterMenuBarGenerator
::
dtkWidgetsParameterMenuBarGenerator
(
void
)
:
d
(
new
dtkWidgetsParameterMenuBarGeneratorPrivate
)
{
}
dtkWidgetsParameterMenuBarGenerator
::
dtkWidgetsParameterMenuBarGenerator
(
const
QString
&
nature_file_path
,
const
QString
&
definition_file_path
)
{
QFile
nature_file
(
nature_file_path
);
if
(
nature_file
.
open
(
QFile
::
ReadOnly
))
{
QJsonParseError
nature_error
;
QJsonDocument
nature_document
=
QJsonDocument
::
fromJson
(
nature_file
.
readAll
(),
&
nature_error
);
if
(
nature_error
.
error
!=
QJsonParseError
::
NoError
)
{
qWarning
()
<<
"Error :"
<<
nature_error
.
errorString
()
<<
"parsing"
<<
nature_file_path
<<
"offset :"
<<
nature_error
.
offset
;
return
;
}
QJsonObject
main_object
=
nature_document
.
object
();
QJsonValue
main_contents
=
main_object
[
"contents"
];
if
(
main_contents
.
isArray
())
{
QJsonArray
main_contents_array
=
main_contents
.
toArray
();
for
(
auto
it
=
main_contents_array
.
begin
();
it
!=
main_contents_array
.
end
();
++
it
)
{
if
(
it
->
isObject
())
{
QJsonObject
content_object
=
it
->
toObject
();
if
(
content_object
.
contains
(
"group"
))
{
QJsonObject
group_object
=
content_object
[
"group"
].
toObject
();
d
->
parseGroup
(
group_object
);
}
else
if
(
content_object
.
contains
(
"parameter"
))
{
QJsonObject
parameter_object
=
content_object
[
"parameter"
].
toObject
();
d
->
parseParameter
(
parameter_object
);
}
}
}
}
else
{
qWarning
()
<<
"We have an issue."
;
}
}
}
dtkWidgetsParameterMenuBarGenerator
::~
dtkWidgetsParameterMenuBarGenerator
(
void
)
{
delete
d
;
}
//
// dtkWidgetsParameterMenuBarGenerator.cpp ends here
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
0 → 100644
View file @
867f871d
// Version: $Id$
//
//
// Commentary:
//
//
// Change Log:
//
//
// Code:
#pragma once
#include <dtkWidgetsExport>
#include <QtCore>
class
DTKWIDGETS_EXPORT
dtkWidgetsParameterMenuBarGenerator
{
public:
dtkWidgetsParameterMenuBarGenerator
(
void
);
dtkWidgetsParameterMenuBarGenerator
(
const
QString
&
,
const
QString
&
);
~
dtkWidgetsParameterMenuBarGenerator
(
void
);
protected:
class
dtkWidgetsParameterMenuBarGeneratorPrivate
*
d
;
};
//
// dtkWidgetsParameterMenuBarGenerator.h ends here
tst/dtkWidgets/CMakeLists.txt
View file @
867f871d
...
...
@@ -26,10 +26,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set
(
${
PROJECT_NAME
}
_HEADERS
dtkWidgetsParametersTest.h
dtkWidgetsParameterMenuBarGeneratorTest.h
)
set
(
${
PROJECT_NAME
}
_SOURCES
dtkWidgetsParametersTest.cpp
dtkWidgetsParameterMenuBarGeneratorTest.cpp
)
## ###################################################################
...
...
@@ -65,6 +67,7 @@ target_link_libraries(${PROJECT_NAME} Qt5::Test)
## ###################################################################
add_test
(
dtkWidgetsParametersTest
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/
${
PROJECT_NAME
}
dtkWidgetsParametersTest
)
add_test
(
dtkWidgetsParameterMenuBarGeneratorTest
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/
${
PROJECT_NAME
}
dtkWidgetsParameterMenuBarGeneratorTest
)
######################################################################
### CMakeLists.txt ends here
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.cpp
0 → 100644
View file @
867f871d
// Version: $Id$
//
//
// Commentary:
//
//
// Change Log:
//
//
// Code:
#include "dtkWidgetsParameterMenuBarGeneratorTest.h"
#include <dtkWidgetsTest>
#include <dtkWidgets/dtkWidgets>
#include <dtkWidgets/dtkWidgetsParameterMenuBarGenerator>
// ///////////////////////////////////////////////////////////////////
//
// ///////////////////////////////////////////////////////////////////
class
dtkWidgetsParameterMenuBarGeneratorTestCasePrivate
{
};
// ///////////////////////////////////////////////////////////////////
//
// ///////////////////////////////////////////////////////////////////
dtkWidgetsParameterMenuBarGeneratorTestCase
::
dtkWidgetsParameterMenuBarGeneratorTestCase
(
void
)
:
d
(
new
dtkWidgetsParameterMenuBarGeneratorTestCasePrivate
)
{
dtk
::
widgets
::
setVerboseLoading
(
true
);
dtk
::
widgets
::
initialize
(
""
);
}
dtkWidgetsParameterMenuBarGeneratorTestCase
::~
dtkWidgetsParameterMenuBarGeneratorTestCase
(
void
)
{
delete
d
;
}
void
dtkWidgetsParameterMenuBarGeneratorTestCase
::
initTestCase
(
void
)
{
}
void
dtkWidgetsParameterMenuBarGeneratorTestCase
::
init
(
void
)
{
}
void
dtkWidgetsParameterMenuBarGeneratorTestCase
::
testBasic
(
void
)
{
QString
nature_file_path
=
QFINDTESTDATA
(
"../resources/parameters_nature.json"
);
QString
definition_file_path
=
QFINDTESTDATA
(
"../resources/parameters_definition.json"
);
dtkWidgetsParameterMenuBarGenerator
menu_bar_generator
(
nature_file_path
,
definition_file_path
);
}
void
dtkWidgetsParameterMenuBarGeneratorTestCase
::
cleanup
(
void
)
{
}
void
dtkWidgetsParameterMenuBarGeneratorTestCase
::
cleanupTestCase
(
void
)
{
}
DTKWIDGETSTEST_MAIN
(
dtkWidgetsParameterMenuBarGeneratorTest
,
dtkWidgetsParameterMenuBarGeneratorTestCase
)
//
// dtkWidgetsParameterMenuBarGeneratorTest.cpp ends here
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.h
0 → 100644
View file @
867f871d
// Version: $Id$
//
//
// Commentary:
//
//
// Change Log:
//
//
// Code:
#pragma once
#include <dtkWidgetsTest>
class
dtkWidgetsParameterMenuBarGeneratorTestCase
:
public
QObject
{
Q_OBJECT
public:
dtkWidgetsParameterMenuBarGeneratorTestCase
(
void
);
~
dtkWidgetsParameterMenuBarGeneratorTestCase
(
void
);
private
slots
:
void
initTestCase
(
void
);
void
init
(
void
);
private
slots
:
void
testBasic
(
void
);
private
slots
:
void
cleanupTestCase
(
void
);
void
cleanup
(
void
);
private:
class
dtkWidgetsParameterMenuBarGeneratorTestCasePrivate
*
d
;
};
//
// dtkWidgetsParameterMenuBarGeneratorTest.h ends here
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment