Skip to content

Commit

Permalink
2024.10.16 版本1.1
Browse files Browse the repository at this point in the history
1. 修复了Windows平台中VS软件Debug模式下程序运行崩溃的问题。
2. 修复了ATX天线文件中PCO、PCV改正数信息缺失导致的程序运行异常。
3. 修改了GREAT-PVT_1.0.pdf中的描述错误。
3. 其他代码格式问题的修改。
  • Loading branch information
ylx1129 committed Oct 16, 2024
1 parent 8756351 commit a896704
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 18 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/src/build
/src/build_Windows
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ GREAT-PVT_<ver>

参见GREAT-PVT_1.0.pdf

## 修改记录
### 版本1.1
1. 修复了Windows平台中VS软件Debug模式下程序运行崩溃的问题。
2. 修复了ATX天线文件中PCO、PCV改正数信息缺失导致的程序运行异常。
3. 修改了GREAT-PVT_1.0.pdf中的描述错误。
3. 其他代码格式问题的修改。

## 参与贡献

开发人员:
Expand All @@ -62,10 +69,10 @@ Copyright (C) 2006-2014 Arseny Kapoulkine.
* GREAT-PVT使用Newmat库(http://www.robertnz.net/nm_intro.htm)
Copyright (C) 2008: R B Davies.

* GREAT-PVT使用spdlog库https://github.com/gabime/spdlog
* GREAT-PVT使用spdlog库(https://github.com/gabime/spdlog)
Copyright(c) 2015-present, Gabi Melman & spdlog contributors.

* GREAT-PVT使用Eigen库https://eigen.tuxfamily.org
* GREAT-PVT使用Eigen库(https://eigen.tuxfamily.org)
Copyright (C) 2008-2011 Gael Guennebaud

* 脚本工具使用部分FAST源码(https://github.com/ChangChuntao/FAST)
Expand All @@ -75,5 +82,5 @@ Copyright (C) The GNSS Center, Wuhan University & Chinese Academy of Surveying a

GitHub:https://github.com/GREAT-WHU/GREAT-PVT

欢迎加入QQ群1009827379参与讨论与交流。
欢迎加入QQ群(1009827379)参与讨论与交流。

Binary file modified bin/Linux/GREAT_PVT
Binary file not shown.
Binary file modified bin/Linux/libLibGREAT.so
Binary file not shown.
Binary file modified bin/Linux/libLibGnut.so
Binary file not shown.
Binary file modified bin/Windows/GREAT_PVT.exe
Binary file not shown.
Binary file modified bin/Windows/LibGREATrd.dll
Binary file not shown.
Binary file modified bin/Windows/LibGnutrd.dll
Binary file not shown.
25 changes: 12 additions & 13 deletions src/LibGREAT/gproc/gpvtflt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,18 @@ int great::t_gpvtflt::_preprocess(const string &ssite, vector<t_gsatdata> &sdata
iter = sdata.erase(iter);
continue;
}

//except sat without pcv
if (!_isBase)
{
shared_ptr<t_gobj> sat_obj = this->_gallobj->obj(satname);
shared_ptr<t_gpcv> sat_pcv = sat_obj->pcv(_epoch);
if (!sat_pcv)
{
iter = sdata.erase(iter);
continue;
}
}

//check each satellite obs and crd
if (!_check_sat(ssite, &*iter, BB, iobs))
Expand Down Expand Up @@ -1975,8 +1987,6 @@ int great::t_gpvtflt::ProcessOneEpoch(const t_gtime &now, vector<t_gsatdata> *da
string double_freq = "";
string single_freq = "";

ostringstream obsqualityInfo; obsqualityInfo.str("");
obsqualityInfo << "> " << setw(6) << now.sod() << endl;
_sat_freqs.clear();
while (it != _data.end())
{
Expand All @@ -2002,17 +2012,6 @@ int great::t_gpvtflt::ProcessOneEpoch(const t_gtime &now, vector<t_gsatdata> *da
double_freq += " " + it->sat();
_sat_freqs[it->sat()] = "2";
}
obsqualityInfo << it->sat();
if (obsP1 == GOBS::X) obsqualityInfo << setw(4) << "0";
else obsqualityInfo << setw(4) << "1";
if (obsL1 == GOBS::X) obsqualityInfo << setw(4) << "0";
else obsqualityInfo << setw(4) << "1";
if (obsP2 == GOBS::X) obsqualityInfo << setw(4) << "0";
else obsqualityInfo << setw(4) << "1";
if (obsL2 == GOBS::X) obsqualityInfo << setw(4) << "0";
else obsqualityInfo << setw(4) << "1";
obsqualityInfo << setw(10) << setprecision(4) << snrL1
<< setw(10) << setprecision(4) << snrL2 << endl;
++it;
}

Expand Down
2 changes: 1 addition & 1 deletion src/LibGnut/gall/gallprec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ namespace gnut
{
it = itBeg;
}
else if (distance(itReq, itEnd) < static_cast<int>(_degree_sp3 - limit))
else if (distance(itReq, itEnd) <= static_cast<int>(_degree_sp3 - limit))
{
it = itEnd;
for (int i = 0; i <= static_cast<int>(_degree_sp3); i++)
Expand Down
2 changes: 1 addition & 1 deletion src/app/GREAT_PVT/GREAT_PVT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ int main(int argc, char** argv)

// Construct the gset class and init some values in the class
t_gcfg_ppp gset;
gset.app("G-Nut/PVT", "0.9.0", "$Rev: 2448 $", "(gnss@pecny.cz)", __DATE__, __TIME__);
gset.app("GRAET-PVT", "$Ver: 1.1 $", "$Rev: $", "(https://github.com/GREAT-WHU/GREAT-PVT)", __DATE__, __TIME__);

// Get the arguments from the command line
gset.arg(argc, argv, true, false);
Expand Down

0 comments on commit a896704

Please sign in to comment.