Changeset 346 in Sophya for trunk/Poubelle/archTOI.old/archeopsfile.cc
- Timestamp:
- Aug 3, 1999, 10:36:14 AM (26 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Poubelle/archTOI.old/archeopsfile.cc
r342 r346 776 776 if (!lastGPS()) return -9.e99; 777 777 return blockSet->gpsParser.getUTC(); 778 /* char* p = lastGPS()->gps;779 //if (strncmp(p, "$GPGGA,", 7)) return -9.e99;780 //p += 7;781 if (*p != '$') return -9.e99;782 p += 1;783 double t;784 sscanf(p, "%lg", &t);785 int h = int(t/10000); t -= h*10000;786 int m = int(t/100); t -= m*100;787 return h*3600. + m*60. + t;*/788 778 } 789 779 … … 801 791 if (!lastGPS()) return -9.e99; 802 792 return blockSet->gpsParser.getLatitude(); 803 /*char* p = lastGPS()->gps;804 //if (strncmp(p, "$GPGGA,", 7)) return -9.e99;805 if (*p!='$') return -9.e99;806 char* fence = p+80;807 p += 1;808 while (*p != ',' && p<fence) p++;809 if (*p != ',') return -9.e99;810 p++;811 double t;812 sscanf(p, "%lg", &t);813 int d = int(t/100); t -= d*100;814 t = d + t/60;815 while (*p != ',' && p<fence) p++;816 if (*p != ',') return -9.e99;817 p++;818 if (*p == 'S') t = -t;819 return t;*/820 793 } 821 794 … … 824 797 if (!lastGPS()) return -9.e99; 825 798 return blockSet->gpsParser.getLongitude(); 826 /*char* p = lastGPS()->gps;827 //if (strncmp(p, "$GPGGA,", 7)) return -9.e99;828 if (*p!='$') return -9.e99;829 char* fence = p+80;830 p += 1;831 for (int i=0; i<3; i++) {832 while (*p != ',' && p<fence) p++;833 if (*p != ',') return -9.e99;834 p++;835 }836 double t;837 sscanf(p, "%lg", &t);838 int d = int(t/100); t -= d*100;839 t = d + t/60;840 while (*p != ',' && p<fence) p++;841 if (*p != ',') return -9.e99;842 p++;843 if (*p == 'W') t = -t;844 return t;*/845 799 } 846 800 … … 848 802 if (!lastGPS()) return -9.e99; 849 803 return blockSet->gpsParser.getAltitude(); 850 /*char* p = lastGPS()->gps;851 //if (strncmp(p, "$GPGGA,", 7)) return -9.e99;852 if (*p!='$') return -9.e99;853 char* fence = p+80;854 p += 1;855 for (int i=0; i<8; i++) {856 while (*p != ',' && p<fence) p++;857 if (*p != ',') return -9.e99;858 p++;859 }860 double t;861 sscanf(p, "%lg", &t);862 return t;*/863 804 } 864 805 … … 890 831 if (!blk) return 0; 891 832 block_type_reglage* reglage = lastReglage(); 892 block_type_param* param = lastParam();893 833 if (!reglage) return 0; 834 894 835 nb_coups= reglage->reglage.horloge.nb_mesures/2 - reglage->reglage.horloge.temp_mort; 895 836 aa = (nb_coups<<14) + (nb_coups*190) ; … … 909 850 block_type_reglage* reglage = lastReglage(); 910 851 block_type_param* param = lastParam(); 852 if (!reglage) return 0; 853 if (!param) return 0; 911 854 //cout << "muv " << imesure << " " << y << "\n"; 912 855 return bol_micro_volt(y,(double)param->param.bolo[ibolo].bolo_gain*gain_ampli(reglage->reglage.bolo[ibolo]));
Note:
See TracChangeset
for help on using the changeset viewer.