Skip to content

Commit

Permalink
Merge pull request #996 from AllenNeuralDynamics/production_testing
Browse files Browse the repository at this point in the history 
[update main] 2024-11-12
  • Loading branch information
@alexpiet
alexpiet authored Nov 12, 2024
2 parents 4f4f595 + 07c1c99 commit 2e70e81
Show file tree
Hide file tree
Showing 12 changed files with 471 additions and 1,024 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies = [
"aind-data-schema==1.1.0",
"aind-data-schema-models==0.5.6",
"pydantic==2.9.2",
"stagewidget",
"stagewidget==1.0.4.dev0",

"pyyaml",
"pyqtgraph"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ aind-data-schema-models==0.5.6
pydantic==2.9.2
pyyaml
pyqtgraph
stagewidget
stagewidget==1.0.4.dev0
8 changes: 4 additions & 4 deletions src/foraging_gui/Calibration.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="WeightAfterLeft">
<widget class="QLabel" name="WeightAfterLeft">
<property name="geometry">
<rect>
<x>510</x>
Expand All @@ -659,7 +659,7 @@
<string/>
</property>
</widget>
<widget class="QLineEdit" name="WeightAfterRight">
<widget class="QLabel" name="WeightAfterRight">
<property name="geometry">
<rect>
<x>510</x>
Expand Down Expand Up @@ -790,7 +790,7 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="WeightBeforeLeft">
<widget class="QLabel" name="WeightBeforeLeft">
<property name="geometry">
<rect>
<x>360</x>
Expand All @@ -803,7 +803,7 @@
<string/>
</property>
</widget>
<widget class="QLineEdit" name="WeightBeforeRight">
<widget class="QLabel" name="WeightBeforeRight">
<property name="geometry">
<rect>
<x>360</x>
Expand Down
112 changes: 0 additions & 112 deletions src/foraging_gui/Camera.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,62 +142,6 @@
<number>10</number>
</property>
</widget>
<widget class="QLabel" name="WarningLabelFileIsInUse">
<property name="geometry">
<rect>
<x>50</x>
<y>380</y>
<width>171</width>
<height>51</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="WarningLabelCameraOn">
<property name="geometry">
<rect>
<x>50</x>
<y>390</y>
<width>171</width>
<height>51</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QPushButton" name="OpenSaveFolder">
<property name="geometry">
<rect>
Expand All @@ -220,62 +164,6 @@
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="WarningLabelLogging">
<property name="geometry">
<rect>
<x>50</x>
<y>340</y>
<width>171</width>
<height>51</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="WarningLabelOpenSave">
<property name="geometry">
<rect>
<x>50</x>
<y>350</y>
<width>171</width>
<height>51</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QPushButton" name="StartPreview">
<property name="geometry">
<rect>
Expand Down
Loading

0 comments on commit 2e70e81

Please sign in to comment.