From 2a8082a28d9f84d90aac27404e39ec0d2f51229a Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 23 Mar 2009 11:54:20 +0000
Subject: [PATCH] Patch level         : 10.0 266 Files correlati     :  mr2.exe
 Ricompilazione Demo : [ ] Commento            :

Aggiornate le maschere di selezione colori


git-svn-id: svn://10.65.10.50/trunk@18582 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 mr/mr2100.cpp | 11 ++++++-----
 mr/mr2200.cpp | 34 ++++++++++++++++------------------
 mr/mr2200.h   |  2 --
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/mr/mr2100.cpp b/mr/mr2100.cpp
index 7d68e73af..598196696 100755
--- a/mr/mr2100.cpp
+++ b/mr/mr2100.cpp
@@ -931,7 +931,6 @@ class TMatResMask : public TCalendar_mask
   TCondizione_vendita *_condv;
 
   TSelect_color_mask _sel_color; 
-  int _nodist_pos;   
 
   void clear_sheets();
   int num_orders();
@@ -1459,8 +1458,10 @@ int TMatResMask::add_order_line(long forn, const TMRP_line& line, int bucket)
   } while (nref >= 0 /*&& q > ZERO*/);
   if (line.final_product())
   {
-    COLOR back = _sel_color.get_back_color(_nodist_pos);
-    COLOR fore = _sel_color.get_fore_color(_nodist_pos);
+    COLOR back;
+    COLOR fore;
+
+		_sel_color.get_color("NODIST", back, fore);
     s.set_back_and_fore_color(back, fore, pos);
   }
   return pos;
@@ -1602,7 +1603,7 @@ static bool handle_interval(TMask_field &fld, KEY k)
   return true;
 }
 
-TMatResMask::TMatResMask() : TCalendar_mask("mr2100a"), _sel_color(sfield(F_ORDINI)) 
+TMatResMask::TMatResMask() : TCalendar_mask("mr2100a"), _sel_color("mr2100a") 
 {
   _condv = NULL;
   TSheet_field& sf = sfield(F_ORDINI);
@@ -1625,7 +1626,7 @@ TMatResMask::TMatResMask() : TCalendar_mask("mr2100a"), _sel_color(sfield(F_ORDI
     disable(F_NOIMP); // Forza l'ignoramento degli impianti
     set(F_NOIMP, "X");
   }                                  
-  _nodist_pos =_sel_color.add_color_def("NODIST", TR("Art.pianificati senza distinta"), COLOR_YELLOW, COLOR_BLACK);
+  _sel_color.add_color_def("NODIST", TR("Art.pianificati senza distinta"), COLOR_YELLOW, COLOR_BLACK);
   set_handler(F_DADATA, handle_interval);
   set_handler(F_ADATA, handle_interval);
 	
diff --git a/mr/mr2200.cpp b/mr/mr2200.cpp
index 8018a0d8a..905266044 100755
--- a/mr/mr2200.cpp
+++ b/mr/mr2200.cpp
@@ -1177,27 +1177,25 @@ bool TPlanning_mask::remove_propose(bool verbose)
 
 void TPlanning_mask::highlight_row(int row, bool on)
 {                             
-  COLOR back = on ? _sel_color.get_back_color(_con_pos) : NORMAL_BACK_COLOR;
-  COLOR fore = on ? _sel_color.get_fore_color(_con_pos) : NORMAL_COLOR;
-  
+	COLOR back = NORMAL_BACK_COLOR;
+	COLOR fore = NORMAL_COLOR;
+
+	if (on)
+		_sel_color.get_color("CONST", back, fore);
+
   sfield(F_ARTICOLI).set_back_and_fore_color(back, fore, row);
 }
 
 void TPlanning_mask::highlight(int row, int col, bool on, bool special)
 {  
-	COLOR back;
-	COLOR fore;
+	COLOR back = NORMAL_BACK_COLOR;
+	COLOR fore = NORMAL_COLOR;
 
-	if (special)
-	{
-	  back = on ? _sel_color.get_back_color(_npr_pos) : _sel_color.get_back_color(_con_pos);
-		fore = on ? _sel_color.get_fore_color(_npr_pos) : _sel_color.get_fore_color(_con_pos);
-	}
+  if (on)
+		_sel_color.get_color("PROP", back, fore);
 	else
-	{
-	  back = on ? _sel_color.get_back_color(_npr_pos) : NORMAL_BACK_COLOR;
-		fore = on ? _sel_color.get_fore_color(_npr_pos) : NORMAL_COLOR;
-	}
+		if (special)
+			_sel_color.get_color("CONST", back, fore);
   sfield(F_ARTICOLI).set_back_and_fore_color(back, fore, row, col);
 }
 
@@ -3794,13 +3792,13 @@ bool TPlanning_mask::on_field_event(TOperable_field& o, TField_event e, long jol
 }
 
 TPlanning_mask::TPlanning_mask(const char * name)
-         : TCalendar_mask(name), _sel_color(sfield(F_ARTICOLI))
+         : TCalendar_mask(name), _sel_color(name)
 {
   init();
 }
 
 TPlanning_mask::TPlanning_mask()
-         : TCalendar_mask("mr2200a"), _sel_color(sfield(F_ARTICOLI))
+         : TCalendar_mask("mr2200a"), _sel_color("mr2200a")
 {
   init();
 }
@@ -4025,8 +4023,8 @@ void TPlanning_mask::init()
 //  sfield(F_TESTE).disable();
 
   load_profile();
-  _npr_pos =_sel_color.add_color_def("PROP", TR("Nuove proposte"), COLOR_YELLOW, COLOR_BLACK);
-  _con_pos =_sel_color.add_color_def("CONST", TR("Vincoli speciali"), blend_colors(COLOR_WHITE, COLOR_YELLOW, 0.60), COLOR_BLACK);
+  _sel_color.add_color_def("PROP", TR("Nuove proposte"), COLOR_YELLOW, COLOR_BLACK);
+	_sel_color.add_color_def("CONST", TR("Vincoli speciali"), blend_colors(COLOR_WHITE, COLOR_YELLOW, 0.60), COLOR_BLACK);
 	
 	TCalendar_field & cf = (TCalendar_field &) field(F_CALENDAR);
 
diff --git a/mr/mr2200.h b/mr/mr2200.h
index 3a80b6c90..ea6f52e7a 100755
--- a/mr/mr2200.h
+++ b/mr/mr2200.h
@@ -40,8 +40,6 @@ class TPlanning_mask : public TCalendar_mask
   TCRP_lines _capacities; 
   
   TSelect_color_mask _sel_color; 
-  int _npr_pos;   
-  int _con_pos;   
   
 protected:
   enum Categoria_doc {_Doc_vincoli=1, _Doc_planning=2};