Changeset 9c76091 in mmcs for mainwindow.H

Timestamp:

Aug 11, 2015, 5:07:29 PM (9 years ago)

Author:

rboet <rboet@…>

Branches:

master, matrices

Children:

9881a61

Parents:

6cc17c0 (diff), aa628c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'matrices'

File:

• mainwindow.H (modified) (4 diffs)

mainwindow.H

@@ -31 +31 @@
     QAction actionCV;
     QAction actionVariableExogena;
-    QAction actionAn;
     QAction actionLa;
     QAction actionEncadenamiento;    
@@ -52 +51 @@
     int opcionVentanaExogena;
     int opcionExportarMatriz;
+    int opcionCTEndogena;
 
     FormLoadMatrix * formLoadMatrix;
@@ -82 +82 @@
     void CalcularAn(QTableWidget *, QTableWidget *, QTableWidget *, int count, bool endogena);
     QString Separador(QTableWidgetItem *,bool quitar);
+    void ItemsNoEditable(QTableWidget *, int inicio, int fin);
+    void CellStyle(QTableWidgetItem *);
+    void EndogenaAn();
 
     void crearMatrizEndogena(QTableWidget *);
@@ -116 +119 @@
     void slotFinalizarExogena();
     void slotDeshacerExogena();
-    void slotAn();
     void slotLa();