Skip to content

Commit d1ed4ae

Browse files
kegge13kegge13
authored
Integrate bug-fix (#66)
Under extreme situations for small fields Integrate might fail on resampling. For generic data the first data point was dropped accidently.
1 parent 7aca3fa commit d1ed4ae

File tree

7 files changed

+291
-148
lines changed

7 files changed

+291
-148
lines changed

‎BistroMath.lpi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<VersionInfo>
2323
<UseVersionInfo Value="True"/>
2424
<MajorVersionNr Value="4"/>
25-
<MinorVersionNr Value="25"/>
26-
<BuildNr Value="772"/>
25+
<MinorVersionNr Value="26"/>
26+
<BuildNr Value="773"/>
2727
<Language Value="0809"/>
2828
<StringTable CompanyName="Theo van Soest" ProductName="BistroMath" ProductVersion="4"/>
2929
</VersionInfo>

‎BistroMath.lps‎

Lines changed: 78 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
<HasResources Value="True"/>
2323
<ResourceBaseClass Value="Form"/>
2424
<UnitName Value="WellForm"/>
25-
<TopLine Value="8012"/>
26-
<CursorPos X="7" Y="8040"/>
25+
<CursorPos X="55"/>
2726
<UsageCount Value="200"/>
2827
<Loaded Value="True"/>
2928
<LoadedDesigner Value="True"/>
@@ -78,8 +77,8 @@
7877
<Filename Value="Wellhofer.pas"/>
7978
<IsVisibleTab Value="True"/>
8079
<EditorIndex Value="1"/>
81-
<TopLine Value="12781"/>
82-
<CursorPos X="15" Y="12797"/>
80+
<TopLine Value="7248"/>
81+
<CursorPos X="120" Y="7263"/>
8382
<UsageCount Value="100"/>
8483
<Loaded Value="True"/>
8584
</Unit7>
@@ -92,8 +91,8 @@
9291
<Unit9>
9392
<Filename Value="TOunits\TOnumparser.pas"/>
9493
<EditorIndex Value="2"/>
95-
<TopLine Value="644"/>
96-
<CursorPos Y="659"/>
94+
<TopLine Value="967"/>
95+
<CursorPos X="42" Y="989"/>
9796
<UsageCount Value="100"/>
9897
<Loaded Value="True"/>
9998
</Unit9>
@@ -720,121 +719,123 @@
720719
<JumpHistory Count="30" HistoryIndex="29">
721720
<Position1>
722721
<Filename Value="Wellhofer.pas"/>
723-
<Caret Line="4770" Column="9" TopLine="4742"/>
722+
<Caret Line="18614" Column="20" TopLine="18586"/>
724723
</Position1>
725724
<Position2>
726725
<Filename Value="Wellhofer.pas"/>
727-
<Caret Line="5109" Column="81" TopLine="5076"/>
726+
<Caret Line="18620" Column="20" TopLine="18592"/>
728727
</Position2>
729728
<Position3>
730729
<Filename Value="Wellhofer.pas"/>
731-
<Caret Line="4962" Column="33" TopLine="4949"/>
730+
<Caret Line="18624" Column="53" TopLine="18596"/>
732731
</Position3>
733732
<Position4>
734733
<Filename Value="Wellhofer.pas"/>
735-
<Caret Line="4965" Column="53" TopLine="4953"/>
734+
<Caret Line="18640" Column="29" TopLine="18612"/>
736735
</Position4>
737736
<Position5>
738737
<Filename Value="Wellhofer.pas"/>
739-
<Caret Line="4964" Column="46" TopLine="4948"/>
738+
<Caret Line="18641" Column="32" TopLine="18613"/>
740739
</Position5>
741740
<Position6>
742741
<Filename Value="Wellhofer.pas"/>
743-
<Caret Line="4969" TopLine="4948"/>
742+
<Caret Line="18877" Column="46" TopLine="18849"/>
744743
</Position6>
745744
<Position7>
746745
<Filename Value="Wellhofer.pas"/>
747-
<Caret Line="4970" TopLine="4948"/>
746+
<Caret Line="16918" Column="25" TopLine="16897"/>
748747
</Position7>
749748
<Position8>
750749
<Filename Value="Wellhofer.pas"/>
751-
<Caret Line="4971" TopLine="4948"/>
750+
<Caret Line="17416" TopLine="17399"/>
752751
</Position8>
753752
<Position9>
754753
<Filename Value="Wellhofer.pas"/>
755-
<Caret Line="4972" TopLine="4948"/>
754+
<Caret Line="18620" TopLine="18603"/>
756755
</Position9>
757756
<Position10>
758757
<Filename Value="Wellhofer.pas"/>
759-
<Caret Line="4478" TopLine="4460"/>
758+
<Caret Line="17416" TopLine="17399"/>
760759
</Position10>
761760
<Position11>
762761
<Filename Value="Wellhofer.pas"/>
763-
<Caret Line="12265" Column="100" TopLine="12249"/>
762+
<Caret Line="18617" Column="38" TopLine="18603"/>
764763
</Position11>
765764
<Position12>
766765
<Filename Value="Wellhofer.pas"/>
767-
<Caret Line="12798" Column="41" TopLine="12775"/>
766+
<Caret Line="17416" TopLine="17399"/>
768767
</Position12>
769768
<Position13>
770769
<Filename Value="Wellhofer.pas"/>
771-
<Caret Line="12810" Column="29" TopLine="12787"/>
770+
<Caret Line="18620" TopLine="18603"/>
772771
</Position13>
773772
<Position14>
774773
<Filename Value="Wellhofer.pas"/>
774+
<Caret Line="16915" Column="81" TopLine="16886"/>
775775
</Position14>
776776
<Position15>
777777
<Filename Value="Wellhofer.pas"/>
778-
<Caret Line="956" Column="22" TopLine="928"/>
778+
<Caret Line="16908" Column="67" TopLine="16886"/>
779779
</Position15>
780780
<Position16>
781781
<Filename Value="Wellhofer.pas"/>
782-
<Caret Line="4749" TopLine="4720"/>
782+
<Caret Line="16907" Column="78" TopLine="16889"/>
783783
</Position16>
784784
<Position17>
785785
<Filename Value="Wellhofer.pas"/>
786-
<Caret Line="4770" Column="9" TopLine="4742"/>
786+
<Caret Line="17417" TopLine="17401"/>
787787
</Position17>
788788
<Position18>
789789
<Filename Value="Wellhofer.pas"/>
790-
<Caret Line="4837" Column="19" TopLine="4809"/>
790+
<Caret Line="18621" TopLine="18604"/>
791791
</Position18>
792792
<Position19>
793793
<Filename Value="Wellhofer.pas"/>
794-
<Caret Line="5072" Column="78" TopLine="5044"/>
794+
<Caret Line="17417" TopLine="17400"/>
795795
</Position19>
796796
<Position20>
797797
<Filename Value="Wellhofer.pas"/>
798-
<Caret Line="5147" Column="19" TopLine="5119"/>
798+
<Caret Line="18621" TopLine="18604"/>
799799
</Position20>
800800
<Position21>
801801
<Filename Value="Wellhofer.pas"/>
802-
<Caret Line="5205" Column="110" TopLine="5177"/>
802+
<Caret Line="17417" TopLine="17400"/>
803803
</Position21>
804804
<Position22>
805805
<Filename Value="Wellhofer.pas"/>
806-
<Caret Line="12795" Column="41" TopLine="12782"/>
806+
<Caret Line="18621" TopLine="18604"/>
807807
</Position22>
808808
<Position23>
809809
<Filename Value="Wellhofer.pas"/>
810-
<Caret Line="2989" Column="32" TopLine="2974"/>
810+
<Caret Line="16905" TopLine="16887"/>
811811
</Position23>
812812
<Position24>
813813
<Filename Value="Wellhofer.pas"/>
814-
<Caret Line="2993" Column="32" TopLine="2974"/>
814+
<Caret Line="17417" TopLine="17401"/>
815815
</Position24>
816816
<Position25>
817817
<Filename Value="Wellhofer.pas"/>
818-
<Caret Line="12265" Column="111" TopLine="12237"/>
818+
<Caret Line="18621" TopLine="18604"/>
819819
</Position25>
820820
<Position26>
821821
<Filename Value="Wellhofer.pas"/>
822-
<Caret Line="12795" Column="41" TopLine="12767"/>
822+
<Caret Line="17417" TopLine="17400"/>
823823
</Position26>
824824
<Position27>
825825
<Filename Value="Wellhofer.pas"/>
826-
<Caret Line="12866" Column="24" TopLine="12838"/>
826+
<Caret Line="18621" TopLine="18604"/>
827827
</Position27>
828828
<Position28>
829829
<Filename Value="Wellhofer.pas"/>
830-
<Caret Line="13342" Column="27" TopLine="13322"/>
830+
<Caret Line="17417" TopLine="17400"/>
831831
</Position28>
832832
<Position29>
833833
<Filename Value="Wellhofer.pas"/>
834+
<Caret Line="18618" Column="17" TopLine="18604"/>
834835
</Position29>
835836
<Position30>
836837
<Filename Value="Wellhofer.pas"/>
837-
<Caret Line="4969" TopLine="4953"/>
838+
<Caret Column="61"/>
838839
</Position30>
839840
</JumpHistory>
840841
<RunParams>
@@ -849,14 +850,14 @@
849850
<WatchScope Value="wpsLocal"/>
850851
<WatchKind Value="wpkWrite"/>
851852
<Source Value="Wellhofer.pas"/>
852-
<Line Value="3547"/>
853+
<Line Value="3546"/>
853854
</Item>
854855
<Item>
855856
<Kind Value="bpkSource"/>
856857
<WatchScope Value="wpsLocal"/>
857858
<WatchKind Value="wpkWrite"/>
858859
<Source Value="Wellhofer.pas"/>
859-
<Line Value="3953"/>
860+
<Line Value="3952"/>
860861
</Item>
861862
<Item>
862863
<Kind Value="bpkSource"/>
@@ -871,14 +872,14 @@
871872
<WatchScope Value="wpsLocal"/>
872873
<WatchKind Value="wpkWrite"/>
873874
<Source Value="Wellhofer.pas"/>
874-
<Line Value="3572"/>
875+
<Line Value="3571"/>
875876
</Item>
876877
<Item>
877878
<Kind Value="bpkSource"/>
878879
<WatchScope Value="wpsLocal"/>
879880
<WatchKind Value="wpkWrite"/>
880881
<Source Value="Wellhofer.pas"/>
881-
<Line Value="17913"/>
882+
<Line Value="17914"/>
882883
</Item>
883884
<Item>
884885
<Kind Value="bpkSource"/>
@@ -901,13 +902,48 @@
901902
<Source Value="wellform.pas"/>
902903
<Line Value="8176"/>
903904
</Item>
905+
<Item>
906+
<Kind Value="bpkSource"/>
907+
<WatchScope Value="wpsLocal"/>
908+
<WatchKind Value="wpkWrite"/>
909+
<Source Value="Wellhofer.pas"/>
910+
<Line Value="17354"/>
911+
</Item>
912+
<Item>
913+
<Kind Value="bpkSource"/>
914+
<WatchScope Value="wpsLocal"/>
915+
<WatchKind Value="wpkWrite"/>
916+
<Source Value="Wellhofer.pas"/>
917+
<Line Value="17394"/>
918+
</Item>
919+
<Item>
920+
<Kind Value="bpkSource"/>
921+
<WatchScope Value="wpsLocal"/>
922+
<WatchKind Value="wpkWrite"/>
923+
<Source Value="Wellhofer.pas"/>
924+
<Line Value="17413"/>
925+
</Item>
926+
<Item>
927+
<Kind Value="bpkSource"/>
928+
<WatchScope Value="wpsLocal"/>
929+
<WatchKind Value="wpkWrite"/>
930+
<Source Value="Wellhofer.pas"/>
931+
<Line Value="18610"/>
932+
</Item>
933+
<Item>
934+
<Kind Value="bpkSource"/>
935+
<WatchScope Value="wpsLocal"/>
936+
<WatchKind Value="wpkWrite"/>
937+
<Source Value="Wellhofer.pas"/>
938+
<Line Value="18615"/>
939+
</Item>
904940
</BreakPoints>
905941
<Watches>
906942
<Item>
907-
<Expression Value="rfatext"/>
943+
<Expression Value="fileformat"/>
908944
</Item>
909945
<Item>
910-
<Expression Value="wSource[dsCalculated].twAnalysisRange"/>
946+
<Expression Value="wSource[dsMeasured].twPosCm"/>
911947
</Item>
912948
<Item>
913949
<Expression Value="arec.convstg"/>
@@ -919,10 +955,10 @@
919955
<Expression Value="asource"/>
920956
</Item>
921957
<Item>
922-
<Expression Value="fparser.currentline"/>
958+
<Expression Value="result"/>
923959
</Item>
924960
<Item>
925-
<Expression Value="Selection"/>
961+
<Expression Value="fparseok"/>
926962
</Item>
927963
</Watches>
928964
</Debugging>

‎BistroMath.res‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)