Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
wenqing
ogs
Commits
000e8b21
Commit
000e8b21
authored
May 25, 2020
by
wenqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DataMemberRenaming: move underscore to end] cpp files in Application
parent
ae9b2e82
Pipeline
#938
passed with stages
in 66 minutes and 26 seconds
Changes
107
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
107 changed files
with
2178 additions
and
2178 deletions
+2178
-2178
Applications/ApplicationsLib/ProjectData.cpp
Applications/ApplicationsLib/ProjectData.cpp
+141
-141
Applications/ApplicationsLib/TestDefinition.cpp
Applications/ApplicationsLib/TestDefinition.cpp
+6
-6
Applications/DataExplorer/Base/ColorPickerPushButton.cpp
Applications/DataExplorer/Base/ColorPickerPushButton.cpp
+7
-7
Applications/DataExplorer/Base/RecentFiles.cpp
Applications/DataExplorer/Base/RecentFiles.cpp
+16
-16
Applications/DataExplorer/Base/TreeItem.cpp
Applications/DataExplorer/Base/TreeItem.cpp
+17
-17
Applications/DataExplorer/Base/TreeModel.cpp
Applications/DataExplorer/Base/TreeModel.cpp
+11
-11
Applications/DataExplorer/Base/TreeModelIterator.cpp
Applications/DataExplorer/Base/TreeModelIterator.cpp
+14
-14
Applications/DataExplorer/Base/modeltest.cpp
Applications/DataExplorer/Base/modeltest.cpp
+2
-2
Applications/DataExplorer/DataView/ColorTableModel.cpp
Applications/DataExplorer/DataView/ColorTableModel.cpp
+3
-3
Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
+6
-6
Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
...cations/DataExplorer/DataView/DiagramView/DiagramList.cpp
+35
-35
Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
.../DataExplorer/DataView/DiagramView/DiagramPrefsDialog.cpp
+24
-24
Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp
...ations/DataExplorer/DataView/DiagramView/DiagramScene.cpp
+108
-108
Applications/DataExplorer/DataView/DiagramView/DiagramView.cpp
...cations/DataExplorer/DataView/DiagramView/DiagramView.cpp
+12
-12
Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
+23
-23
Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
...tions/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
+59
-59
Applications/DataExplorer/DataView/DirectConditionGenerator.cpp
...ations/DataExplorer/DataView/DirectConditionGenerator.cpp
+13
-13
Applications/DataExplorer/DataView/ElementTreeModel.cpp
Applications/DataExplorer/DataView/ElementTreeModel.cpp
+18
-18
Applications/DataExplorer/DataView/FemConditionModel.cpp
Applications/DataExplorer/DataView/FemConditionModel.cpp
+7
-7
Applications/DataExplorer/DataView/GEOModels.cpp
Applications/DataExplorer/DataView/GEOModels.cpp
+58
-58
Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
Applications/DataExplorer/DataView/GMSHPrefsDialog.cpp
+14
-14
Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
...ications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
+3
-3
Applications/DataExplorer/DataView/GeoTreeModel.cpp
Applications/DataExplorer/DataView/GeoTreeModel.cpp
+28
-28
Applications/DataExplorer/DataView/LineEditDialog.cpp
Applications/DataExplorer/DataView/LineEditDialog.cpp
+15
-15
Applications/DataExplorer/DataView/LinearEditDialog.cpp
Applications/DataExplorer/DataView/LinearEditDialog.cpp
+3
-3
Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
Applications/DataExplorer/DataView/MergeGeometriesDialog.cpp
+17
-17
Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
+2
-2
Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
...ations/DataExplorer/DataView/MeshElementRemovalDialog.cpp
+13
-13
Applications/DataExplorer/DataView/MeshItem.cpp
Applications/DataExplorer/DataView/MeshItem.cpp
+3
-3
Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
+91
-91
Applications/DataExplorer/DataView/MeshModel.cpp
Applications/DataExplorer/DataView/MeshModel.cpp
+22
-22
Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
...ions/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
+9
-9
Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
+4
-4
Applications/DataExplorer/DataView/ModelTreeItem.cpp
Applications/DataExplorer/DataView/ModelTreeItem.cpp
+3
-3
Applications/DataExplorer/DataView/ProcessModel.cpp
Applications/DataExplorer/DataView/ProcessModel.cpp
+15
-15
Applications/DataExplorer/DataView/SHPImportDialog.cpp
Applications/DataExplorer/DataView/SHPImportDialog.cpp
+65
-65
Applications/DataExplorer/DataView/SaveMeshDialog.cpp
Applications/DataExplorer/DataView/SaveMeshDialog.cpp
+5
-5
Applications/DataExplorer/DataView/SelectMeshDialog.cpp
Applications/DataExplorer/DataView/SelectMeshDialog.cpp
+18
-18
Applications/DataExplorer/DataView/SetNameDialog.cpp
Applications/DataExplorer/DataView/SetNameDialog.cpp
+15
-15
Applications/DataExplorer/DataView/StationTreeModel.cpp
Applications/DataExplorer/DataView/StationTreeModel.cpp
+16
-16
Applications/DataExplorer/DataView/StratView/StratBar.cpp
Applications/DataExplorer/DataView/StratView/StratBar.cpp
+7
-7
Applications/DataExplorer/DataView/StratView/StratView.cpp
Applications/DataExplorer/DataView/StratView/StratView.cpp
+6
-6
Applications/DataExplorer/DataView/SurfaceExtractionDialog.cpp
...cations/DataExplorer/DataView/SurfaceExtractionDialog.cpp
+2
-2
Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
+12
-12
Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp
Applications/DataExplorer/VtkVis/NetCdfConfigureDialog.cpp
+25
-25
Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp
Applications/DataExplorer/VtkVis/VisPrefsDialog.cpp
+14
-14
Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
Applications/DataExplorer/VtkVis/VisualizationWidget.cpp
+25
-25
Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
Applications/DataExplorer/VtkVis/VtkAddFilterDialog.cpp
+4
-4
Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.cpp
+26
-26
Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
...ions/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
+2
-2
Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
...ions/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
+6
-6
Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
...ns/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
+3
-3
Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
+6
-6
Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp
Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp
+5
-5
Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
+5
-5
Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
Applications/DataExplorer/VtkVis/VtkColorLookupTable.cpp
+9
-9
Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
...s/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
+7
-7
Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
...DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
+11
-11
Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
...cations/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
+10
-10
Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
...ataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
+17
-17
Applications/DataExplorer/VtkVis/VtkCompositeFilter.cpp
Applications/DataExplorer/VtkVis/VtkCompositeFilter.cpp
+4
-4
Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
...tions/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
+16
-16
Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp
...ataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.cpp
+27
-27
Applications/DataExplorer/VtkVis/VtkCompositeImageToPointCloudFilter.cpp
...taExplorer/VtkVis/VtkCompositeImageToPointCloudFilter.cpp
+16
-16
Applications/DataExplorer/VtkVis/VtkCompositeImageToSurfacePointsFilter.cpp
...xplorer/VtkVis/VtkCompositeImageToSurfacePointsFilter.cpp
+7
-7
Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
...ions/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
+10
-10
Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
...s/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
+12
-12
Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp
...ns/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.cpp
+28
-28
Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
...ataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
+6
-6
Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
...tions/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
+13
-13
Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
...ications/DataExplorer/VtkVis/VtkCustomInteractorStyle.cpp
+25
-25
Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp
Applications/DataExplorer/VtkVis/VtkGeoImageSource.cpp
+5
-5
Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
Applications/DataExplorer/VtkVis/VtkPointsSource.cpp
+6
-6
Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
+9
-9
Applications/DataExplorer/VtkVis/VtkStationSource.cpp
Applications/DataExplorer/VtkVis/VtkStationSource.cpp
+12
-12
Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
Applications/DataExplorer/VtkVis/VtkSurfacesSource.cpp
+6
-6
Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
...cations/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
+6
-6
Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
Applications/DataExplorer/VtkVis/VtkVisImageItem.cpp
+17
-17
Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp
+44
-44
Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
+22
-22
Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
Applications/DataExplorer/VtkVis/VtkVisPointSetItem.cpp
+62
-62
Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp
+18
-18
Applications/DataExplorer/mainwindow.cpp
Applications/DataExplorer/mainwindow.cpp
+135
-135
Applications/DataHolderLib/BoundaryCondition.cpp
Applications/DataHolderLib/BoundaryCondition.cpp
+1
-1
Applications/DataHolderLib/ColorLookupTable.cpp
Applications/DataHolderLib/ColorLookupTable.cpp
+5
-5
Applications/DataHolderLib/FemCondition.cpp
Applications/DataHolderLib/FemCondition.cpp
+7
-7
Applications/DataHolderLib/Project.cpp
Applications/DataHolderLib/Project.cpp
+22
-22
Applications/DataHolderLib/SourceTerm.cpp
Applications/DataHolderLib/SourceTerm.cpp
+1
-1
Applications/FileIO/CsvInterface.cpp
Applications/FileIO/CsvInterface.cpp
+20
-20
Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.cpp
+15
-15
Applications/FileIO/Gmsh/GMSHFixedMeshDensity.cpp
Applications/FileIO/Gmsh/GMSHFixedMeshDensity.cpp
+3
-3
Applications/FileIO/Gmsh/GMSHInterface.cpp
Applications/FileIO/Gmsh/GMSHInterface.cpp
+62
-62
Applications/FileIO/Gmsh/GMSHLine.cpp
Applications/FileIO/Gmsh/GMSHLine.cpp
+2
-2
Applications/FileIO/Gmsh/GMSHLineLoop.cpp
Applications/FileIO/Gmsh/GMSHLineLoop.cpp
+6
-6
Applications/FileIO/Gmsh/GMSHPoint.cpp
Applications/FileIO/Gmsh/GMSHPoint.cpp
+4
-4
Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
+77
-77
Applications/FileIO/GocadIO/GocadSGridReader.cpp
Applications/FileIO/GocadIO/GocadSGridReader.cpp
+152
-152
Applications/FileIO/GocadIO/Property.cpp
Applications/FileIO/GocadIO/Property.cpp
+11
-11
Applications/FileIO/PetrelInterface.cpp
Applications/FileIO/PetrelInterface.cpp
+4
-4
Applications/FileIO/SHPInterface.cpp
Applications/FileIO/SHPInterface.cpp
+7
-7
Applications/FileIO/SWMM/SWMMInterface.cpp
Applications/FileIO/SWMM/SWMMInterface.cpp
+45
-45
Applications/FileIO/TetGenInterface.cpp
Applications/FileIO/TetGenInterface.cpp
+7
-7
Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp
+1
-1
Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
+20
-20
Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
...odelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
+45
-45
Applications/Utils/OGSFileConverter/FileListDialog.cpp
Applications/Utils/OGSFileConverter/FileListDialog.cpp
+10
-10
Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
+2
-2
No files found.
Applications/ApplicationsLib/ProjectData.cpp
View file @
000e8b21
This diff is collapsed.
Click to expand it.
Applications/ApplicationsLib/TestDefinition.cpp
View file @
000e8b21
...
...
@@ -158,7 +158,7 @@ TestDefinition::TestDefinition(BaseLib::ConfigTree const& config_tree,
// Construct command lines for each entry.
//! \ogs_file_param{prj__test_definition__vtkdiff}
auto
const
&
vtkdiff_configs
=
config_tree
.
getConfigSubtreeList
(
"vtkdiff"
);
_
command_lines
.
reserve
(
vtkdiff_configs
.
size
());
command_lines
_
.
reserve
(
vtkdiff_configs
.
size
());
for
(
auto
const
&
vtkdiff_config
:
vtkdiff_configs
)
{
std
::
string
const
&
field_name
=
...
...
@@ -246,7 +246,7 @@ TestDefinition::TestDefinition(BaseLib::ConfigTree const& config_tree,
{
std
::
string
const
&
output_filename
=
BaseLib
::
joinPaths
(
output_directory
,
filename
);
_
output_files
.
push_back
(
output_filename
);
output_files
_
.
push_back
(
output_filename
);
std
::
string
const
&
reference_filename
=
BaseLib
::
joinPaths
(
reference_path
,
filename
);
...
...
@@ -259,7 +259,7 @@ TestDefinition::TestDefinition(BaseLib::ConfigTree const& config_tree,
" "
+
safeString
(
output_filename
)
+
" "
+
absolute_tolerance_parameter
+
" "
+
relative_tolerance_parameter
;
INFO
(
"Will run '{:s}'"
,
command_line
);
_
command_lines
.
emplace_back
(
std
::
move
(
command_line
));
command_lines
_
.
emplace_back
(
std
::
move
(
command_line
));
}
}
}
...
...
@@ -267,7 +267,7 @@ TestDefinition::TestDefinition(BaseLib::ConfigTree const& config_tree,
bool
TestDefinition
::
runTests
()
const
{
std
::
vector
<
int
>
return_values
;
transform
(
begin
(
_
command_lines
),
end
(
_
command_lines
),
transform
(
begin
(
command_lines
_
),
end
(
command_lines
_
),
back_inserter
(
return_values
),
[](
std
::
string
const
&
command_line
)
{
int
const
return_value
=
std
::
system
(
command_line
.
c_str
());
...
...
@@ -285,11 +285,11 @@ bool TestDefinition::runTests() const
std
::
vector
<
std
::
string
>
const
&
TestDefinition
::
getOutputFiles
()
const
{
return
_
output_files
;
return
output_files
_
;
}
std
::
size_t
TestDefinition
::
numberOfTests
()
const
{
return
size
(
_
command_lines
);
return
size
(
command_lines
_
);
}
}
// namespace ApplicationsLib
Applications/DataExplorer/Base/ColorPickerPushButton.cpp
View file @
000e8b21
...
...
@@ -21,13 +21,13 @@ ColorPickerPushButton::ColorPickerPushButton( QWidget* parent /*= 0*/ )
:
QPushButton
(
parent
)
{
setAutoFillBackground
(
true
);
_
color
=
QColor
(
"white"
);
color
_
=
QColor
(
"white"
);
}
void
ColorPickerPushButton
::
mouseReleaseEvent
(
QMouseEvent
*
e
)
{
Q_UNUSED
(
e
);
QColor
newColor
=
QColorDialog
::
getColor
(
_
color
,
nullptr
,
"Choose a color"
);
QColor
newColor
=
QColorDialog
::
getColor
(
color
_
,
nullptr
,
"Choose a color"
);
if
(
!
newColor
.
isValid
())
{
return
;
...
...
@@ -35,7 +35,7 @@ void ColorPickerPushButton::mouseReleaseEvent(QMouseEvent* e)
setColor
(
newColor
);
emit
colorPicked
(
_
color
);
emit
colorPicked
(
color
_
);
}
QString
ColorPickerPushButton
::
colorToCss
(
QColor
color
)
...
...
@@ -61,10 +61,10 @@ QString ColorPickerPushButton::colorToString( QColor color )
void
ColorPickerPushButton
::
setColor
(
QColor
color
)
{
_
color
=
color
;
color
_
=
color
;
// Compute text color
QColor
hsv
=
_
color
.
toHsv
();
QColor
hsv
=
color
_
.
toHsv
();
QString
textColorStr
;
if
(
hsv
.
valueF
()
<
0.5
f
)
{
...
...
@@ -76,12 +76,12 @@ void ColorPickerPushButton::setColor( QColor color )
}
QString
stylesheetStr
=
"background-color: "
;
stylesheetStr
.
append
(
colorToCss
(
_
color
));
stylesheetStr
.
append
(
colorToCss
(
color
_
));
stylesheetStr
.
append
(
";"
);
stylesheetStr
.
append
(
textColorStr
);
this
->
setStyleSheet
(
stylesheetStr
);
this
->
setText
(
colorToString
(
_
color
));
this
->
setText
(
colorToString
(
color
_
));
}
void
ColorPickerPushButton
::
setColor
(
double
*
color
)
...
...
Applications/DataExplorer/Base/RecentFiles.cpp
View file @
000e8b21
...
...
@@ -21,37 +21,37 @@
RecentFiles
::
RecentFiles
(
QObject
*
parent
,
const
char
*
slot
,
QString
settingsName
)
:
QObject
(
parent
),
_
settingsName
(
std
::
move
(
settingsName
))
:
QObject
(
parent
),
settingsName
_
(
std
::
move
(
settingsName
))
{
_
filesMenu
=
new
QMenu
(
tr
(
"Recent files"
));
for
(
auto
&
fileAction
:
_
fileActions
)
filesMenu
_
=
new
QMenu
(
tr
(
"Recent files"
));
for
(
auto
&
fileAction
:
fileActions
_
)
{
fileAction
=
new
QAction
(
this
);
fileAction
->
setVisible
(
false
);
connect
(
fileAction
,
SIGNAL
(
triggered
()),
parent
,
slot
);
_
filesMenu
->
addAction
(
fileAction
);
filesMenu
_
->
addAction
(
fileAction
);
}
updateRecentFileActions
();
}
RecentFiles
::~
RecentFiles
()
{
delete
_
filesMenu
;
delete
filesMenu
_
;
}
QMenu
*
RecentFiles
::
menu
()
{
return
_
filesMenu
;
return
filesMenu
_
;
}
void
RecentFiles
::
setCurrentFile
(
const
QString
&
filename
)
{
_
currentFile
=
filename
;
currentFile
_
=
filename
;
QSettings
settings
;
QStringList
files
=
settings
.
value
(
_
settingsName
).
toStringList
();
QStringList
files
=
settings
.
value
(
settingsName
_
).
toStringList
();
files
.
removeAll
(
filename
);
files
.
prepend
(
filename
);
while
(
files
.
size
()
>
_
maxFiles
)
while
(
files
.
size
()
>
maxFiles
_
)
{
files
.
removeLast
();
}
...
...
@@ -63,21 +63,21 @@ void RecentFiles::setCurrentFile( const QString& filename )
void
RecentFiles
::
updateRecentFileActions
()
{
QSettings
settings
;
QStringList
files
=
settings
.
value
(
_
settingsName
).
toStringList
();
QStringList
files
=
settings
.
value
(
settingsName
_
).
toStringList
();
int
numFiles
=
qMin
(
files
.
size
(),
static_cast
<
int
>
(
_
maxFiles
));
int
numFiles
=
qMin
(
files
.
size
(),
static_cast
<
int
>
(
maxFiles
_
));
for
(
int
i
=
0
;
i
<
numFiles
;
++
i
)
{
QString
text
=
tr
(
"&%1 %2"
).
arg
(
i
+
1
).
arg
(
strippedName
(
files
[
i
]));
_
fileActions
[
i
]
->
setText
(
text
);
_
fileActions
[
i
]
->
setData
(
files
[
i
]);
_
fileActions
[
i
]
->
setVisible
(
true
);
fileActions
_
[
i
]
->
setText
(
text
);
fileActions
_
[
i
]
->
setData
(
files
[
i
]);
fileActions
_
[
i
]
->
setVisible
(
true
);
}
for
(
int
i
=
numFiles
;
i
<
_
maxFiles
;
++
i
)
for
(
int
i
=
numFiles
;
i
<
maxFiles
_
;
++
i
)
{
_
fileActions
[
i
]
->
setVisible
(
false
);
fileActions
_
[
i
]
->
setVisible
(
false
);
}
}
...
...
Applications/DataExplorer/Base/TreeItem.cpp
View file @
000e8b21
...
...
@@ -21,19 +21,19 @@
* and the data associated with each column.
*/
TreeItem
::
TreeItem
(
QList
<
QVariant
>
data
,
TreeItem
*
parent
)
:
_
itemData
(
std
::
move
(
data
)),
_
parentItem
(
parent
)
:
itemData
_
(
std
::
move
(
data
)),
parentItem
_
(
parent
)
{
}
/**
* A pointer to each of the child items belonging to this item
* will be stored in the
_
childItems private member variable. When
* will be stored in the childItems
_
private member variable. When
* the class's destructor is called, it must delete each of these
* to ensure that their memory is reused.
*/
TreeItem
::~
TreeItem
()
{
qDeleteAll
(
_
childItems
);
qDeleteAll
(
childItems
_
);
}
/**
...
...
@@ -41,7 +41,7 @@ TreeItem::~TreeItem()
*/
void
TreeItem
::
appendChild
(
TreeItem
*
item
)
{
_
childItems
.
append
(
item
);
childItems
_
.
append
(
item
);
}
/**
...
...
@@ -51,20 +51,20 @@ void TreeItem::appendChild(TreeItem* item)
*/
TreeItem
*
TreeItem
::
child
(
int
row
)
const
{
if
(
_
childItems
.
count
()
>
row
)
if
(
childItems
_
.
count
()
>
row
)
{
return
_
childItems
.
value
(
row
);
return
childItems
_
.
value
(
row
);
}
return
nullptr
;
}
/**
* Returns the number of
_
childItems
* Returns the number of childItems
_
*/
int
TreeItem
::
childCount
()
const
{
return
_
childItems
.
count
();
return
childItems
_
.
count
();
}
/**
...
...
@@ -72,9 +72,9 @@ int TreeItem::childCount() const
*/
int
TreeItem
::
row
()
const
{
if
(
_
parentItem
)
if
(
parentItem
_
)
{
return
_
parentItem
->
_
childItems
.
indexOf
(
const_cast
<
TreeItem
*>
(
this
));
return
parentItem
_
->
childItems
_
.
indexOf
(
const_cast
<
TreeItem
*>
(
this
));
}
return
0
;
...
...
@@ -85,7 +85,7 @@ int TreeItem::row() const
*/
int
TreeItem
::
columnCount
()
const
{
return
_
itemData
.
count
();
return
itemData
_
.
count
();
}
/**
...
...
@@ -93,7 +93,7 @@ int TreeItem::columnCount() const
*/
QVariant
TreeItem
::
data
(
int
column
)
const
{
return
_
itemData
.
value
(
column
);
return
itemData
_
.
value
(
column
);
}
/**
...
...
@@ -101,12 +101,12 @@ QVariant TreeItem::data(int column) const
*/
bool
TreeItem
::
setData
(
int
column
,
const
QVariant
&
value
)
{
if
(
column
<
0
||
column
>=
_
itemData
.
size
())
if
(
column
<
0
||
column
>=
itemData
_
.
size
())
{
return
false
;
}
_
itemData
[
column
]
=
value
;
itemData
_
[
column
]
=
value
;
return
true
;
}
/**
...
...
@@ -114,7 +114,7 @@ bool TreeItem::setData( int column, const QVariant &value )
*/
TreeItem
*
TreeItem
::
parentItem
()
const
{
return
_
parentItem
;
return
parentItem
_
;
}
/**
...
...
@@ -122,14 +122,14 @@ TreeItem* TreeItem::parentItem() const
*/
bool
TreeItem
::
removeChildren
(
int
position
,
int
count
)
{
if
(
position
<
0
||
position
+
count
>
_
childItems
.
size
())
if
(
position
<
0
||
position
+
count
>
childItems
_
.
size
())
{
return
false
;
}
for
(
int
row
=
0
;
row
<
count
;
++
row
)
{
delete
_
childItems
.
takeAt
(
position
);
delete
childItems
_
.
takeAt
(
position
);
}
return
true
;
...
...
Applications/DataExplorer/Base/TreeModel.cpp
View file @
000e8b21
...
...
@@ -26,16 +26,16 @@
TreeModel
::
TreeModel
(
QObject
*
parent
)
:
QAbstractItemModel
(
parent
)
{
//
_
modelType = TREE_MODEL;
//modelType
_
= TREE_MODEL;
QList
<
QVariant
>
rootData
;
rootData
<<
"1"
<<
"2"
<<
"3"
;
_
rootItem
=
new
TreeItem
(
rootData
,
nullptr
);
//setupModelData(data,
_
rootItem);
rootItem
_
=
new
TreeItem
(
rootData
,
nullptr
);
//setupModelData(data, rootItem
_
);
}
TreeModel
::~
TreeModel
()
{
delete
_
rootItem
;
delete
rootItem
_
;
}
/**
...
...
@@ -59,7 +59,7 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con
if
(
!
parent
.
isValid
())
{
parentItem
=
_
rootItem
;
parentItem
=
rootItem
_
;
}
else
{
...
...
@@ -88,7 +88,7 @@ QModelIndex TreeModel::parent(const QModelIndex &index) const
auto
*
childItem
=
static_cast
<
TreeItem
*>
(
index
.
internalPointer
());
TreeItem
*
parentItem
=
childItem
->
parentItem
();
if
(
parentItem
==
_
rootItem
)
if
(
parentItem
==
rootItem
_
)
{
return
QModelIndex
();
}
...
...
@@ -110,7 +110,7 @@ int TreeModel::rowCount(const QModelIndex &parent) const
if
(
!
parent
.
isValid
())
{
parentItem
=
_
rootItem
;
parentItem
=
rootItem
_
;
}
else
{
...
...
@@ -130,7 +130,7 @@ int TreeModel::columnCount(const QModelIndex &parent) const
return
static_cast
<
TreeItem
*>
(
parent
.
internalPointer
())
->
columnCount
();
}
return
_
rootItem
->
columnCount
();
return
rootItem
_
->
columnCount
();
}
void
TreeModel
::
updateData
()
...
...
@@ -195,14 +195,14 @@ TreeItem* TreeModel::getItem(const QModelIndex &index) const
return
item
;
}
}
return
_
rootItem
;
return
rootItem
_
;
}
QVariant
TreeModel
::
headerData
(
int
section
,
Qt
::
Orientation
orientation
,
int
role
)
const
{
if
(
orientation
==
Qt
::
Horizontal
&&
role
==
Qt
::
DisplayRole
)
{
return
_
rootItem
->
data
(
section
);
return
rootItem
_
->
data
(
section
);
}
return
QVariant
();
...
...
@@ -290,5 +290,5 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem* parent)
TreeItem
*
TreeModel
::
rootItem
()
const
{
return
_
rootItem
;
return
rootItem
_
;
}
Applications/DataExplorer/Base/TreeModelIterator.cpp
View file @
000e8b21
...
...
@@ -19,24 +19,24 @@
#include "TreeModel.h"
TreeModelIterator
::
TreeModelIterator
(
TreeModel
*
model
)
:
_
current
(
nullptr
),
_
model
(
model
)
:
current
_
(
nullptr
),
model
_
(
model
)
{
if
(
_
model
->
rootItem
()
->
childCount
()
>
0
)
if
(
model
_
->
rootItem
()
->
childCount
()
>
0
)
{
_
current
=
_
model
->
rootItem
();
current
_
=
model
_
->
rootItem
();
}
}
TreeItem
*
TreeModelIterator
::
operator
*
()
const
{
return
_
current
;
return
current
_
;
}
TreeModelIterator
&
TreeModelIterator
::
operator
++
()
{
if
(
_
current
)
if
(
current
_
)
{
_
current
=
next
(
_
current
);
current
_
=
next
(
current
_
);
}
return
*
this
;
...
...
@@ -53,28 +53,28 @@ TreeItem* TreeModelIterator::next( const TreeItem* current )
if
(
current
->
childCount
())
{
// walk the child
_
parentIndex
.
push
(
_
currentIndex
);
_
currentIndex
=
0
;
parentIndex
_
.
push
(
currentIndex
_
);
currentIndex
_
=
0
;
next
=
current
->
child
(
0
);
}
else
{
// walk the sibling
TreeItem
*
parent
=
current
->
parentItem
();
next
=
parent
?
parent
->
child
(
_
currentIndex
+
1
)
:
_
model
->
rootItem
()
->
child
(
_
currentIndex
+
1
);
next
=
parent
?
parent
->
child
(
currentIndex
_
+
1
)
:
model
_
->
rootItem
()
->
child
(
currentIndex
_
+
1
);
while
(
!
next
&&
parent
)
{
// if we had no sibling walk up the parent
// and try the sibling of that
parent
=
parent
->
parentItem
();
_
currentIndex
=
_
parentIndex
.
pop
();
next
=
parent
?
parent
->
child
(
_
currentIndex
+
1
)
:
_
model
->
rootItem
()
->
child
(
_
currentIndex
+
1
);
currentIndex
_
=
parentIndex
_
.
pop
();
next
=
parent
?
parent
->
child
(
currentIndex
_
+
1
)
:
model
_
->
rootItem
()
->
child
(
currentIndex
_
+
1
);
}
if
(
next
)
{
++
(
_
currentIndex
);
++
(
currentIndex
_
);
}
}
return
next
;
...
...
Applications/DataExplorer/Base/modeltest.cpp
View file @
000e8b21
...
...
@@ -30,8 +30,8 @@ Q_DECLARE_METATYPE(QModelIndex)
/*!
Connect to all of the models signals. Whenever anything happens recheck everything.
*/
ModelTest
::
ModelTest
(
QAbstractItemModel
*
_
model
,
QObject
*
parent
)
:
QObject
(
parent
),
model
(
_
model
),
fetchingMore
(
false
)
ModelTest
::
ModelTest
(
QAbstractItemModel
*
model
_
,
QObject
*
parent
)
:
QObject
(
parent
),
model
(
model
_
),
fetchingMore
(
false
)
{
Q_ASSERT
(
model
);
...
...
Applications/DataExplorer/DataView/ColorTableModel.cpp
View file @
000e8b21
...
...
@@ -61,14 +61,14 @@ QVariant ColorTableModel::data( const QModelIndex& index, int role ) const
return
QVariant
();
}
if
(
index
.
row
()
>=
_
listOfPairs
.
size
()
||
index
.
row
()
<
0
)
if
(
index
.
row
()
>=
listOfPairs
_
.
size
()
||
index
.
row
()
<
0
)
{
return
QVariant
();
}
if
(
role
==
Qt
::
DisplayRole
)
{
QPair
<
QString
,
QColor
>
pair
=
_
listOfPairs
.
at
(
index
.
row
());
QPair
<
QString
,
QColor
>
pair
=
listOfPairs
_
.
at
(
index
.
row
());
switch
(
index
.
column
())
{
...
...
@@ -104,7 +104,7 @@ bool ColorTableModel::buildTable(const std::map<std::string, DataHolderLib::Colo
*/
QPair
<
QString
,
QColor
>
pair
(
name
,
color
);
_
listOfPairs
.
insert
(
count
++
,
pair
);
listOfPairs
_
.
insert
(
count
++
,
pair
);
}
endInsertRows
();
...
...
Applications/DataExplorer/DataView/CondFromRasterDialog.cpp
View file @
000e8b21
...
...
@@ -25,16 +25,16 @@
CondFromRasterDialog
::
CondFromRasterDialog
(
std
::
vector
<
MeshLib
::
Mesh
*>
msh_vec
,
QDialog
*
parent
)
:
QDialog
(
parent
),
_
msh_vec
(
std
::
move
(
msh_vec
))
:
QDialog
(
parent
),
msh_vec
_
(
std
::
move
(
msh_vec
))
{
setupUi
(
this
);
this
->
scalingEdit
->
setEnabled
(
false
);
_
scale_validator
=
new
StrictDoubleValidator
(
-
1e+10
,
1e+20
,
5
);
scale_validator
_
=
new
StrictDoubleValidator
(
-
1e+10
,
1e+20
,
5
);
this
->
scalingEdit
->
setText
(
"1.0"
);
this
->
scalingEdit
->
setValidator
(
_
scale_validator
);
this
->
scalingEdit
->
setValidator
(
scale_validator
_
);
for
(
auto
mesh
:
_
msh_vec
)
for
(
auto
mesh
:
msh_vec
_
)
{
this
->
meshBox
->
addItem
(
QString
::
fromStdString
(
mesh
->
getName
()));
}
...
...
@@ -44,7 +44,7 @@ CondFromRasterDialog::CondFromRasterDialog(std::vector<MeshLib::Mesh*> msh_vec,
CondFromRasterDialog
::~
CondFromRasterDialog
()
{
delete
_
scale_validator
;
delete
scale_validator
_
;
}
void
CondFromRasterDialog
::
on_selectButton_pressed
()
...
...
@@ -88,7 +88,7 @@ void CondFromRasterDialog::accept()
}
MeshLib
::
Mesh
*
mesh
(
nullptr
);
for
(
auto
mesh_
:
_
msh_vec
)
for
(
auto
mesh_
:
msh_vec
_
)
{
if
(
mesh_
->
getName
()
==
mesh_name
)
{
...
...
Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
View file @
000e8b21
...
...
@@ -24,16 +24,16 @@
#include <QTextStream>
#include <limits>
DiagramList
::
DiagramList
()
:
_
xLabel
(
""
),
_
yLabel
(
""
),
_
xUnit
(
""
),
_
yUnit
(
""
)
{}
DiagramList
::
DiagramList
()
:
xLabel
_
(
""
),
yLabel
_
(
""
),
xUnit
_
(
""
),
yUnit
_
(
""
)
{}
DiagramList
::~
DiagramList
()
=
default
;
float
DiagramList
::
calcMinXValue
()
{
auto
min
=
std
::
min_element
(
_
coords
.
begin
(),
_
coords
.
end
(),
coords
_
.
begin
(),
coords
_
.
end
(),
[](
auto
const
&
c0
,
auto
const
&
c1
)
{
return
c0
.
first
<
c1
.
first
;
});
if
(
min
!=
_
coords
.
end
())
if
(
min
!=
coords
_
.
end
())
{
return
min
->
first
;
}
...
...
@@ -43,12 +43,12 @@ float DiagramList::calcMinXValue()
float
DiagramList
::
calcMaxXValue
()
{
float
max
=
std
::
numeric_limits
<
float
>::
lowest
();
std
::
size_t
nCoords
=
_
coords
.
size
();
std
::
size_t
nCoords
=
coords
_
.
size
();
for
(
std
::
size_t
i
=
0
;
i
<
nCoords
;
i
++
)
{
if
(
_
coords
[
i
].
first
>
max
)
if
(
coords
_
[
i
].
first
>
max
)
{