fix tiff save neus

NeutrinoToolkit · Oct 8, 2024 · 55e4dce · 55e4dce
1 parent 933eaff
commit 55e4dce
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/nPhysImage/nPhysFormats.cc b/nPhysImage/nPhysFormats.cc
@@ -887,7 +887,6 @@ std::vector <physD> physFormat::phys_open_tiff(std::string ifilename, bool separ
                         tiff_prop["display_range"] =display_range;
                     }
                 }
-                tiff_prop["phys_from_name"]=ifilename;
                 unsigned short bytesperpixel=0;
                 TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bytesperpixel);
                 bytesperpixel/=8;

diff --git a/plugins/Lineout/Lineout.h b/plugins/Lineout/Lineout.h
@@ -53,6 +53,8 @@ class nLineout : public nGenericPan {
 
         connect(my_w.actionLockColors, SIGNAL(toggled(bool)), this, SLOT(updatePlot()));
 
+        connect(nparent, SIGNAL(bufferChanged(nPhysD *)), this, SLOT(updatePlot()));
+
         my_w.plot->addGraph(my_w.plot->xAxis, my_w.plot->yAxis);
         my_w.plot->graph(0)->setPen(QPen(Qt::black));
         QString namedirection(plot_dir==PHYS_HORIZONTAL?"Horizontal":"Vertical");

diff --git a/plugins/Lineout_H_V/Lineout_H_V.cc b/plugins/Lineout_H_V/Lineout_H_V.cc
@@ -35,6 +35,7 @@ Lineout_H_V::Lineout_H_V(neutrino *parent) : nGenericPan(parent)
     connect(parent, SIGNAL(bufferChanged(nPhysD*)), this, SLOT(updatePlot()));
 
     connect(parent, SIGNAL(nZoom(double)), this, SLOT(updatePlot()));
+    connect(nparent, SIGNAL(bufferChanged(nPhysD *)), this, SLOT(updatePlot()));
 
     connect(my_w.lockClick,SIGNAL(released()), this, SLOT(setBehaviour()));
 

diff --git a/plugins/Visar/Visar.cc b/plugins/Visar/Visar.cc
@@ -269,7 +269,6 @@ void Visar::changeShot(QString num) {
 }
 
 void Visar::fillComboShot() {
-    qDebug() << "here";
     disconnect(comboShot, SIGNAL(currentTextChanged(QString)), this, SLOT(changeShot(QString)));
     QString oldvalue=comboShot->currentText();
 
@@ -912,7 +911,6 @@ int Visar::direction(int k) {
 }
 
 void Visar::setObjectVisibility(nPhysD*phys) {
-    qDebug() << "here in " << numVisars;
     if (nPhysExists(phys)) {
         for (unsigned int k=0;k<numVisars;k++){
             bool ismyimg = (phys == getPhysFromCombo(settingsUi[k]->shotImage) || phys == getPhysFromCombo(settingsUi[k]->refImage));
@@ -922,7 +920,6 @@ void Visar::setObjectVisibility(nPhysD*phys) {
         }
         sopRect->setVisible(enableSOP->isChecked() && (phys == getPhysFromCombo(sopRef) || phys == getPhysFromCombo(sopShot)));
     }
-    qDebug() << "here out";
 }
 
 void Visar::ghostChecked() {

diff --git a/src/neutrino.ui b/src/neutrino.ui
@@ -10,11 +10,16 @@
     <height>540</height>
    </rect>
   </property>
+  <property name="font">
+   <font>
+    <family>.AppleSystemUIFont</family>
+   </font>
+  </property>
   <property name="mouseTracking">
    <bool>true</bool>
   </property>
   <property name="focusPolicy">
-   <enum>Qt::NoFocus</enum>
+   <enum>Qt::FocusPolicy::NoFocus</enum>
   </property>
   <property name="acceptDrops">
    <bool>true</bool>
@@ -58,7 +63,7 @@
        <bool>false</bool>
       </property>
       <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+       <enum>QFrame::Shape::NoFrame</enum>
       </property>
       <property name="backgroundBrush">
        <brush brushstyle="NoBrush">
@@ -97,10 +102,10 @@
           <string>x pixel</string>
          </property>
          <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
+          <enum>QFrame::Shape::NoFrame</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Shadow::Raised</enum>
          </property>
          <property name="lineWidth">
           <number>0</number>
@@ -109,7 +114,7 @@
           <string/>
          </property>
          <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
@@ -124,10 +129,10 @@
           <string>y pixel</string>
          </property>
          <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
+          <enum>QFrame::Shape::NoFrame</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Shadow::Raised</enum>
          </property>
          <property name="lineWidth">
           <number>0</number>
@@ -136,14 +141,14 @@
           <string/>
          </property>
          <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
        <item>
         <widget class="Line" name="line">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
         </widget>
        </item>
@@ -164,7 +169,7 @@
           <string/>
          </property>
          <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
@@ -185,14 +190,14 @@
           <string/>
          </property>
          <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
        <item>
         <widget class="Line" name="line_2">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
         </widget>
        </item>
@@ -207,10 +212,10 @@
           <string>Value at mouse position</string>
          </property>
          <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
+          <enum>QFrame::Shape::NoFrame</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Shadow::Raised</enum>
          </property>
          <property name="lineWidth">
           <number>0</number>
@@ -219,14 +224,14 @@
           <string/>
          </property>
          <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
        <item>
         <widget class="Line" name="line_3">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
         </widget>
        </item>
@@ -247,7 +252,7 @@
           <string/>
          </property>
          <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
@@ -262,7 +267,7 @@
      <x>0</x>
      <y>0</y>
      <width>500</width>
-     <height>24</height>
+     <height>36</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">