Skip to content

Commit e966987

Browse files
committed
shear strength parameters, etc.
1 parent a495209 commit e966987

31 files changed

+4040
-431
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,9 @@
2626
*.exe
2727
*.out
2828
*.app
29+
30+
# Directories
31+
*.directory
32+
33+
# VSCODE
34+
*.vscode

MultiStationWorker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void MultiStationWorker::doWork()
188188

189189
this->timer_stop();
190190

191-
if(this->getWriteLogMpde()&&is_success)
191+
if(this->getWriteLogMode()&&is_success)
192192
{
193193
std::string log_text = "MultiStation costs: ";
194194
std::ostringstream strs;

RGSWorker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void RGSWorker::doWork()
167167

168168
this->timer_stop();
169169

170-
if(this->getWriteLogMpde()&&is_success)
170+
if(this->getWriteLogMode()&&is_success)
171171
{
172172
std::string log_text = "\tRegion Growing Segmentation costs: ";
173173
std::ostringstream strs;

ReadFileWorker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void ReadFileWorker::doWork()
119119

120120
this->timer_stop();
121121

122-
if(this->getWriteLogMpde()&&is_success)
122+
if(this->getWriteLogMode()&&is_success)
123123
{
124124
std::string string_filename = this->getFileName().toUtf8().constData();
125125
std::string log_text = string_filename + "\n\tReading PCD file costs: ";

ReadPolygonMeshWorker.cpp

+21-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ bool ReadPolygonMeshWorker::is_para_satisfying(QString message)
7474

7575
void ReadPolygonMeshWorker::prepare()
7676
{
77-
77+
this->setUnmute();
78+
this->setWriteLog();
79+
this->check_mute_nolog();
7880
}
7981

8082
void ReadPolygonMeshWorker::doWork()
@@ -86,6 +88,8 @@ void ReadPolygonMeshWorker::doWork()
8688

8789
dataLibrary::Status = STATUS_OPENPOLYGONMESH;
8890

91+
this->timer_start();
92+
8993
//begin of processing
9094
int fracture_count;
9195
std::string fracture_count_file = *strfilename + "_count.txt";
@@ -104,6 +108,22 @@ void ReadPolygonMeshWorker::doWork()
104108
is_success = true;
105109
//end of processing
106110

111+
this->timer_stop();
112+
113+
if(this->getWriteLogMode()&&is_success)
114+
{
115+
std::string log_text = "\tOpening Fractures Triangulation Data costs: ";
116+
std::ostringstream strs;
117+
strs << this->getTimer_sec();
118+
log_text += (strs.str() +" seconds.");
119+
dataLibrary::write_text_to_log_file(log_text);
120+
}
121+
122+
if(!this->getMuteMode()&&is_success)
123+
{
124+
emit show();
125+
}
126+
107127
dataLibrary::Status = STATUS_READY;
108128
emit showReadyStatus();
109129
delete strfilename;

ReadPolygonMeshWorker.h

+2
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,6 @@ class ReadPolygonMeshWorker : public Worker
6464

6565
public slots:
6666
void doWork();
67+
signals:
68+
void show();
6769
};

ReadXYZWorker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void ReadXYZWorker::doWork()
138138

139139
this->timer_stop();
140140

141-
if(this->getWriteLogMpde()&&is_success)
141+
if(this->getWriteLogMode()&&is_success)
142142
{
143143
std::string string_filename = this->getFileName().toUtf8().constData();
144144
std::string log_text = string_filename + "\n\tReading XYZ file costs: ";

0 commit comments

Comments
 (0)