Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
common
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Alexander Lapshin
common
Commits
b240e007
Commit
b240e007
authored
Dec 26, 2019
by
Alexander Lapshin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
5fed7eb9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
4 deletions
+28
-4
PropInfoBase.cpp
utils/PropInfoBase.cpp
+17
-2
PropInfoBase.h
utils/PropInfoBase.h
+11
-2
No files found.
utils/PropInfoBase.cpp
View file @
b240e007
...
...
@@ -2,14 +2,22 @@
#include <utility>
#include "XMLFunctions.h"
PropInfoBase
::
PropInfoBase
(
std
::
string
lightModel
,
EarthModel
earthModel
,
AtmModel
atmModel
,
const
bool
sun
,
const
bool
moon
,
const
int
type
)
PropInfoBase
::
PropInfoBase
(
std
::
string
lightModel
,
EarthModel
earthModel
,
AtmModel
atmModel
,
const
bool
sun
,
const
bool
moon
,
const
bool
prec_itrf
,
const
int
type
)
:
m_atmModel
(
std
::
move
(
atmModel
)),
m_earthModel
(
std
::
move
(
earthModel
)),
m_lightModel
(
std
::
move
(
lightModel
)),
m_sun
(
sun
),
m_moon
(
moon
),
m_type
(
type
)
m_type
(
type
),
m_prec_itrf
(
prec_itrf
)
{
}
...
...
@@ -37,6 +45,9 @@ bool PropInfoBase::Load(myXML::Contain* parent)
LoadXML
(
con
,
"AtmModel"
,
m_atmModel
,
false
);
LoadXML
(
con
,
"Id"
,
m_id
,
false
,
&
idloaded
);
m_prec_itrf
=
false
;
LoadXML
(
con
,
"prec_itrf"
,
m_prec_itrf
,
false
);
return
true
;
}
...
...
@@ -58,6 +69,9 @@ void PropInfoBase::load(const jsonval& parent)
loadjson
(
parent
,
"light"
,
m_lightModel
);
loadjson
(
parent
,
"earth"
,
m_earthModel
);
loadjson
(
parent
,
"atm"
,
m_atmModel
,
false
);
m_prec_itrf
=
false
;
loadjson
(
parent
,
"prec_itrf"
,
m_prec_itrf
,
false
);
}
std
::
string
PropInfoBase
::
GetAsXML
()
const
...
...
@@ -73,6 +87,7 @@ std::string PropInfoBase::GetAsXML() const
PutValue
(
outs
,
"Sun"
,
m_sun
);
PutValue
(
outs
,
"Moon"
,
m_moon
);
PutValue
(
outs
,
"LightModel"
,
m_lightModel
);
PutValue
(
outs
,
"prec_itrf"
,
m_prec_itrf
);
outs
<<
"<EarthModel>"
;
PutValue
(
outs
,
"Model"
,
m_earthModel
.
GetModel
());
...
...
utils/PropInfoBase.h
View file @
b240e007
...
...
@@ -21,13 +21,21 @@ public:
PropInfoBase
()
{
};
PropInfoBase
(
std
::
string
lightModel
,
EarthModel
earthModel
,
AtmModel
atmModel
,
bool
sun
,
bool
moon
,
int
type
);
PropInfoBase
(
std
::
string
lightModel
,
EarthModel
earthModel
,
AtmModel
atmModel
,
const
bool
sun
,
const
bool
moon
,
const
bool
prec_itrf
,
const
int
type
);
bool
Load
(
myXML
::
Contain
*
parent
);
void
load
(
const
jsonval
&
parent
);
bool
IsSun
()
const
{
return
m_sun
;
}
bool
IsMoon
()
const
{
return
m_moon
;
}
int
GetType
()
const
{
return
m_type
;
}
bool
is_prec_itrf
()
const
{
return
m_prec_itrf
;
}
const
AtmModel
&
GetAtmModel
()
const
{
return
m_atmModel
;
}
const
EarthModel
&
GetEarthModel
()
const
{
return
m_earthModel
;
}
std
::
string
GetLightModel
()
const
{
return
m_lightModel
;
}
...
...
@@ -35,7 +43,7 @@ public:
void
ToXml
(
std
::
ostream
&
outs
)
const
;
private
:
static
std
::
string
TypeConvert
(
int
value
);
static
std
::
string
TypeConvert
(
int
value
)
;
static
int
TypeConvert
(
const
std
::
string
&
value
);
AtmModel
m_atmModel
;
...
...
@@ -45,6 +53,7 @@ private:
bool
m_moon
;
int
m_type
;
int
m_id
;
bool
m_prec_itrf
{
false
};
};
typedef
std
::
map
<
int
,
PropInfoBase
>
PropInfoBases
;
...
...
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