Skip to content

Commit aecb8fe

Browse files
author
Ilia Platone
committed
Updated inputs.ui
1 parent 033ecee commit aecb8fe

File tree

3 files changed

+88
-30
lines changed

3 files changed

+88
-30
lines changed

‎graph.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -619,10 +619,10 @@ void Graph::resizeEvent(QResizeEvent *event)
619619
QWidget::resizeEvent(event);
620620
view->setGeometry(0, 0, width(), height());
621621
correlator->setGeometry(0, 0, width(), height());
622-
int y_offset = 40;
623-
infos->setGeometry(correlator->width() - infos->width() - 10, y_offset, infos->width(), infos->height());
624-
int num_blocks = 4;
625-
int size = (correlator->width() - infos->width() - 20 - num_blocks * 5) / num_blocks;
622+
int y_offset = 20;
623+
infos->setGeometry(5, y_offset, infos->width(), infos->height());
624+
y_offset += infos->height() + 5;
625+
int size = 256;
626626
int n = 0;
627627
coverageView->setGeometry(size * n + 5 + 5 * n, y_offset + 30, size, size);
628628
coverageLabel->setGeometry(coverageView->x(), y_offset, size, 30);

‎inputs.ui‎

Lines changed: 81 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<rect>
1010
<x>0</x>
1111
<y>0</y>
12-
<width>297</width>
13-
<height>415</height>
12+
<width>797</width>
13+
<height>231</height>
1414
</rect>
1515
</property>
1616
<property name="acceptDrops">
@@ -22,10 +22,10 @@
2222
<widget class="QGroupBox" name="infos">
2323
<property name="geometry">
2424
<rect>
25-
<x>0</x>
26-
<y>0</y>
27-
<width>291</width>
28-
<height>411</height>
25+
<x>-10</x>
26+
<y>10</y>
27+
<width>561</width>
28+
<height>221</height>
2929
</rect>
3030
</property>
3131
<property name="title">
@@ -66,10 +66,10 @@
6666
<widget class="QLabel" name="infoLabel">
6767
<property name="geometry">
6868
<rect>
69-
<x>20</x>
70-
<y>240</y>
69+
<x>290</x>
70+
<y>30</y>
7171
<width>261</width>
72-
<height>161</height>
72+
<height>171</height>
7373
</rect>
7474
</property>
7575
<property name="text">
@@ -125,13 +125,13 @@
125125
<property name="geometry">
126126
<rect>
127127
<x>10</x>
128-
<y>150</y>
129-
<width>121</width>
128+
<y>156</y>
129+
<width>81</width>
130130
<height>17</height>
131131
</rect>
132132
</property>
133133
<property name="text">
134-
<string>Frequency (MHz)</string>
134+
<string>Freq.(MHz)</string>
135135
</property>
136136
</widget>
137137
<widget class="QSpinBox" name="Lon_0">
@@ -317,8 +317,8 @@
317317
<widget class="QSpinBox" name="Frequency">
318318
<property name="geometry">
319319
<rect>
320-
<x>130</x>
321-
<y>150</y>
320+
<x>90</x>
321+
<y>156</y>
322322
<width>91</width>
323323
<height>21</height>
324324
</rect>
@@ -352,7 +352,7 @@
352352
<x>10</x>
353353
<y>180</y>
354354
<width>89</width>
355-
<height>25</height>
355+
<height>21</height>
356356
</rect>
357357
</property>
358358
<property name="text">
@@ -365,7 +365,7 @@
365365
<x>100</x>
366366
<y>180</y>
367367
<width>89</width>
368-
<height>25</height>
368+
<height>21</height>
369369
</rect>
370370
</property>
371371
<property name="text">
@@ -378,7 +378,7 @@
378378
<x>190</x>
379379
<y>180</y>
380380
<width>89</width>
381-
<height>25</height>
381+
<height>21</height>
382382
</rect>
383383
</property>
384384
<property name="text">
@@ -388,8 +388,8 @@
388388
<widget class="QCheckBox" name="Synthesize">
389389
<property name="geometry">
390390
<rect>
391-
<x>10</x>
392-
<y>210</y>
391+
<x>190</x>
392+
<y>156</y>
393393
<width>101</width>
394394
<height>23</height>
395395
</rect>
@@ -403,7 +403,7 @@
403403
<rect>
404404
<x>10</x>
405405
<y>130</y>
406-
<width>111</width>
406+
<width>51</width>
407407
<height>17</height>
408408
</rect>
409409
</property>
@@ -414,17 +414,75 @@
414414
<widget class="QSpinBox" name="Focus">
415415
<property name="geometry">
416416
<rect>
417-
<x>130</x>
417+
<x>60</x>
418418
<y>130</y>
419-
<width>91</width>
419+
<width>51</width>
420420
<height>21</height>
421421
</rect>
422422
</property>
423423
<property name="minimum">
424424
<number>1</number>
425425
</property>
426426
<property name="maximum">
427-
<number>900000000</number>
427+
<number>16777216</number>
428+
</property>
429+
</widget>
430+
<widget class="QLabel" name="label_8">
431+
<property name="geometry">
432+
<rect>
433+
<x>120</x>
434+
<y>130</y>
435+
<width>41</width>
436+
<height>20</height>
437+
</rect>
438+
</property>
439+
<property name="text">
440+
<string>Filter</string>
441+
</property>
442+
</widget>
443+
<widget class="QSpinBox" name="Filter">
444+
<property name="geometry">
445+
<rect>
446+
<x>160</x>
447+
<y>130</y>
448+
<width>41</width>
449+
<height>21</height>
450+
</rect>
451+
</property>
452+
<property name="minimum">
453+
<number>1</number>
454+
</property>
455+
<property name="maximum">
456+
<number>24</number>
457+
</property>
458+
</widget>
459+
<widget class="QLabel" name="label_10">
460+
<property name="geometry">
461+
<rect>
462+
<x>200</x>
463+
<y>130</y>
464+
<width>31</width>
465+
<height>17</height>
466+
</rect>
467+
</property>
468+
<property name="text">
469+
<string>Tool</string>
470+
</property>
471+
</widget>
472+
<widget class="QSpinBox" name="Instrument">
473+
<property name="geometry">
474+
<rect>
475+
<x>230</x>
476+
<y>130</y>
477+
<width>41</width>
478+
<height>21</height>
479+
</rect>
480+
</property>
481+
<property name="minimum">
482+
<number>1</number>
483+
</property>
484+
<property name="maximum">
485+
<number>24</number>
428486
</property>
429487
</widget>
430488
</widget>

‎line.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,9 @@ void Line::setLocation(int value)
464464
if(ahp_gt_is_connected()) {
465465
if(ahp_gt_is_detected(getRailIndex())) {
466466
ahp_gt_select_device(getRailIndex());
467-
ahp_gt_goto_absolute(RailX, xyz_locations[current_location].xyz.x*1000.0*2.0*M_PI/ahp_gt_get_totalsteps(RailX), M_PI * 2 * 800.0 / SIDEREAL_DAY);
468-
ahp_gt_goto_absolute(RailY, xyz_locations[current_location].xyz.y*1000.0*2.0*M_PI/ahp_gt_get_totalsteps(RailY), M_PI * 2 * 800.0 / SIDEREAL_DAY);
469-
ahp_gt_goto_absolute(RailZ, xyz_locations[current_location].xyz.z*1000.0*2.0*M_PI/ahp_gt_get_totalsteps(RailZ), M_PI * 2 * 800.0 / SIDEREAL_DAY);
467+
ahp_gt_goto_absolute(RailX, xyz_locations[current_location].xyz.x*2.0*M_PI/ahp_gt_get_totalsteps(RailX)/1000, M_PI * 2 * 800.0 / SIDEREAL_DAY);
468+
ahp_gt_goto_absolute(RailY, xyz_locations[current_location].xyz.y*2.0*M_PI/ahp_gt_get_totalsteps(RailY)/1000, M_PI * 2 * 800.0 / SIDEREAL_DAY);
469+
ahp_gt_goto_absolute(RailZ, xyz_locations[current_location].xyz.z*2.0*M_PI/ahp_gt_get_totalsteps(RailZ)/1000, M_PI * 2 * 800.0 / SIDEREAL_DAY);
470470
}
471471
}
472472
}

0 commit comments

Comments
 (0)