conflictos solucionados

jon85p · Nov 9, 2018 · 80ac165 · 80ac165
2 parents e39245f + 897f51b
commit 80ac165
Show file tree

Hide file tree

Showing 15 changed files with 847 additions and 140 deletions.
diff --git a/.landscape.yml b/.landscape.yml
@@ -0,0 +1,2 @@
+python-targets:
+    - 3
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,15 @@
 language: python
 
 python:
-  - "3.4"
   - "3.5"
+
+env:
+  - USE_PYQT=pyqt5
 
 branches:
   only:
     - master
+    - tarjan
 
 before_install:
   # http://conda.pydata.org/docs/travis.html
@@ -21,15 +24,18 @@ before_install:
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
   - source activate test-environment
   - pip install -r requirements.txt
-  - pip install coverage pytest pytest-cov codecov
+  - pip install coverage pytest pytest-cov codecov pytest-qt
 
 install:
   - pip install --no-deps .  # Test installation correctness
-
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sudo apt-get install -y libqt4-dev
+  - sudo apt-get install -y mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev
 script:
-  - python3 entrada.py -f test/input4.txt
+  # - python3 entrada.py -f test/input4.txt
   - py.test -vv  # Test against installed code
 
 after_success:
-  - coverage run test_core.py
+  - coverage run test_pyENL/*.py
   - codecov
diff --git a/GUI/MainWindow.ui b/GUI/MainWindow.ui
@@ -38,16 +38,134 @@
         <string>Ecuaciones</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
+        <item row="0" column="1">
          <widget class="QPlainTextEdit" name="cajaTexto"/>
         </item>
-        <item row="1" column="0">
+        <item row="0" column="0">
+         <widget class="QTextEdit" name="cajaNumeracion">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>35</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="layoutDirection">
+           <enum>Qt::RightToLeft</enum>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <property name="verticalScrollBarPolicy">
+           <enum>Qt::ScrollBarAlwaysOff</enum>
+          </property>
+          <property name="horizontalScrollBarPolicy">
+           <enum>Qt::ScrollBarAlwaysOff</enum>
+          </property>
+          <property name="html">
+           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;right&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="textInteractionFlags">
+           <set>Qt::NoTextInteraction</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
          <widget class="QPushButton" name="solve_button">
           <property name="text">
            <string>Resolver</string>
           </property>
          </widget>
         </item>
+        <item row="1" column="1">
+         <widget class="QFrame" name="frame">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>70</height>
+           </size>
+          </property>
+          <property name="focusPolicy">
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_5">
+           <item row="2" column="0">
+            <widget class="QLineEdit" name="textReplace">
+             <property name="placeholderText">
+              <string>Replace in current buffer</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="2">
+            <widget class="QPushButton" name="pushButton_replaceAll">
+             <property name="text">
+              <string>Replace All</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QPushButton" name="pushButton_replace">
+             <property name="text">
+              <string>Replace</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QPushButton" name="pushButton_find">
+             <property name="text">
+              <string>Find</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="2">
+            <widget class="QPushButton" name="pushButton_close">
+             <property name="text">
+              <string>Close</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_find">
+             <property name="text">
+              <string>Find in current buffer</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLineEdit" name="textFind">
+             <property name="placeholderText">
+              <string>Find in current buffer</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLabel" name="label_result">
+             <property name="text">
+              <string>No results</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="varTab">
@@ -142,7 +260,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>30</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuArchivo">
@@ -185,6 +303,7 @@
     <addaction name="actionCopiar"/>
     <addaction name="actionPegar"/>
     <addaction name="actionPegar_2"/>
+    <addaction name="actionBuscar_Reemplazar"/>
    </widget>
    <widget class="QMenu" name="menuOpciones">
     <property name="title">
@@ -372,6 +491,11 @@
     <string>Archivo EES</string>
    </property>
   </action>
+  <action name="actionBuscar_Reemplazar">
+   <property name="text">
+    <string>Buscar/Reemplazar</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="MainResources.qrc.py"/>