Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitri Naumov
ogs
Commits
1b9999b4
Commit
1b9999b4
authored
6 years ago
by
Karsten Rink
Committed by
Dmitri Naumov
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fixed surfaces not being loaded into data explorer
parent
d17b771b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GeoLib/GEOObjects.cpp
+1
-4
1 addition, 4 deletions
GeoLib/GEOObjects.cpp
GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
+12
-12
12 additions, 12 deletions
GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
with
13 additions
and
16 deletions
GeoLib/GEOObjects.cpp
+
1
−
4
View file @
1b9999b4
...
...
@@ -219,10 +219,7 @@ void GEOObjects::addSurfaceVec(
{
_sfc_vecs
.
push_back
(
new
SurfaceVec
(
name
,
std
::
move
(
sfc
),
std
::
move
(
sfc_names
)));
if
(
_sfc_vecs
.
back
()
->
size
()
==
0
)
{
_callbacks
->
addSurfaceVec
(
name
);
}
_callbacks
->
addSurfaceVec
(
name
);
}
bool
GEOObjects
::
appendSurfaceVec
(
const
std
::
vector
<
Surface
*>&
surfaces
,
...
...
This diff is collapsed.
Click to expand it.
GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
+
12
−
12
View file @
1b9999b4
...
...
@@ -215,9 +215,9 @@ void XmlGmlInterface::readPolylines(
ply_names
->
insert
(
std
::
pair
<
std
::
string
,
std
::
size_t
>
(
ply_name
,
idx
));
}
else
{
WARN
(
"Polyline '%s' exists already.
The p
olyline will be "
"Polyline '%s' exists already.
P
olyline
%d
will be "
"inserted without a name."
,
ply_name
.
c_str
());
ply_name
.
c_str
()
,
idx
);
}
}
...
...
@@ -232,8 +232,8 @@ void XmlGmlInterface::readPolylines(
polyline_name
=
polyline
.
attribute
(
"name"
).
toStdString
();
OGS_FATAL
(
"Polyline `%s' contains the point id `%d'
, but the
"
"
id is
not in the point list."
,
"Polyline `%s' contains the point id `%d'
which is
"
"not in the point list."
,
polyline_name
.
c_str
(),
pt_idx
);
}
return
search
->
second
;
...
...
@@ -276,8 +276,8 @@ void XmlGmlInterface::readSurfaces(
surface_name
=
surface
.
attribute
(
"name"
).
toStdString
();
OGS_FATAL
(
"Surface `%s' contains the point id `%d',
but the
"
"
id is
not in the point list."
,
"Surface `%s' contains the point id `%d',
which is
"
"not in the point list."
,
surface_name
.
c_str
(),
pt_idx
);
}
return
search
->
second
;
...
...
@@ -363,13 +363,13 @@ bool XmlGmlInterface::write()
}
else
{
ERR
(
"XmlGmlInterface::write(): Point vector empty, abort writing geometry."
);
ERR
(
"XmlGmlInterface::write(): Point vector
is
empty, abort writing geometry."
);
return
0
;
}
}
else
{
ERR
(
"XmlGmlInterface::write():
Did not found any
point vector, abort writing geometry."
);
ERR
(
"XmlGmlInterface::write():
No
point vector
found
, abort writing geometry."
);
return
0
;
}
...
...
@@ -412,11 +412,11 @@ bool XmlGmlInterface::write()
}
}
else
INFO
(
"XmlGmlInterface::write(): Polyline vector empty, no polylines written to file."
);
INFO
(
"XmlGmlInterface::write(): Polyline vector
is
empty, no polylines written to file."
);
}
}
else
INFO
(
"XmlGmlInterface::write():
Did not found any p
olyline vector, no polylines written to file."
);
INFO
(
"XmlGmlInterface::write():
P
olyline vector
is empty
, no polylines written to file."
);
// SURFACES
...
...
@@ -458,11 +458,11 @@ bool XmlGmlInterface::write()
}
}
else
INFO
(
"XmlGmlInterface::write(): Surface vector empty, no surfaces written to file."
);
INFO
(
"XmlGmlInterface::write(): Surface vector
is
empty, no surfaces written to file."
);
}
}
else
INFO
(
"XmlGmlInterface::write():
Did not found any s
urface vector, no surfaces written to file."
);
INFO
(
"XmlGmlInterface::write():
S
urface vector
is empty
, no surfaces written to file."
);
//insertStyleFileDefinition(filename);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment