- Fix bug when combining forward and backward results

- Fix bug related to rinex signal priority - Minor updates to project file
Eaglecors · May 10, 2022 · ba05d40 · ba05d40
1 parent 9d80191
commit ba05d40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/app/winapp/rtkpost/rtkpost.cbproj b/app/winapp/rtkpost/rtkpost.cbproj
@@ -6,7 +6,7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Release</Config>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.8</ProjectVersion>
+        <ProjectVersion>19.2</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
@@ -83,7 +83,7 @@
         <DCC_ObjPath>..\..\..\rtklib_extlex;..\..\extlex;..\..\extion;..\..\src\qzsext;..\appcmn;..\..\src\rcv;..\src;..\..\src;K:\proj\rtklib_1.1\util\gui;$(DCC_ObjPath)</DCC_ObjPath>
         <PackageImports>vclx.bpi;vcl.bpi;$(PackageImports)</PackageImports>
         <ILINK_AppType>Windows</ILINK_AppType>
-        <BRCC_IncludePath>..\..\..\rtklib_extlex;..\..\extion;..\..\extlex;..\appcmn;..\..\src;$(BDS)\include;$(BDS)\include\vcl;$(BRCC_IncludePath)</BRCC_IncludePath>
+        <BRCC_IncludePath>$(BDS)\include;$(BRCC_IncludePath)</BRCC_IncludePath>
         <BCC_PCHWithExternalTypeFiles>false</BCC_PCHWithExternalTypeFiles>
         <BCC_GenerateWindowsApp>true</BCC_GenerateWindowsApp>
         <DCC_IncludePath>..\..\..\rtklib_extlex;..\..\extlex;..\..\extion;..\..\src\qzsext;..\appcmn;..\..\src\rcv;..\src;..\..\src;K:\proj\rtklib_1.1\util\gui;C:\Documents and Settings\TTAKA\My Documents\Borland Studio Projects;$(BDS)\lib;$(BDS)\lib\obj;$(DCC_IncludePath)</DCC_IncludePath>
@@ -422,8 +422,8 @@
                     <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
                 </Parameters>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k260.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp260.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                 </Excluded_Packages>
                 <ProjectProperties>
                     <ProjectProperties Name="AutoShowDeps">False</ProjectProperties>

diff --git a/src/postpos.c b/src/postpos.c
@@ -506,15 +506,14 @@ static void combres(FILE *fp, FILE *fptm, const prcopt_t *popt, const solopt_t *
     gtime_t time={0};
     sol_t sols={{0}},sol={{0}},oldsol={{0}},newsol={{0}};
     double tt,Qf[9],Qb[9],Qs[9],rbs[3]={0},rb[3]={0},rr_f[3],rr_b[3],rr_s[3];
-    int i,j,k,solstatic,num=0,pri[]={0,1,2,3,4,5,1,6};
+    int i,j,k,solstatic,num=0,pri[]={7,1,2,3,4,5,1,6};
 
     trace(3,"combres : isolf=%d isolb=%d\n",isolf,isolb);
 
     solstatic=sopt->solstatic&&
               (popt->mode==PMODE_STATIC||popt->mode==PMODE_STATIC_START||popt->mode==PMODE_PPP_STATIC);
 
     for (i=0,j=isolb-1;i<isolf&&j>=0;i++,j--) {
-
         if ((tt=timediff(solf[i].time,solb[j].time))<-DTTOL) {
             sols=solf[i];
             for (k=0;k<3;k++) rbs[k]=rbf[k+i*3];
@@ -525,11 +524,11 @@ static void combres(FILE *fp, FILE *fptm, const prcopt_t *popt, const solopt_t *
             for (k=0;k<3;k++) rbs[k]=rbb[k+j*3];
             i--;
         }
-        else if (solf[i].stat<solb[j].stat) {
+        else if (pri[solf[i].stat]<pri[solb[j].stat]) {
             sols=solf[i];
             for (k=0;k<3;k++) rbs[k]=rbf[k+i*3];
         }
-        else if (solf[i].stat>solb[j].stat) {
+        else if (pri[solf[i].stat]>pri[solb[j].stat]) {
             sols=solb[j];
             for (k=0;k<3;k++) rbs[k]=rbb[k+j*3];
         }

diff --git a/src/rinex.c b/src/rinex.c
@@ -863,7 +863,7 @@ static int decode_obsdata(FILE *fp, char *buff, double ver, int mask,
             p[r[0]]=-1; p[r[1]]=-1;
         }
         else if (val[r[0]]!=0.0&&val[r[1]]==0.0) {
-            p[l[0]]=1; p[l[1]]=-1;
+            p[r[0]]=1; p[r[1]]=-1;
         }
         else if (val[r[0]]==0.0&&val[r[1]]!=0.0) {
             p[r[0]]=-1; p[r[1]]=1;