aait 2.3.15.992__tar.gz → 2.3.15.993__tar.gz

{aait-2.3.15.992 → aait-2.3.15.993}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.3.15.992
+Version: 2.3.15.993
 Summary: Advanced Artificial Intelligence Tools is a package meant to develop and enable advanced AI functionalities in Orange
 Home-page: 
 Author: Orange community

{aait-2.3.15.992 → aait-2.3.15.993}/aait.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aait
-Version: 2.3.15.992
+Version: 2.3.15.993
 Summary: Advanced Artificial Intelligence Tools is a package meant to develop and enable advanced AI functionalities in Orange
 Home-page: 
 Author: Orange community

{aait-2.3.15.992 → aait-2.3.15.993}/orangecontrib/AAIT/utils/widget_positioning.py

@@ -1,5 +1,6 @@
 from AnyQt.QtWidgets import QApplication
 from AnyQt.QtCore import QTimer
+import re
 #allows displaying a widget on opening
 # add (not sure!)
 # save_position = False
@@ -13,6 +14,37 @@ def show_and_adjust_at_opening(argself,str_position):
     argself.show()
     QTimer.singleShot(1000, lambda: adjust_to_quarter(argself,str_position))
 
+def _parse_variable_position(spec: str):
+    """
+    Attend: vXX_dvYY_hxx_dhyy
+      vXX  = % de l'écran (Y du coin haut)
+      dvYY = % de l'écran (hauteur)
+      hxx  = % de l'écran (X du coin gauche)
+      dhyy = % de l'écran (largeur)
+    Retourne (v, dv, h, dh) en int si OK, sinon None.
+    """
+    if not isinstance(spec, str):
+        return None
+
+    m = re.fullmatch(r"v(\d{1,3})_dv(\d{1,3})_h(\d{1,3})_dh(\d{1,3})", spec.strip())
+    if not m:
+        return None
+
+    v, dv, h, dh = map(int, m.groups())
+
+    # bornes simples: 0..100
+    if any(p < 0 or p > 100 for p in (v, dv, h, dh)):
+        return None
+
+    # éviter taille nulle (tu peux enlever si tu veux autoriser 0)
+    if dv == 0 or dh == 0:
+        return None
+
+    # vérifier que le rectangle reste dans l'écran (en %)
+    if v + dv > 100 or h + dh > 100:
+        return None
+
+    return v, dv, h, dh
 
 def adjust_to_quarter(argself, position: str):
     """
@@ -26,6 +58,23 @@ def adjust_to_quarter(argself, position: str):
 
     sw, sh = screen.width(), screen.height()
 
+    parsed = _parse_variable_position(position)
+    if parsed is not None:
+        v, dv, h, dh = parsed
+
+        # conversion % -> pixels
+        y = screen.y() + int(round(sh * (v / 100.0)))
+        h_px = int(round(sh * (dv / 100.0)))
+
+        x = screen.x() + int(round(sw * (h / 100.0)))
+        w_px = int(round(sw * (dh / 100.0)))
+
+        argself.resize(w_px, h_px)
+        argself.move(x, y)
+        return
+
+
+
     if position == "fullscreen":
         # full screen
         w, h = sw, sh

{aait-2.3.15.992 → aait-2.3.15.993}/orangecontrib/AAIT/widgets/OWAutoShowCreateInstance.py

@@ -483,7 +483,7 @@ class OWCreateInstance(OWWidget):
     icon = "icons/CreateInstance.svg"
     if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
         icon = "icons_dev/CreateInstance.svg"
-    category = "Transform"
+    category = "AAIT - TOOLBOX"
     keywords = "create instance, simulator"
     priority = 2310
 
@@ -514,6 +514,9 @@ class OWCreateInstance(OWWidget):
     append_to_data = Setting(True)
     auto_commit = Setting(True)
 
+    # NOUVEAU (optionnel): applique automatiquement la référence à l'UI
+    auto_apply_reference = Setting(True)
+    
     def __init__(self):
         super().__init__()
         self.data: Optional[Table] = None
@@ -559,6 +562,13 @@ class OWCreateInstance(OWWidget):
         gui.checkBox(self.buttonsArea, self, "append_to_data",
                      "Append this instance to input data",
                      callback=self.commit.deferred)
+
+        gui.checkBox(
+            self.buttonsArea, self, "auto_apply_reference",
+            self.tr("Auto-apply Reference to UI"),
+            callback=self._on_auto_apply_reference_changed
+        )
+        
         gui.rubber(self.buttonsArea)
         gui.auto_apply(self.buttonsArea, self, "auto_commit")
 
@@ -566,8 +576,16 @@ class OWCreateInstance(OWWidget):
         widget_positioning.show_and_adjust_at_opening(self,str(self.str_WidgetPositionning))
 
 
+    def _on_auto_apply_reference_changed(self):
+        # si on active, on applique tout de suite si possible
+        if self.auto_apply_reference:
+            self._apply_reference_to_ui()
+
     def __filter_edit_changed(self):
         self.proxy_model.setFilterFixedString(self.filter_edit.text().strip())
+        # si référence active + auto, réapplique sur les variables visibles
+        if self.auto_apply_reference and self.reference is not None:
+            self._apply_reference_to_ui()
 
     def __table_data_changed(self):
         self.commit.deferred()
@@ -591,6 +609,51 @@ class OWCreateInstance(OWWidget):
             actions.append(action)
         return actions
 
+
+    def _apply_reference_to_ui(self, indices: List[QModelIndex] = None):
+        if not self.data or self.reference is None:
+            return
+        if len(self.reference) < 1:
+            return
+
+        ref_table = self.reference  # garde une Table, pas RowInstance
+
+        self.model.dataChanged.disconnect(self.__table_data_changed)
+        try:
+            if indices is not None:
+                source_indexes = indices  # indices source (menu)
+            else:
+                source_indexes = []
+                for prow in range(self.proxy_model.rowCount()):
+                    pindex = self.proxy_model.index(prow, self.Header.variable)
+                    source_indexes.append(self.proxy_model.mapToSource(pindex))
+
+            for sindex in source_indexes:
+                var = self.model.data(sindex, VariableRole)
+                if var is None:
+                    continue
+
+                if var.name not in ref_table.domain:
+                    continue
+
+                ref_var = ref_table.domain[var.name]
+
+                # (optionnel) garde-fou type
+                if (var.is_discrete != ref_var.is_discrete) or \
+                        (var.is_continuous != ref_var.is_continuous) or \
+                        (var.is_string != ref_var.is_string) or \
+                        (var.is_time != ref_var.is_time):
+                    continue
+
+                col = ref_table.get_column(ref_var)  # OK sur Table
+                value = col[0] if len(col) else np.nan
+
+                self.model.setData(sindex, value, ValueRole)
+
+        finally:
+            self.model.dataChanged.connect(self.__table_data_changed)
+
+        self.commit.deferred()
     def _initialize_values(self, fun: str, indices: List[QModelIndex] = None):
         cont_fun = {"median": np.nanmedian,
                     "mean": np.nanmean,
@@ -601,41 +664,64 @@ class OWCreateInstance(OWWidget):
                     "random": disc_random,
                     "input": majority}.get(fun, NotImplemented)
 
-        if not self.data or fun == "input" and not self.reference:
+        if not self.data or (fun == "input" and not self.reference):
             return
 
-        self.model.dataChanged.disconnect(self.__table_data_changed)
-        rows = range(self.proxy_model.rowCount()) if indices is None else \
-            [index.row() for index in indices]
-        for row in rows:
-            index = self.model.index(row, self.Header.variable)
-            variable = self.model.data(index, VariableRole)
+        # "input" devient: appliquer 1 ligne de référence directement aux valeurs UI
+        if fun == "input":
+            self._apply_reference_to_ui(indices)
+            return
+                                                               
+                                                           
 
-            if fun == "input":
-                if variable not in self.reference.domain:
-                    continue
-                values = self.reference.get_column(variable)
-            else:
-                values = self.model.data(index, ValuesRole)
-
-            if variable.is_continuous:
-                value = cont_fun(values)
-                value = round(value, variable.number_of_decimals)
-            elif variable.is_discrete:
-                value = disc_fun(values)
-            elif variable.is_string:
-                value = ""
+        self.model.dataChanged.disconnect(self.__table_data_changed)
+        try:
+            # correction: rows viennent du proxy -> il faut mapper vers source
+            if indices is None:
+                proxy_rows = range(self.proxy_model.rowCount())
+                source_indexes = [
+                    self.proxy_model.mapToSource(
+                        self.proxy_model.index(r, self.Header.variable)
+                    )
+                    for r in proxy_rows
+                ]
             else:
-                raise NotImplementedError
+                # indices venant du menu sont déjà SOURCE
+                source_indexes = indices
+
+            for sindex in source_indexes:
+                variable = self.model.data(sindex, VariableRole)
+                values = self.model.data(sindex, ValuesRole)
+                                      
+                                        
+                                    
+                          
+                 
+                                         
+
+                if variable.is_continuous:
+                    value = cont_fun(values)
+                    value = round(value, variable.number_of_decimals)
+                elif variable.is_discrete:
+                    value = disc_fun(values)
+                elif variable.is_string:
+                    value = ""
+                else:
+                    raise NotImplementedError
+
+                self.model.setData(sindex, value, ValueRole)
+        finally:
+            self.model.dataChanged.connect(self.__table_data_changed)
 
-            self.model.setData(index, value, ValueRole)
-        self.model.dataChanged.connect(self.__table_data_changed)
         self.commit.deferred()
 
     @Inputs.data
     def set_data(self, data: Table):
         self.data = data
         self._set_model_data()
+        # si reference déjà là + auto, appliquer sur UI après refresh du modèle
+        if self.auto_apply_reference and self.reference is not None:
+            self._apply_reference_to_ui()
         self.commit.now()
 
     def _set_model_data(self):
@@ -654,6 +740,12 @@ class OWCreateInstance(OWWidget):
     @Inputs.reference
     def set_reference(self, data: Table):
         self.reference = data
+        # mise à jour immédiate de l'UI à l'arrivée de la référence (1 ligne)
+        if self.auto_apply_reference:
+            self._apply_reference_to_ui()
+        else:
+            # au moins, un commit pour que l’output reflète les valeurs si besoin
+            self.commit.deferred()
 
 
     @Inputs.input_autoshow

{aait-2.3.15.992 → aait-2.3.15.993}/orangecontrib/AAIT/widgets/OWQuadrantclicker.py

@@ -18,7 +18,7 @@ class OWQuadrantclicker(widget.OWWidget):
     if "site-packages/Orange/widgets" in os.path.dirname(os.path.abspath(__file__)).replace("\\", "/"):
         icon = "icons_dev/quadrantclicker.svg"
     gui = os.path.join(os.path.dirname(os.path.abspath(__file__)), "designer/owquadrant_clicker.ui")
-    want_control_area = True
+    want_control_area = False
     priority = 1089
 
     str_checkbox_statut: str = Setting("False")
@@ -57,11 +57,30 @@ class OWQuadrantclicker(widget.OWWidget):
         self.btn_fs.clicked.connect(lambda: self._p("fullscreen"))
         self.btn_disabled.clicked.connect(lambda: self._p("none"))
 
+        self.pushButton_free.clicked.connect(self.send_free)
+
+
         self.checkBox.toggled.connect(self.on_checkbox_toggled)
 
         if self.str_checkbox_statut != "False":
             QTimer.singleShot(50, self.minimize_all_qmainwindows)
 
+    def send_free(self):
+        delta_h=int(self.spinBox_dh.value())
+        if delta_h+int(self.spinBox_h.value())>100:
+            delta_h=100-int(self.spinBox_h.value())
+
+        delta_l=int(self.spinBox_dl.value())
+        if delta_l+int(self.spinBox_l.value())>100:
+            delta_l=100-int(self.spinBox_l.value())
+
+
+        str_value=f"v{str(self.spinBox_h.value())}_dv{str(delta_h)}_h{str(self.spinBox_l.value())}_dh{str(delta_l)}"
+        self.label.setText("Selected position : "+str(str_value))
+        self.Outputs.output_autoshow.send(str(str_value))
+
+
+
     def _p(self, s: str):
         self.label.setText("Selected position : "+str(s))
         self.Outputs.output_autoshow.send(str(s))

{aait-2.3.15.992 → aait-2.3.15.993}/orangecontrib/AAIT/widgets/designer/owquadrant_clicker.ui

@@ -32,7 +32,7 @@ QPushButton:pressed, QToolButton:pressed {
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>420</y>
+     <y>470</y>
      <width>631</width>
      <height>16</height>
     </rect>
@@ -247,8 +247,8 @@ T</string>
   <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>400</y>
+     <x>10</x>
+     <y>450</y>
      <width>541</width>
      <height>21</height>
     </rect>
@@ -270,6 +270,162 @@ T</string>
     <string>Click a quadrant to send the opening position to a compatible widget</string>
    </property>
   </widget>
+  <widget class="QGroupBox" name="groupBox">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>380</y>
+     <width>591</width>
+     <height>71</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Free position (%)    </string>
+   </property>
+   <widget class="QSpinBox" name="spinBox_h">
+    <property name="geometry">
+     <rect>
+      <x>90</x>
+      <y>10</y>
+      <width>42</width>
+      <height>22</height>
+     </rect>
+    </property>
+    <property name="maximum">
+     <number>100</number>
+    </property>
+   </widget>
+   <widget class="QSpinBox" name="spinBox_dh">
+    <property name="geometry">
+     <rect>
+      <x>260</x>
+      <y>10</y>
+      <width>42</width>
+      <height>22</height>
+     </rect>
+    </property>
+    <property name="minimum">
+     <number>10</number>
+    </property>
+    <property name="maximum">
+     <number>100</number>
+    </property>
+   </widget>
+   <widget class="QSpinBox" name="spinBox_l">
+    <property name="geometry">
+     <rect>
+      <x>90</x>
+      <y>40</y>
+      <width>42</width>
+      <height>22</height>
+     </rect>
+    </property>
+    <property name="maximum">
+     <number>100</number>
+    </property>
+   </widget>
+   <widget class="QSpinBox" name="spinBox_dl">
+    <property name="geometry">
+     <rect>
+      <x>260</x>
+      <y>40</y>
+      <width>42</width>
+      <height>22</height>
+     </rect>
+    </property>
+    <property name="minimum">
+     <number>10</number>
+    </property>
+    <property name="maximum">
+     <number>100</number>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_3">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>50</y>
+      <width>35</width>
+      <height>10</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
+    <property name="text">
+     <string>→</string>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_4">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>20</y>
+      <width>35</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
+    <property name="text">
+     <string>↓</string>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_5">
+    <property name="geometry">
+     <rect>
+      <x>190</x>
+      <y>20</y>
+      <width>35</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>11</pointsize>
+     </font>
+    </property>
+    <property name="text">
+     <string>↨</string>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_6">
+    <property name="geometry">
+     <rect>
+      <x>190</x>
+      <y>50</y>
+      <width>35</width>
+      <height>10</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
+    <property name="text">
+     <string>↔</string>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="pushButton_free">
+    <property name="geometry">
+     <rect>
+      <x>380</x>
+      <y>30</y>
+      <width>56</width>
+      <height>17</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>OK</string>
+    </property>
+   </widget>
+  </widget>
  </widget>
  <resources/>
  <connections/>

{aait-2.3.15.992 → aait-2.3.15.993}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 NAME = "aait"
 
 # Version du package PyPI
-VERSION = "2.3.15.992"  # la version doit être supérieure à la précédente sinon la publication sera refusée
+VERSION = "2.3.15.993"  # la version doit être supérieure à la précédente sinon la publication sera refusée
 
 # Facultatif / Adaptable à souhait
 AUTHOR = "Orange community"